diff --git a/PortMaster/batocera/control.txt b/PortMaster/batocera/control.txt
index ca3fab7..b8786b4 100644
--- a/PortMaster/batocera/control.txt
+++ b/PortMaster/batocera/control.txt
@@ -34,8 +34,10 @@ get_controls() {
     echo "" > /tmp/gamecontrollerdb.txt
   fi
 
-  if [ -f "${HOME}/configs/emulationstation/es_input.cfg" ]; then
-    $controlfolder/mapper.txt /tmp/gamecontrollerdb.txt > /dev/null 2>&1
+  if [ -f "$controlfolder/cwtbe_flag" ]; then
+    if [ -f "${HOME}/configs/emulationstation/es_input.cfg" ]; then
+      $controlfolder/mapper.txt /tmp/gamecontrollerdb.txt > /dev/null 2>&1
+    fi
   fi
 
   sdl_controllerconfig="$(< "${SDL_GAMECONTROLLERCONFIG_FILE}")"
diff --git a/PortMaster/gptokeyb2 b/PortMaster/gptokeyb2
index 2b7e434..f8d8eda 100755
Binary files a/PortMaster/gptokeyb2 and b/PortMaster/gptokeyb2 differ
diff --git a/PortMaster/gptokeyb2.armhf b/PortMaster/gptokeyb2.armhf
index b4326a5..fc07dfc 100755
Binary files a/PortMaster/gptokeyb2.armhf and b/PortMaster/gptokeyb2.armhf differ
diff --git a/PortMaster/gptokeyb2.x86_64 b/PortMaster/gptokeyb2.x86_64
index a79cb07..61223ac 100755
Binary files a/PortMaster/gptokeyb2.x86_64 and b/PortMaster/gptokeyb2.x86_64 differ
diff --git a/PortMaster/knulli/control.txt b/PortMaster/knulli/control.txt
index b651a2d..5a5294c 100644
--- a/PortMaster/knulli/control.txt
+++ b/PortMaster/knulli/control.txt
@@ -22,6 +22,8 @@ get_controls() {
   ANALOGSTICKS="2"
   LOWRES="N"
 
+  DEVICE="Deeplay-keys"
+
   export SDL_GAMECONTROLLERCONFIG_FILE="/tmp/gamecontrollerdb.txt"
 
   # Spit the controller of the device our heuristics found (if it did).
@@ -31,8 +33,10 @@ get_controls() {
     echo "" > /tmp/gamecontrollerdb.txt
   fi
 
-  if [ -f "${HOME}/configs/emulationstation/es_input.cfg" ]; then
-    $controlfolder/mapper.txt /tmp/gamecontrollerdb.txt > /dev/null 2>&1
+  if [ -f "$controlfolder/cwtbe_flag" ]; then
+    if [ -f "${HOME}/configs/emulationstation/es_input.cfg" ]; then
+      $controlfolder/mapper.txt /tmp/gamecontrollerdb.txt > /dev/null 2>&1
+    fi
   fi
 
   sdl_controllerconfig="$(< "${SDL_GAMECONTROLLERCONFIG_FILE}")"
diff --git a/PortMaster/libinterpose.aarch64.so b/PortMaster/libinterpose.aarch64.so
index 9c42ccc..e399189 100755
Binary files a/PortMaster/libinterpose.aarch64.so and b/PortMaster/libinterpose.aarch64.so differ