diff --git a/emu-configs/cemu/controllerProfiles/SteamInput-P1-Gyro.xml b/emu-configs/cemu/controllerProfiles/SteamInput-P1-Gyro.xml
index 83531018..ed34dc53 100644
--- a/emu-configs/cemu/controllerProfiles/SteamInput-P1-Gyro.xml
+++ b/emu-configs/cemu/controllerProfiles/SteamInput-P1-Gyro.xml
@@ -42,100 +42,104 @@
 		</trigger>
 		<mappings>
 			<entry>
-				<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>
+				<mapping>12</mapping>
+				<button>12</button>
 			</entry>
 			<entry>
 				<mapping>13</mapping>
 				<button>13</button>
 			</entry>
 			<entry>
-				<mapping>12</mapping>
-				<button>12</button>
+				<mapping>14</mapping>
+				<button>14</button>
 			</entry>
 			<entry>
-				<mapping>11</mapping>
-				<button>11</button>
+				<mapping>15</mapping>
+				<button>7</button>
 			</entry>
 			<entry>
-				<mapping>10</mapping>
-				<button>4</button>
+				<mapping>16</mapping>
+				<button>8</button>
 			</entry>
 			<entry>
-				<mapping>9</mapping>
-				<button>6</button>
+				<mapping>17</mapping>
+				<button>45</button>
 			</entry>
 			<entry>
-				<mapping>8</mapping>
-				<button>43</button>
+				<mapping>18</mapping>
+				<button>39</button>
 			</entry>
 			<entry>
-				<mapping>7</mapping>
-				<button>42</button>
+				<mapping>19</mapping>
+				<button>44</button>
 			</entry>
 			<entry>
-				<mapping>6</mapping>
-				<button>10</button>
+				<mapping>20</mapping>
+				<button>38</button>
 			</entry>
 			<entry>
-				<mapping>5</mapping>
-				<button>9</button>
+				<mapping>21</mapping>
+				<button>47</button>
 			</entry>
 			<entry>
-				<mapping>4</mapping>
-				<button>3</button>
+				<mapping>22</mapping>
+				<button>41</button>
 			</entry>
 			<entry>
-				<mapping>3</mapping>
-				<button>2</button>
+				<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>1</mapping>
-				<button>0</button>
+				<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>11</mapping>
+				<button>11</button>
+			</entry>
+			<entry>
+				<mapping>24</mapping>
+				<button>40</button>
 			</entry>
 		</mappings>
 	</controller>
diff --git a/emu-configs/cemu/controllerProfiles/SteamInput-P1.xml b/emu-configs/cemu/controllerProfiles/SteamInput-P1.xml
index e62e1b06..b2f05d47 100644
--- a/emu-configs/cemu/controllerProfiles/SteamInput-P1.xml
+++ b/emu-configs/cemu/controllerProfiles/SteamInput-P1.xml
@@ -21,92 +21,56 @@
 		</trigger>
 		<mappings>
 			<entry>
-				<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>
+				<mapping>1</mapping>
+				<button>0</button>
 			</entry>
 			<entry>
 				<mapping>14</mapping>
 				<button>14</button>
 			</entry>
-			<entry>
-				<mapping>1</mapping>
-				<button>0</button>
-			</entry>
 			<entry>
 				<mapping>2</mapping>
 				<button>1</button>
 			</entry>
 			<entry>
-				<mapping>3</mapping>
-				<button>2</button>
+				<mapping>15</mapping>
+				<button>7</button>
 			</entry>
 			<entry>
-				<mapping>4</mapping>
-				<button>3</button>
+				<mapping>16</mapping>
+				<button>8</button>
 			</entry>
 			<entry>
-				<mapping>5</mapping>
-				<button>9</button>
+				<mapping>17</mapping>
+				<button>45</button>
 			</entry>
 			<entry>
-				<mapping>6</mapping>
-				<button>10</button>
+				<mapping>18</mapping>
+				<button>39</button>
 			</entry>
 			<entry>
-				<mapping>7</mapping>
-				<button>42</button>
+				<mapping>19</mapping>
+				<button>44</button>
 			</entry>
 			<entry>
-				<mapping>8</mapping>
-				<button>43</button>
+				<mapping>20</mapping>
+				<button>38</button>
 			</entry>
 			<entry>
-				<mapping>9</mapping>
-				<button>6</button>
+				<mapping>21</mapping>
+				<button>47</button>
 			</entry>
 			<entry>
-				<mapping>10</mapping>
-				<button>4</button>
+				<mapping>22</mapping>
+				<button>41</button>
 			</entry>
 			<entry>
-				<mapping>11</mapping>
-				<button>11</button>
+				<mapping>23</mapping>
+				<button>46</button>
+			</entry>
+			<entry>
+				<mapping>25</mapping>
+				<button>8</button>
 			</entry>
 			<entry>
 				<mapping>12</mapping>
@@ -116,6 +80,46 @@
 				<mapping>13</mapping>
 				<button>13</button>
 			</entry>
+			<entry>
+				<mapping>11</mapping>
+				<button>11</button>
+			</entry>
+			<entry>
+				<mapping>24</mapping>
+				<button>40</button>
+			</entry>
+			<entry>
+				<mapping>10</mapping>
+				<button>4</button>
+			</entry>
+			<entry>
+				<mapping>9</mapping>
+				<button>6</button>
+			</entry>
+			<entry>
+				<mapping>8</mapping>
+				<button>43</button>
+			</entry>
+			<entry>
+				<mapping>7</mapping>
+				<button>42</button>
+			</entry>
+			<entry>
+				<mapping>6</mapping>
+				<button>10</button>
+			</entry>
+			<entry>
+				<mapping>5</mapping>
+				<button>9</button>
+			</entry>
+			<entry>
+				<mapping>4</mapping>
+				<button>3</button>
+			</entry>
+			<entry>
+				<mapping>3</mapping>
+				<button>2</button>
+			</entry>
 		</mappings>
 	</controller>
 </emulated_controller>
diff --git a/emu-configs/cemu/controllerProfiles/controller0.xml b/emu-configs/cemu/controllerProfiles/controller0.xml
index e62e1b06..9517fa0f 100644
--- a/emu-configs/cemu/controllerProfiles/controller0.xml
+++ b/emu-configs/cemu/controllerProfiles/controller0.xml
@@ -21,8 +21,8 @@
 		</trigger>
 		<mappings>
 			<entry>
-				<mapping>24</mapping>
-				<button>40</button>
+				<mapping>25</mapping>
+				<button>8</button>
 			</entry>
 			<entry>
 				<mapping>23</mapping>
@@ -60,18 +60,14 @@
 				<mapping>15</mapping>
 				<button>7</button>
 			</entry>
-			<entry>
-				<mapping>14</mapping>
-				<button>14</button>
-			</entry>
-			<entry>
-				<mapping>1</mapping>
-				<button>0</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>
@@ -104,17 +100,25 @@
 				<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>13</mapping>
-				<button>13</button>
+				<mapping>1</mapping>
+				<button>0</button>
 			</entry>
 		</mappings>
 	</controller>