diff --git a/debian/eggnoggpi/home/pi/.config/antimicrox/A.gamecontroller.amgp b/debian/eggnoggpi/home/pi/.config/antimicrox/A.gamecontroller.amgp
deleted file mode 100644
index 28cf616..0000000
--- a/debian/eggnoggpi/home/pi/.config/antimicrox/A.gamecontroller.amgp
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<gamecontroller configversion="19" appversion="3.1.4">
-    <!--The SDL name for a joystick is included for informational purposes only.-->
-    <sdlname>Retrolink SNES Controller</sdlname>
-    <!--The Unique ID for a joystick is included for informational purposes only.-->
-    <uniqueID>0300000079000000110000001001000012117</uniqueID>
-    <stickAxisAssociation index="2" xAxis="3" yAxis="4"/>
-    <stickAxisAssociation index="1" xAxis="1" yAxis="2"/>
-    <vdpadButtonAssociations index="1">
-        <vdpadButtonAssociation axis="0" button="12" direction="1"/>
-        <vdpadButtonAssociation axis="0" button="13" direction="4"/>
-        <vdpadButtonAssociation axis="0" button="14" direction="8"/>
-        <vdpadButtonAssociation axis="0" button="15" direction="2"/>
-    </vdpadButtonAssociations>
-    <names>
-        <controlstickname index="2">Stick 2</controlstickname>
-        <controlstickname index="1">Stick 1</controlstickname>
-    </names>
-    <sets>
-        <set index="2">
-            <dpad index="1">
-                <dpadbutton index="8">
-                    <slots>
-                        <slot>
-                            <code>0x1000012</code>
-                            <mode>keyboard</mode>
-                        </slot>
-                    </slots>
-                </dpadbutton>
-            </dpad>
-            <trigger index="6">
-                <center_value>0</center_value>
-                <min_value>-32767</min_value>
-                <max_value>32767</max_value>
-                <throttle>positivehalf</throttle>
-            </trigger>
-            <trigger index="5">
-                <center_value>0</center_value>
-                <min_value>-32767</min_value>
-                <max_value>32767</max_value>
-                <throttle>positivehalf</throttle>
-            </trigger>
-        </set>
-        <set index="1">
-            <dpad index="1">
-                <dpadbutton index="2">
-                    <slots>
-                        <slot>
-                            <code>0x44</code>
-                            <mode>keyboard</mode>
-                        </slot>
-                    </slots>
-                </dpadbutton>
-                <dpadbutton index="1">
-                    <slots>
-                        <slot>
-                            <code>0x57</code>
-                            <mode>keyboard</mode>
-                        </slot>
-                    </slots>
-                </dpadbutton>
-                <dpadbutton index="8">
-                    <slots>
-                        <slot>
-                            <code>0x41</code>
-                            <mode>keyboard</mode>
-                        </slot>
-                    </slots>
-                </dpadbutton>
-                <dpadbutton index="4">
-                    <slots>
-                        <slot>
-                            <code>0x53</code>
-                            <mode>keyboard</mode>
-                        </slot>
-                    </slots>
-                </dpadbutton>
-            </dpad>
-            <trigger index="6">
-                <center_value>0</center_value>
-                <min_value>-32767</min_value>
-                <max_value>32767</max_value>
-                <throttle>positivehalf</throttle>
-            </trigger>
-            <trigger index="5">
-                <center_value>0</center_value>
-                <min_value>-32767</min_value>
-                <max_value>32767</max_value>
-                <throttle>positivehalf</throttle>
-            </trigger>
-            <button index="2">
-                <slots>
-                    <slot>
-                        <code>0x58</code>
-                        <mode>keyboard</mode>
-                    </slot>
-                </slots>
-            </button>
-            <button index="7">
-                <slots>
-                    <slot>
-                        <code>0x43</code>
-                        <mode>keyboard</mode>
-                    </slot>
-                </slots>
-            </button>
-            <button index="5">
-                <slots>
-                    <slot>
-                        <code>0x56</code>
-                        <mode>keyboard</mode>
-                    </slot>
-                </slots>
-            </button>
-            <button index="4">
-                <slots>
-                    <slot>
-                        <code>0x5a</code>
-                        <mode>keyboard</mode>
-                    </slot>
-                </slots>
-            </button>
-        </set>
-    </sets>
-</gamecontroller>
diff --git a/debian/eggnoggpi/home/pi/.config/antimicrox/B.gamecontroller.amgp b/debian/eggnoggpi/home/pi/.config/antimicrox/B.gamecontroller.amgp
index 424b1a6..3adb3de 100644
--- a/debian/eggnoggpi/home/pi/.config/antimicrox/B.gamecontroller.amgp
+++ b/debian/eggnoggpi/home/pi/.config/antimicrox/B.gamecontroller.amgp
@@ -3,9 +3,9 @@
     <!--The SDL name for a joystick is included for informational purposes only.-->
     <sdlname>Retrolink SNES Controller</sdlname>
     <!--The Unique ID for a joystick is included for informational purposes only.-->
-    <uniqueID>0300000079000000110000001001000012117</uniqueID>
-    <stickAxisAssociation index="1" xAxis="1" yAxis="2"/>
+    <uniqueID>03006ce879000000110000001001000012117</uniqueID>
     <stickAxisAssociation index="2" xAxis="3" yAxis="4"/>
+    <stickAxisAssociation index="1" xAxis="1" yAxis="2"/>
     <vdpadButtonAssociations index="1">
         <vdpadButtonAssociation axis="0" button="12" direction="1"/>
         <vdpadButtonAssociation axis="0" button="13" direction="4"/>
@@ -13,16 +13,32 @@
         <vdpadButtonAssociation axis="0" button="15" direction="2"/>
     </vdpadButtonAssociations>
     <names>
-        <controlstickname index="1">Stick 1</controlstickname>
         <controlstickname index="2">Stick 2</controlstickname>
+        <controlstickname index="1">Stick 1</controlstickname>
     </names>
     <sets>
-        <set index="1">
+        <set index="2">
             <dpad index="1">
+                <dpadbutton index="2">
+                    <slots>
+                        <slot>
+                            <code>0x44</code>
+                            <mode>keyboard</mode>
+                        </slot>
+                    </slots>
+                </dpadbutton>
+                <dpadbutton index="1">
+                    <slots>
+                        <slot>
+                            <code>0x57</code>
+                            <mode>keyboard</mode>
+                        </slot>
+                    </slots>
+                </dpadbutton>
                 <dpadbutton index="4">
                     <slots>
                         <slot>
-                            <code>0x1000015</code>
+                            <code>0x53</code>
                             <mode>keyboard</mode>
                         </slot>
                     </slots>
@@ -30,11 +46,51 @@
                 <dpadbutton index="8">
                     <slots>
                         <slot>
-                            <code>0x1000012</code>
+                            <code>0x41</code>
                             <mode>keyboard</mode>
                         </slot>
                     </slots>
                 </dpadbutton>
+            </dpad>
+            <trigger index="6">
+                <center_value>0</center_value>
+                <min_value>-32767</min_value>
+                <max_value>32767</max_value>
+                <throttle>positivehalf</throttle>
+            </trigger>
+            <trigger index="5">
+                <center_value>0</center_value>
+                <min_value>-32767</min_value>
+                <max_value>32767</max_value>
+                <throttle>positivehalf</throttle>
+            </trigger>
+            <button index="2">
+                <slots>
+                    <slot>
+                        <code>0x58</code>
+                        <mode>keyboard</mode>
+                    </slot>
+                </slots>
+            </button>
+            <button index="1">
+                <slots>
+                    <slot>
+                        <code>0x5a</code>
+                        <mode>keyboard</mode>
+                    </slot>
+                </slots>
+            </button>
+            <button index="7">
+                <slots>
+                    <slot>
+                        <code>0x43</code>
+                        <mode>keyboard</mode>
+                    </slot>
+                </slots>
+            </button>
+        </set>
+        <set index="1">
+            <dpad index="1">
                 <dpadbutton index="2">
                     <slots>
                         <slot>
@@ -51,14 +107,30 @@
                         </slot>
                     </slots>
                 </dpadbutton>
+                <dpadbutton index="4">
+                    <slots>
+                        <slot>
+                            <code>0x1000015</code>
+                            <mode>keyboard</mode>
+                        </slot>
+                    </slots>
+                </dpadbutton>
+                <dpadbutton index="8">
+                    <slots>
+                        <slot>
+                            <code>0x1000012</code>
+                            <mode>keyboard</mode>
+                        </slot>
+                    </slots>
+                </dpadbutton>
             </dpad>
-            <trigger index="5">
+            <trigger index="6">
                 <center_value>0</center_value>
                 <min_value>-32767</min_value>
                 <max_value>32767</max_value>
                 <throttle>positivehalf</throttle>
             </trigger>
-            <trigger index="6">
+            <trigger index="5">
                 <center_value>0</center_value>
                 <min_value>-32767</min_value>
                 <max_value>32767</max_value>
@@ -80,6 +152,14 @@
                     </slot>
                 </slots>
             </button>
+            <button index="1">
+                <slots>
+                    <slot>
+                        <code>0x4a</code>
+                        <mode>keyboard</mode>
+                    </slot>
+                </slots>
+            </button>
             <button index="7">
                 <slots>
                     <slot>
diff --git a/debian/eggnoggpi/home/pi/.madgarden/settings.nogg b/debian/eggnoggpi/home/pi/.madgarden/settings.nogg
deleted file mode 100644
index 38c6208..0000000
Binary files a/debian/eggnoggpi/home/pi/.madgarden/settings.nogg and /dev/null differ
diff --git a/eggnoggpi.deb b/eggnoggpi.deb
index 5246ca7..a7c44da 100644
Binary files a/eggnoggpi.deb and b/eggnoggpi.deb differ