diff --git a/packages/apps/portmaster/scripts/start_portmaster.sh b/packages/apps/portmaster/scripts/start_portmaster.sh
index f0d895159..c44bcdddd 100644
--- a/packages/apps/portmaster/scripts/start_portmaster.sh
+++ b/packages/apps/portmaster/scripts/start_portmaster.sh
@@ -8,7 +8,7 @@ jslisten set "PortMaster"
 
 #Make sure PortMaster exists in .config/PortMaster
 if [ ! -d "/storage/.config/PortMaster" ]; then
-    mkdir -p "/storage/.config/ports/PortMaster"
+    mkdir -p "/storage/.config/PortMaster"
       cp -r "/usr/config/PortMaster" "/storage/.config/"
 fi
 
@@ -16,6 +16,7 @@ cd /storage/.config/PortMaster
 
 #Grab the latest control.txt
 cp /usr/config/PortMaster/control.txt control.txt
+cp /usr/config/PortMaster/mapper.txt mapper.txt
 
 #Use our gamecontrollerdb.txt
 rm -r gamecontrollerdb.txt
diff --git a/packages/apps/portmaster/sources/control.txt b/packages/apps/portmaster/sources/control.txt
index c19ec8182..61f26a9e6 100644
--- a/packages/apps/portmaster/sources/control.txt
+++ b/packages/apps/portmaster/sources/control.txt
@@ -15,6 +15,7 @@ ESUDOKILL="-1"
 raloc="/usr/bin"
 raconf="--config /storage/.config/retroarch/retroarch.cfg"
 pdevice=$(cat /sys/firmware/devicetree/base/model 2>/dev/null)
+pdevice=$(tr -d '\0' </sys/firmware/devicetree/base/model 2>/dev/null)
 
 case ${pdevice} in
   "Anbernic RG552")
@@ -29,7 +30,7 @@ case ${pdevice} in
   "Anbernic RG351*")
     profile="anbernic"
   ;;
-  "ODROID-GO Advance*")
+  "ODROID-GO Advance*"|"Powkiddy RGB10")
     profile="oga"
   ;;
   "ODROID-GO Super")