diff --git a/cmake/targets/rg35xxh.cmake b/cmake/targets/rg35xxh.cmake
deleted file mode 100644
index 3073766..0000000
--- a/cmake/targets/rg35xxh.cmake
+++ /dev/null
@@ -1,5 +0,0 @@
-include(cmake/targets/knulli.cmake)
-
-target_compile_definitions(${DUSK_LIBRARY_TARGET_NAME} PUBLIC
-  DUSK_RG35XXH
-)
\ No newline at end of file
diff --git a/scripts/build-knulli-docker.sh b/scripts/build-knulli-docker.sh
new file mode 100755
index 0000000..b225e4a
--- /dev/null
+++ b/scripts/build-knulli-docker.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+docker build -t dusk-knulli -f docker/knulli/Dockerfile .
+docker run --rm -v $(pwd):/workdir dusk-knulli /bin/bash -c "./scripts/build-knulli.sh"
\ No newline at end of file
diff --git a/scripts/build-knulli.sh b/scripts/build-knulli.sh
new file mode 100755
index 0000000..5a1dbcf
--- /dev/null
+++ b/scripts/build-knulli.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+cmake -S . -B build-knulli -G Ninja \
+  -DDUSK_BUILD_TESTS=ON \
+  -DDUSK_TARGET_SYSTEM=knulli \
+  -DCMAKE_TOOLCHAIN_FILE=./cmake/toolchains/aarch64-linux-gnu.cmake \
+  -DCMAKE_BUILD_TYPE=Release
+cmake --build build-knulli -- -j$(nproc)
+
+# Copy necessary libs out
+mkdir -p ./build-knulli/dusk
+cp ./build-knulli/Dusk ./build-knulli/dusk/Dusk
+cp ./build-knulli/dusk.dsk ./build-knulli/dusk/dusk.dsk
+echo '#!/bin/bash' > build-knulli/dusk/Dusk.sh
+echo 'cd "$(dirname "$(readlink -f "$0")")"' >> build-knulli/dusk/Dusk.sh
+echo 'export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$(dirname "$(readlink -f "$0")")' >> build-knulli/dusk/Dusk.sh
+echo 'export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib/gl4es' >> build-knulli/dusk/Dusk.sh
+echo 'export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib' >> build-knulli/dusk/Dusk.sh
+echo '$(dirname "$(readlink -f "$0")")/Dusk' >> build-knulli/dusk/Dusk.sh
+chmod +x build-knulli/dusk/Dusk.sh
+cp /usr/lib/aarch64-linux-gnu/liblua5.4.so.0 build-knulli/dusk/
+# cp /usr/lib/aarch64-linux-gnu/libSDL2-2.0.so.0 build-knulli/dusk/
+# cp /usr/lib/aarch64-linux-gnu/libGL.so.1 build-knulli/dusk/
+# cp /usr/lib/aarch64-linux-gnu/libEGL.so.1 build-knulli/dusk/
+# cp /usr/lib/aarch64-linux-gnu/libGLESv2.so.2 build-knulli/dusk/
\ No newline at end of file
diff --git a/scripts/build-rg35xxh-docker.sh b/scripts/build-rg35xxh-docker.sh
deleted file mode 100755
index 55cfd40..0000000
--- a/scripts/build-rg35xxh-docker.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-docker build -t dusk-rg35xxh -f docker/knulli/Dockerfile .
-docker run --rm -v $(pwd):/workdir dusk-rg35xxh /bin/bash -c "./scripts/build-rg35xxh.sh"
\ No newline at end of file
diff --git a/scripts/build-rg35xxh.sh b/scripts/build-rg35xxh.sh
deleted file mode 100755
index 5aaaaa9..0000000
--- a/scripts/build-rg35xxh.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/bash
-cmake -S . -B build-rg35xxh -G Ninja \
-  -DDUSK_BUILD_TESTS=ON \
-  -DDUSK_TARGET_SYSTEM=rg35xxh \
-  -DCMAKE_TOOLCHAIN_FILE=./cmake/toolchains/aarch64-linux-gnu.cmake \
-  -DCMAKE_BUILD_TYPE=Release
-cmake --build build-rg35xxh -- -j$(nproc)
-
-# Copy necessary libs out
-mkdir -p ./build-rg35xxh/dusk
-cp ./build-rg35xxh/Dusk ./build-rg35xxh/dusk/Dusk
-cp ./build-rg35xxh/dusk.dsk ./build-rg35xxh/dusk/dusk.dsk
-echo '#!/bin/bash' > build-rg35xxh/dusk/Dusk.sh
-echo 'cd "$(dirname "$(readlink -f "$0")")"' >> build-rg35xxh/dusk/Dusk.sh
-echo 'export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$(dirname "$(readlink -f "$0")")' >> build-rg35xxh/dusk/Dusk.sh
-echo 'export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib/gl4es' >> build-rg35xxh/dusk/Dusk.sh
-echo 'export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib' >> build-rg35xxh/dusk/Dusk.sh
-echo '$(dirname "$(readlink -f "$0")")/Dusk' >> build-rg35xxh/dusk/Dusk.sh
-chmod +x build-rg35xxh/dusk/Dusk.sh
-cp /usr/lib/aarch64-linux-gnu/liblua5.4.so.0 build-rg35xxh/dusk/
-# cp /usr/lib/aarch64-linux-gnu/libSDL2-2.0.so.0 build-rg35xxh/dusk/
-# cp /usr/lib/aarch64-linux-gnu/libGL.so.1 build-rg35xxh/dusk/
-# cp /usr/lib/aarch64-linux-gnu/libEGL.so.1 build-rg35xxh/dusk/
-# cp /usr/lib/aarch64-linux-gnu/libGLESv2.so.2 build-rg35xxh/dusk/
\ No newline at end of file
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index cae6ca8..8a88a46 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -5,12 +5,7 @@
 
 add_subdirectory(dusk)
 
-if(DUSK_TARGET_SYSTEM STREQUAL "linux")
-  add_subdirectory(dusklinux)
-  add_subdirectory(dusksdl2)
-  add_subdirectory(duskgl)
-
-elseif(DUSK_TARGET_SYSTEM STREQUAL "rg35xxh")
+if(DUSK_TARGET_SYSTEM STREQUAL "linux" OR DUSK_TARGET_SYSTEM STREQUAL "knulli")
   add_subdirectory(dusklinux)
   add_subdirectory(dusksdl2)
   add_subdirectory(duskgl)