diff --git a/app-laptop/tuxedo-keyboard/Manifest b/app-laptop/tuxedo-keyboard/Manifest
index 45a804f..b8093d4 100644
--- a/app-laptop/tuxedo-keyboard/Manifest
+++ b/app-laptop/tuxedo-keyboard/Manifest
@@ -1,2 +1,2 @@
-DIST tuxedo-keyboard-3.1.4.tar.gz 57310 BLAKE2B 6ee4bdde33a58ffe3421df8141d4a02dcf1a2e14692712c3e6b9255e454187aeb9fd9a21c732b7d25f847ee483f751c9373ff338a87a9e2bd8f332fc34557534 SHA512 5afd43705791c47d484887d217469c111c01c72d0aa1a52a8cb1f0406fe766f56dcbb056bbce364ab9d48428dbc8a93c8066c06bb03a631df5e98317fe7613b4
+DIST tuxedo-keyboard-3.2.13.tar.gz 63015 BLAKE2B c89e60e7e4ff8a0b94521483859b94bb83506abb2d9a30d16c6b325e0a6f9282df83b2f2e27b81682d650c0f5771ae3ce480b0c194c22d4239814572865c66dc SHA512 412cba6b228198534525205d2d0c9336b16c981b993880b28edf688da99e1c63fd266d8d48634eddfa4d9e5525d1d980f8f2383128be5ebef8b90348e15b09f9
 DIST tuxedo-keyboard-3.2.8.tar.gz 62464 BLAKE2B 55eb97f50f4fd0e4912893af1e09a9cddc9c5b73ad099f7eb85340733fadd627b43f970ab1262d6f3ad1fabe6c356553eb9918051f7447c009b7d1fbff4aefba SHA512 a37f73c8f92108c9f3cd82b5519202a41f9285e4b555e157bea038f65d8e876941e72b7b31180a9043f42ea2f184486579b650ecfd9c3a188acdaa6ba68b1c2a
diff --git a/app-laptop/tuxedo-keyboard/tuxedo-keyboard-3.1.4-r1.ebuild b/app-laptop/tuxedo-keyboard/tuxedo-keyboard-3.2.13-r1.ebuild
similarity index 55%
rename from app-laptop/tuxedo-keyboard/tuxedo-keyboard-3.1.4-r1.ebuild
rename to app-laptop/tuxedo-keyboard/tuxedo-keyboard-3.2.13-r1.ebuild
index 9449f92..f3c83e7 100644
--- a/app-laptop/tuxedo-keyboard/tuxedo-keyboard-3.1.4-r1.ebuild
+++ b/app-laptop/tuxedo-keyboard/tuxedo-keyboard-3.2.13-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 CONFIG_CHECK="ACPI_WMI INPUT_SPARSEKMAP"
 
-inherit linux-mod toolchain-funcs
+inherit linux-mod-r1
 
 DESCRIPTION="Kernel Module for Tuxedo Keyboard"
 HOMEPAGE="https://github.com/tuxedocomputers/tuxedo-keyboard"
@@ -14,10 +14,17 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-BUILD_TARGETS="all"
-MODULE_NAMES="clevo_acpi(tuxedo:${S}:src) clevo_wmi(tuxedo:${S}:src) uniwill_wmi(tuxedo:${S}:src) tuxedo_keyboard(tuxedo:${S}:src) tuxedo_io(tuxedo:${S}:src/tuxedo_io)"
+PATCHES=( )
 
-pkg_setup() {
-	linux-mod_pkg_setup
-	BUILD_PARAMS="CC=$(tc-getBUILD_CC) KDIR=${KV_DIR} V=1 KBUILD_VERBOSE=1"
+src_compile() {
+	local modlist=(
+		clevo_acpi=tuxedo::src
+		clevo_wmi=tuxedo::src
+		uniwill_wmi=tuxedo::src
+		tuxedo_keyboard=tuxedo::src
+		tuxedo_io=tuxedo::src/tuxedo_io
+	)
+	local modargs=( KDIR=${KV_OUT_DIR} )
+
+	linux-mod-r1_src_compile
 }