diff --git a/emu-configs/cemu/controllerProfiles/SteamInput-P1-Gyro.xml b/emu-configs/cemu/controllerProfiles/SteamInput-P1-Gyro.xml
index ed34dc53..209f6a5c 100644
--- a/emu-configs/cemu/controllerProfiles/SteamInput-P1-Gyro.xml
+++ b/emu-configs/cemu/controllerProfiles/SteamInput-P1-Gyro.xml
@@ -25,7 +25,7 @@
 	</controller>
 	<controller>
 		<api>SDLController</api>
-		<uuid>0_03000000de280000ff11000001000000</uuid>
+		<uuid>0_030079f6de280000ff11000001000000</uuid>
 		<display_name>Steam Virtual Gamepad</display_name>
 		<rumble>0</rumble>
 		<axis>
@@ -41,73 +41,25 @@
 			<range>1</range>
 		</trigger>
 		<mappings>
-			<entry>
-				<mapping>12</mapping>
-				<button>12</button>
-			</entry>
-			<entry>
-				<mapping>13</mapping>
-				<button>13</button>
-			</entry>
-			<entry>
-				<mapping>14</mapping>
-				<button>14</button>
-			</entry>
-			<entry>
-				<mapping>15</mapping>
-				<button>7</button>
-			</entry>
-			<entry>
-				<mapping>16</mapping>
-				<button>8</button>
-			</entry>
-			<entry>
-				<mapping>17</mapping>
-				<button>45</button>
-			</entry>
-			<entry>
-				<mapping>18</mapping>
-				<button>39</button>
-			</entry>
-			<entry>
-				<mapping>19</mapping>
-				<button>44</button>
-			</entry>
-			<entry>
-				<mapping>20</mapping>
-				<button>38</button>
-			</entry>
-			<entry>
-				<mapping>21</mapping>
-				<button>47</button>
-			</entry>
-			<entry>
-				<mapping>22</mapping>
-				<button>41</button>
-			</entry>
-			<entry>
-				<mapping>23</mapping>
-				<button>46</button>
-			</entry>
 			<entry>
 				<mapping>25</mapping>
 				<button>8</button>
 			</entry>
 			<entry>
 				<mapping>1</mapping>
-				<button>0</button>
-			</entry>
-			<entry>
-				<mapping>2</mapping>
 				<button>1</button>
 			</entry>
+			<entry>
+				<mapping>2</mapping>
+				<button>0</button>
+			</entry>
 			<entry>
 				<mapping>3</mapping>
-				<button>2</button>
+				<button>3</button>
 			</entry>
 			<entry>
 				<mapping>4</mapping>
-				<button>3</button>
+				<button>2</button>
 			</entry>
 			<entry>
 				<mapping>5</mapping>
@@ -141,6 +93,54 @@
 				<mapping>24</mapping>
 				<button>40</button>
 			</entry>
+			<entry>
+				<mapping>23</mapping>
+				<button>46</button>
+			</entry>
+			<entry>
+				<mapping>22</mapping>
+				<button>41</button>
+			</entry>
+			<entry>
+				<mapping>21</mapping>
+				<button>47</button>
+			</entry>
+			<entry>
+				<mapping>20</mapping>
+				<button>38</button>
+			</entry>
+			<entry>
+				<mapping>19</mapping>
+				<button>44</button>
+			</entry>
+			<entry>
+				<mapping>18</mapping>
+				<button>39</button>
+			</entry>
+			<entry>
+				<mapping>17</mapping>
+				<button>45</button>
+			</entry>
+			<entry>
+				<mapping>16</mapping>
+				<button>8</button>
+			</entry>
+			<entry>
+				<mapping>15</mapping>
+				<button>7</button>
+			</entry>
+			<entry>
+				<mapping>14</mapping>
+				<button>14</button>
+			</entry>
+			<entry>
+				<mapping>13</mapping>
+				<button>13</button>
+			</entry>
+			<entry>
+				<mapping>12</mapping>
+				<button>12</button>
+			</entry>
 		</mappings>
 	</controller>
 </emulated_controller>
diff --git a/emu-configs/cemu/controllerProfiles/SteamInput-P1.xml b/emu-configs/cemu/controllerProfiles/SteamInput-P1.xml
index b2f05d47..98f98ede 100644
--- a/emu-configs/cemu/controllerProfiles/SteamInput-P1.xml
+++ b/emu-configs/cemu/controllerProfiles/SteamInput-P1.xml
@@ -4,7 +4,7 @@
 	<profile>SteamInput-P1</profile>
 	<controller>
 		<api>SDLController</api>
-		<uuid>0_03000000de280000ff11000001000000</uuid>
+		<uuid>0_030079f6de280000ff11000001000000</uuid>
 		<display_name>Steam Virtual Gamepad</display_name>
 		<rumble>0</rumble>
 		<axis>
@@ -21,72 +21,64 @@
 		</trigger>
 		<mappings>
 			<entry>
-				<mapping>1</mapping>
-				<button>0</button>
-			</entry>
-			<entry>
-				<mapping>14</mapping>
-				<button>14</button>
-			</entry>
-			<entry>
-				<mapping>2</mapping>
-				<button>1</button>
-			</entry>
-			<entry>
-				<mapping>15</mapping>
-				<button>7</button>
-			</entry>
-			<entry>
-				<mapping>16</mapping>
+				<mapping>25</mapping>
 				<button>8</button>
 			</entry>
 			<entry>
-				<mapping>17</mapping>
-				<button>45</button>
-			</entry>
-			<entry>
-				<mapping>18</mapping>
-				<button>39</button>
-			</entry>
-			<entry>
-				<mapping>19</mapping>
-				<button>44</button>
-			</entry>
-			<entry>
-				<mapping>20</mapping>
-				<button>38</button>
-			</entry>
-			<entry>
-				<mapping>21</mapping>
-				<button>47</button>
-			</entry>
-			<entry>
-				<mapping>22</mapping>
-				<button>41</button>
+				<mapping>24</mapping>
+				<button>40</button>
 			</entry>
 			<entry>
 				<mapping>23</mapping>
 				<button>46</button>
 			</entry>
 			<entry>
-				<mapping>25</mapping>
+				<mapping>22</mapping>
+				<button>41</button>
+			</entry>
+			<entry>
+				<mapping>21</mapping>
+				<button>47</button>
+			</entry>
+			<entry>
+				<mapping>20</mapping>
+				<button>38</button>
+			</entry>
+			<entry>
+				<mapping>19</mapping>
+				<button>44</button>
+			</entry>
+			<entry>
+				<mapping>18</mapping>
+				<button>39</button>
+			</entry>
+			<entry>
+				<mapping>17</mapping>
+				<button>45</button>
+			</entry>
+			<entry>
+				<mapping>16</mapping>
 				<button>8</button>
 			</entry>
 			<entry>
-				<mapping>12</mapping>
-				<button>12</button>
+				<mapping>15</mapping>
+				<button>7</button>
+			</entry>
+			<entry>
+				<mapping>14</mapping>
+				<button>14</button>
 			</entry>
 			<entry>
 				<mapping>13</mapping>
 				<button>13</button>
 			</entry>
 			<entry>
-				<mapping>11</mapping>
-				<button>11</button>
+				<mapping>12</mapping>
+				<button>12</button>
 			</entry>
 			<entry>
-				<mapping>24</mapping>
-				<button>40</button>
+				<mapping>11</mapping>
+				<button>11</button>
 			</entry>
 			<entry>
 				<mapping>10</mapping>
@@ -114,11 +106,19 @@
 			</entry>
 			<entry>
 				<mapping>4</mapping>
-				<button>3</button>
+				<button>2</button>
 			</entry>
 			<entry>
 				<mapping>3</mapping>
-				<button>2</button>
+				<button>3</button>
+			</entry>
+			<entry>
+				<mapping>2</mapping>
+				<button>0</button>
+			</entry>
+			<entry>
+				<mapping>1</mapping>
+				<button>1</button>
 			</entry>
 		</mappings>
 	</controller>
diff --git a/emu-configs/cemu/controllerProfiles/controller0.xml b/emu-configs/cemu/controllerProfiles/controller0.xml
index 9517fa0f..4d0f6364 100644
--- a/emu-configs/cemu/controllerProfiles/controller0.xml
+++ b/emu-configs/cemu/controllerProfiles/controller0.xml
@@ -4,7 +4,7 @@
 	<profile>SteamInput-P1</profile>
 	<controller>
 		<api>SDLController</api>
-		<uuid>0_03000000de280000ff11000001000000</uuid>
+		<uuid>0_030079f6de280000ff11000001000000</uuid>
 		<display_name>Steam Virtual Gamepad</display_name>
 		<rumble>0</rumble>
 		<axis>
@@ -20,10 +20,62 @@
 			<range>1</range>
 		</trigger>
 		<mappings>
+			<entry>
+				<mapping>1</mapping>
+				<button>1</button>
+			</entry>
+			<entry>
+				<mapping>2</mapping>
+				<button>0</button>
+			</entry>
+			<entry>
+				<mapping>3</mapping>
+				<button>3</button>
+			</entry>
+			<entry>
+				<mapping>4</mapping>
+				<button>2</button>
+			</entry>
+			<entry>
+				<mapping>5</mapping>
+				<button>9</button>
+			</entry>
+			<entry>
+				<mapping>6</mapping>
+				<button>10</button>
+			</entry>
+			<entry>
+				<mapping>7</mapping>
+				<button>42</button>
+			</entry>
+			<entry>
+				<mapping>8</mapping>
+				<button>43</button>
+			</entry>
+			<entry>
+				<mapping>9</mapping>
+				<button>6</button>
+			</entry>
+			<entry>
+				<mapping>10</mapping>
+				<button>4</button>
+			</entry>
+			<entry>
+				<mapping>11</mapping>
+				<button>11</button>
+			</entry>
+			<entry>
+				<mapping>12</mapping>
+				<button>12</button>
+			</entry>
 			<entry>
 				<mapping>25</mapping>
 				<button>8</button>
 			</entry>
+			<entry>
+				<mapping>24</mapping>
+				<button>40</button>
+			</entry>
 			<entry>
 				<mapping>23</mapping>
 				<button>46</button>
@@ -60,66 +112,14 @@
 				<mapping>15</mapping>
 				<button>7</button>
 			</entry>
-			<entry>
-				<mapping>2</mapping>
-				<button>1</button>
-			</entry>
 			<entry>
 				<mapping>14</mapping>
 				<button>14</button>
 			</entry>
-			<entry>
-				<mapping>3</mapping>
-				<button>2</button>
-			</entry>
-			<entry>
-				<mapping>4</mapping>
-				<button>3</button>
-			</entry>
-			<entry>
-				<mapping>5</mapping>
-				<button>9</button>
-			</entry>
-			<entry>
-				<mapping>6</mapping>
-				<button>10</button>
-			</entry>
-			<entry>
-				<mapping>7</mapping>
-				<button>42</button>
-			</entry>
-			<entry>
-				<mapping>8</mapping>
-				<button>43</button>
-			</entry>
-			<entry>
-				<mapping>9</mapping>
-				<button>6</button>
-			</entry>
-			<entry>
-				<mapping>10</mapping>
-				<button>4</button>
-			</entry>
-			<entry>
-				<mapping>24</mapping>
-				<button>40</button>
-			</entry>
-			<entry>
-				<mapping>11</mapping>
-				<button>11</button>
-			</entry>
 			<entry>
 				<mapping>13</mapping>
 				<button>13</button>
 			</entry>
-			<entry>
-				<mapping>12</mapping>
-				<button>12</button>
-			</entry>
-			<entry>
-				<mapping>1</mapping>
-				<button>0</button>
-			</entry>
 		</mappings>
 	</controller>
 </emulated_controller>
diff --git a/emu-configs/cemu/controllerProfiles/controller1.xml b/emu-configs/cemu/controllerProfiles/controller1.xml
index 8cd44de7..7d94de0b 100644
--- a/emu-configs/cemu/controllerProfiles/controller1.xml
+++ b/emu-configs/cemu/controllerProfiles/controller1.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <emulated_controller>
 	<type>Wii U Pro Controller</type>
-	<profile>SteamInput-P2</profile>
 	<controller>
 		<api>SDLController</api>
 		<uuid>1_03000000de280000ff11000001000000</uuid>
@@ -19,65 +18,65 @@
 			<range>1</range>
 		</trigger>
 		<mappings>
+			<entry>
+				<mapping>12</mapping>
+				<button>11</button>
+			</entry>
 			<entry>
 				<mapping>13</mapping>
 				<button>12</button>
 			</entry>
-			<entry>
-				<mapping>14</mapping>
-				<button>13</button>
-			</entry>
-			<entry>
-				<mapping>15</mapping>
-				<button>14</button>
-			</entry>
-			<entry>
-				<mapping>16</mapping>
-				<button>7</button>
-			</entry>
-			<entry>
-				<mapping>17</mapping>
-				<button>8</button>
-			</entry>
-			<entry>
-				<mapping>18</mapping>
-				<button>45</button>
-			</entry>
-			<entry>
-				<mapping>19</mapping>
-				<button>39</button>
-			</entry>
-			<entry>
-				<mapping>20</mapping>
-				<button>44</button>
-			</entry>
-			<entry>
-				<mapping>21</mapping>
-				<button>38</button>
-			</entry>
-			<entry>
-				<mapping>22</mapping>
-				<button>47</button>
-			</entry>
 			<entry>
 				<mapping>23</mapping>
 				<button>41</button>
 			</entry>
 			<entry>
-				<mapping>1</mapping>
-				<button>0</button>
+				<mapping>22</mapping>
+				<button>47</button>
+			</entry>
+			<entry>
+				<mapping>21</mapping>
+				<button>38</button>
+			</entry>
+			<entry>
+				<mapping>20</mapping>
+				<button>44</button>
+			</entry>
+			<entry>
+				<mapping>19</mapping>
+				<button>39</button>
+			</entry>
+			<entry>
+				<mapping>18</mapping>
+				<button>45</button>
+			</entry>
+			<entry>
+				<mapping>17</mapping>
+				<button>8</button>
+			</entry>
+			<entry>
+				<mapping>16</mapping>
+				<button>7</button>
+			</entry>
+			<entry>
+				<mapping>15</mapping>
+				<button>14</button>
+			</entry>
+			<entry>
+				<mapping>24</mapping>
+				<button>46</button>
 			</entry>
 			<entry>
 				<mapping>2</mapping>
-				<button>1</button>
+				<button>0</button>
 			</entry>
 			<entry>
 				<mapping>3</mapping>
-				<button>2</button>
+				<button>3</button>
 			</entry>
 			<entry>
 				<mapping>4</mapping>
-				<button>3</button>
+				<button>2</button>
 			</entry>
 			<entry>
 				<mapping>5</mapping>
@@ -103,17 +102,17 @@
 				<mapping>10</mapping>
 				<button>4</button>
 			</entry>
-			<entry>
-				<mapping>12</mapping>
-				<button>11</button>
-			</entry>
 			<entry>
 				<mapping>25</mapping>
 				<button>40</button>
 			</entry>
 			<entry>
-				<mapping>24</mapping>
-				<button>46</button>
+				<mapping>14</mapping>
+				<button>13</button>
+			</entry>
+			<entry>
+				<mapping>1</mapping>
+				<button>1</button>
 			</entry>
 		</mappings>
 	</controller>
diff --git a/emu-configs/cemu/controllerProfiles/controller2.xml b/emu-configs/cemu/controllerProfiles/controller2.xml
index ed9033cf..3a45edb9 100644
--- a/emu-configs/cemu/controllerProfiles/controller2.xml
+++ b/emu-configs/cemu/controllerProfiles/controller2.xml
@@ -20,25 +20,29 @@
 		</trigger>
 		<mappings>
 			<entry>
-				<mapping>24</mapping>
-				<button>46</button>
+				<mapping>13</mapping>
+				<button>12</button>
 			</entry>
 			<entry>
-				<mapping>25</mapping>
-				<button>40</button>
-			</entry>
-			<entry>
-				<mapping>12</mapping>
-				<button>11</button>
+				<mapping>23</mapping>
+				<button>41</button>
 			</entry>
 			<entry>
 				<mapping>10</mapping>
 				<button>4</button>
 			</entry>
+			<entry>
+				<mapping>22</mapping>
+				<button>47</button>
+			</entry>
 			<entry>
 				<mapping>9</mapping>
 				<button>6</button>
 			</entry>
+			<entry>
+				<mapping>21</mapping>
+				<button>38</button>
+			</entry>
 			<entry>
 				<mapping>8</mapping>
 				<button>43</button>
@@ -60,21 +64,21 @@
 				<button>3</button>
 			</entry>
 			<entry>
-				<mapping>3</mapping>
-				<button>2</button>
+				<mapping>25</mapping>
+				<button>40</button>
 			</entry>
 			<entry>
-				<mapping>13</mapping>
-				<button>12</button>
-			</entry>
-			<entry>
-				<mapping>14</mapping>
-				<button>13</button>
+				<mapping>12</mapping>
+				<button>11</button>
 			</entry>
 			<entry>
 				<mapping>1</mapping>
 				<button>0</button>
 			</entry>
+			<entry>
+				<mapping>14</mapping>
+				<button>13</button>
+			</entry>
 			<entry>
 				<mapping>15</mapping>
 				<button>14</button>
@@ -87,6 +91,10 @@
 				<mapping>16</mapping>
 				<button>7</button>
 			</entry>
+			<entry>
+				<mapping>3</mapping>
+				<button>2</button>
+			</entry>
 			<entry>
 				<mapping>17</mapping>
 				<button>8</button>
@@ -104,16 +112,8 @@
 				<button>44</button>
 			</entry>
 			<entry>
-				<mapping>21</mapping>
-				<button>38</button>
-			</entry>
-			<entry>
-				<mapping>22</mapping>
-				<button>47</button>
-			</entry>
-			<entry>
-				<mapping>23</mapping>
-				<button>41</button>
+				<mapping>24</mapping>
+				<button>46</button>
 			</entry>
 		</mappings>
 	</controller>
diff --git a/emu-configs/cemu/controllerProfiles/controller3.xml b/emu-configs/cemu/controllerProfiles/controller3.xml
index c2c639ad..b3cc689f 100644
--- a/emu-configs/cemu/controllerProfiles/controller3.xml
+++ b/emu-configs/cemu/controllerProfiles/controller3.xml
@@ -20,25 +20,29 @@
 		</trigger>
 		<mappings>
 			<entry>
-				<mapping>24</mapping>
-				<button>46</button>
+				<mapping>13</mapping>
+				<button>12</button>
 			</entry>
 			<entry>
-				<mapping>25</mapping>
-				<button>40</button>
-			</entry>
-			<entry>
-				<mapping>12</mapping>
-				<button>11</button>
+				<mapping>23</mapping>
+				<button>41</button>
 			</entry>
 			<entry>
 				<mapping>10</mapping>
 				<button>4</button>
 			</entry>
+			<entry>
+				<mapping>22</mapping>
+				<button>47</button>
+			</entry>
 			<entry>
 				<mapping>9</mapping>
 				<button>6</button>
 			</entry>
+			<entry>
+				<mapping>21</mapping>
+				<button>38</button>
+			</entry>
 			<entry>
 				<mapping>8</mapping>
 				<button>43</button>
@@ -60,21 +64,21 @@
 				<button>3</button>
 			</entry>
 			<entry>
-				<mapping>3</mapping>
-				<button>2</button>
+				<mapping>25</mapping>
+				<button>40</button>
 			</entry>
 			<entry>
-				<mapping>13</mapping>
-				<button>12</button>
-			</entry>
-			<entry>
-				<mapping>14</mapping>
-				<button>13</button>
+				<mapping>12</mapping>
+				<button>11</button>
 			</entry>
 			<entry>
 				<mapping>1</mapping>
 				<button>0</button>
 			</entry>
+			<entry>
+				<mapping>14</mapping>
+				<button>13</button>
+			</entry>
 			<entry>
 				<mapping>15</mapping>
 				<button>14</button>
@@ -87,6 +91,10 @@
 				<mapping>16</mapping>
 				<button>7</button>
 			</entry>
+			<entry>
+				<mapping>3</mapping>
+				<button>2</button>
+			</entry>
 			<entry>
 				<mapping>17</mapping>
 				<button>8</button>
@@ -104,16 +112,8 @@
 				<button>44</button>
 			</entry>
 			<entry>
-				<mapping>21</mapping>
-				<button>38</button>
-			</entry>
-			<entry>
-				<mapping>22</mapping>
-				<button>47</button>
-			</entry>
-			<entry>
-				<mapping>23</mapping>
-				<button>41</button>
+				<mapping>24</mapping>
+				<button>46</button>
 			</entry>
 		</mappings>
 	</controller>