diff --git a/touch-layouts/2017826215.json b/touch-layouts/2017826215.json
new file mode 100644
index 0000000..58d641c
--- /dev/null
+++ b/touch-layouts/2017826215.json
@@ -0,0 +1,7 @@
+{
+  "name": "Metal Gear Solid 2",
+  "default_layout": "custom",
+  "layouts": [
+    "metal-gear-solid-2"
+  ]
+}
\ No newline at end of file
diff --git a/touch-layouts/2025840804.json b/touch-layouts/2025840804.json
new file mode 100644
index 0000000..2d52ca8
--- /dev/null
+++ b/touch-layouts/2025840804.json
@@ -0,0 +1,7 @@
+{
+  "name": "Metal Gear Solid 3",
+  "default_layout": "custom",
+  "layouts": [
+    "metal-gear-solid-3"
+  ]
+}
\ No newline at end of file
diff --git a/touch-layouts/2049727100.json b/touch-layouts/2049727100.json
new file mode 100644
index 0000000..b060227
--- /dev/null
+++ b/touch-layouts/2049727100.json
@@ -0,0 +1,7 @@
+{
+  "name": "Metal Gear Solid 1",
+  "default_layout": "custom",
+  "layouts": [
+    "metal-gear-solid-1"
+  ]
+}
\ No newline at end of file
diff --git a/touch-layouts/656062883.json b/touch-layouts/656062883.json
new file mode 100644
index 0000000..eec1683
--- /dev/null
+++ b/touch-layouts/656062883.json
@@ -0,0 +1,7 @@
+{
+  "name": "Metal Gear Solid: HD Collection",
+  "default_layout": "mgs2",
+  "layouts": [
+    "metal-gear-solid-hd"
+  ]
+}
\ No newline at end of file
diff --git a/touch-layouts/layouts/gta-4.json b/touch-layouts/layouts/gta-4.json
index dee4e34..49c5a21 100644
--- a/touch-layouts/layouts/gta-4.json
+++ b/touch-layouts/layouts/gta-4.json
@@ -9,7 +9,6 @@
           "inner": [
             {
               "type": "joystick",
-              "expand": false,
               "axis": {
                 "input": "axisXY",
                 "output": "leftJoystick"
@@ -227,4 +226,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/touch-layouts/layouts/gta-de.json b/touch-layouts/layouts/gta-de.json
index 0e3cb6c..7b9d849 100644
--- a/touch-layouts/layouts/gta-de.json
+++ b/touch-layouts/layouts/gta-de.json
@@ -9,7 +9,6 @@
           "inner": [
             {
               "type": "joystick",
-              "expand": false,
               "axis": {
                 "input": "axisXY",
                 "output": "leftJoystick"
@@ -39,21 +38,18 @@
               "action": "leftTrigger",
               "styles": {
                 "default": {
-                  "outline": {
-                    "indicator": {
-                      "type": "color",
-                      "value": "#ffffff"
-                    },
-                    "stroke": {
-                      "type": "solid",
-                      "color": "#ffffff"
-                    },
-                    "opacity": 0.5
-                  },
                   "knob": {
                     "faceImage": {
                       "type": "icon",
                       "value": "leftTrigger"
+                    },
+                    "background": {
+                      "type": "color",
+                      "value": "#ffffff",
+                      "opacity": 0.1
+                    },
+                    "stroke": {
+                      "opacity": 0.1
                     }
                   }
                 }
@@ -72,21 +68,18 @@
               "action": "leftBumper",
               "styles": {
                 "default": {
-                  "outline": {
-                    "indicator": {
-                      "type": "color",
-                      "value": "#ffffff"
-                    },
-                    "stroke": {
-                      "type": "solid",
-                      "color": "#ffffff"
-                    },
-                    "opacity": 0.5
-                  },
                   "knob": {
                     "faceImage": {
                       "type": "icon",
                       "value": "leftBumper"
+                    },
+                    "background": {
+                      "type": "color",
+                      "value": "#ffffff",
+                      "opacity": 0.1
+                    },
+                    "stroke": {
+                      "opacity": 0.1
                     }
                   }
                 }
@@ -228,4 +221,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/touch-layouts/layouts/gta-v.json b/touch-layouts/layouts/gta-v.json
index 4d06749..971b98e 100644
--- a/touch-layouts/layouts/gta-v.json
+++ b/touch-layouts/layouts/gta-v.json
@@ -9,7 +9,6 @@
           "inner": [
             {
               "type": "joystick",
-              "expand": false,
               "axis": {
                 "input": "axisXY",
                 "output": "leftJoystick"
@@ -227,4 +226,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/touch-layouts/layouts/metal-gear-solid-1.json b/touch-layouts/layouts/metal-gear-solid-1.json
new file mode 100644
index 0000000..7e6f70e
--- /dev/null
+++ b/touch-layouts/layouts/metal-gear-solid-1.json
@@ -0,0 +1,190 @@
+{
+  "schema_version": 1,
+  "layouts": {
+    "custom": {
+      "name": "Custom",
+      "author": "Kode-Z",
+      "content": {
+        "layers": {
+          "rJoystick": {
+            "right": {
+              "inner": [
+                {
+                  "type": "joystick",
+                  "axis": {
+                    "input": "axisXY",
+                    "output": "leftJoystick"
+                  }
+                }
+              ]
+            }
+          }
+        },
+        "left": {
+          "inner": [
+            {
+              "type": "joystick",
+              "axis": {
+                "input": "axisXY",
+                "output": "leftJoystick"
+              }
+            }
+          ],
+          "outer": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            {
+              "type": "button",
+              "action": "leftBumper"
+            },
+            [
+              {
+                "type": "button",
+                "action": [
+                  "leftTrigger",
+                  {
+                    "type": "layer",
+                    "target": "rJoystick"
+                  }
+                ],
+                "styles": {
+                  "default": {
+                    "faceImage": {
+                      "type": "icon",
+                      "value": "leftTrigger"
+                    }
+                  }
+                }
+              }
+            ]
+          ]
+        },
+        "right": {
+          "inner": [
+            {
+              "type": "joystick",
+              "axis": {
+                "input": "axisXY",
+                "output": "rightJoystick"
+              }
+            }
+          ],
+          "outer": [
+            [
+              {
+                "type": "button",
+                "action": "rightTrigger"
+              }
+            ],
+            {
+              "type": "button",
+              "action": "rightBumper"
+            },
+            null,
+            [
+              null,
+              {
+                "type": "touchpad",
+                "axis": {
+                  "input": "axisXY",
+                  "output": "rightJoystick",
+                  "sensitivity": 5,
+                  "deadzone": {
+                    "threshold": 0,
+                    "radial": true
+                  }
+                },
+                "renderAsButton": true,
+                "action": [
+                  "gamepadB"
+                ],
+                "styles": {
+                  "default": {
+                    "faceImage": {
+                      "type": "icon",
+                      "value": "lightPunch3"
+                    }
+                  }
+                }
+              },
+              {
+                "type": "button",
+                "action": "gamepadA",
+                "styles": {
+                  "default": {
+                    "faceImage": {
+                      "type": "icon",
+                      "value": "crouch"
+                    }
+                  }
+                }
+              }
+            ],
+            {
+              "type": "touchpad",
+              "axis": {
+                "input": "axisXY",
+                "output": "leftJoystick",
+                "sensitivity": 5,
+                "deadzone": {
+                  "threshold": 0,
+                  "radial": true
+                }
+              },
+              "renderAsButton": true,
+              "action": [
+                "gamepadX"
+              ],
+              "styles": {
+                "default": {
+                  "faceImage": {
+                    "type": "icon",
+                    "value": "fire"
+                  }
+                }
+              }
+            },
+            {
+              "type": "button",
+              "action": "gamepadY",
+              "styles": {
+                "default": {
+                  "faceImage": {
+                    "type": "icon",
+                    "value": "look"
+                  }
+                }
+              },
+              "toggle": true
+            }
+          ]
+        },
+        "lower": {
+          "leftCenter": [
+            {
+              "type": "button",
+              "action": "view",
+              "styles": {
+                "default": {
+                  "faceImage": {
+                    "type": "icon",
+                    "value": "radio"
+                  }
+                }
+              }
+            }
+          ],
+          "rightCenter": [
+            {
+              "type": "button",
+              "action": "menu"
+            }
+          ]
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/touch-layouts/layouts/metal-gear-solid-2.json b/touch-layouts/layouts/metal-gear-solid-2.json
new file mode 100644
index 0000000..a069fdc
--- /dev/null
+++ b/touch-layouts/layouts/metal-gear-solid-2.json
@@ -0,0 +1,220 @@
+{
+  "schema_version": 1,
+  "layouts": {
+    "custom": {
+      "name": "Custom",
+      "author": "Kode-Z",
+      "content": {
+        "layers": {
+          "rJoystick": {
+            "right": {
+              "inner": [
+                {
+                  "type": "joystick",
+                  "axis": {
+                    "input": "axisXY",
+                    "output": "leftJoystick"
+                  }
+                }
+              ]
+            }
+          }
+        },
+        "left": {
+          "inner": [
+            {
+              "type": "joystick",
+              "axis": {
+                "input": "axisXY",
+                "output": "leftJoystick"
+              }
+            }
+          ],
+          "outer": [
+            {
+              "type": "button",
+              "action": "rightBumper",
+              "toggle": true
+            },
+            null,
+            null,
+            null,
+            [
+              {
+                "type": "joystick",
+                "axis": {
+                  "input": "axisXY",
+                  "output": "leftJoystick",
+                  "deadzone": {
+                    "threshold": 0,
+                    "radial": true
+                  }
+                },
+                "action": "leftBumper",
+                "styles": {
+                  "default": {
+                    "knob": {
+                      "faceImage": {
+                        "type": "icon",
+                        "value": "leftBumper"
+                      },
+                      "background": {
+                        "type": "color",
+                        "value": "#ffffff",
+                        "opacity": 0.1
+                      },
+                      "stroke": {
+                        "opacity": 0.1
+                      }
+                    }
+                  }
+                }
+              }
+            ],
+            [
+              {
+                "type": "button",
+                "action": [
+                  "leftTrigger",
+                  {
+                    "type": "layer",
+                    "target": "rJoystick"
+                  }
+                ],
+                "styles": {
+                  "default": {
+                    "faceImage": {
+                      "type": "icon",
+                      "value": "leftTrigger"
+                    }
+                  }
+                }
+              }
+            ]
+          ]
+        },
+        "right": {
+          "inner": [
+            {
+              "type": "joystick",
+              "axis": {
+                "input": "axisXY",
+                "output": "rightJoystick"
+              }
+            }
+          ],
+          "outer": [
+            [
+              {
+                "type": "button",
+                "action": "rightTrigger"
+              }
+            ],
+            {
+              "type": "button",
+              "action": "gamepadA",
+              "styles": {
+                "default": {
+                  "faceImage": {
+                    "type": "icon",
+                    "value": "crouch"
+                  }
+                }
+              }
+            },
+            null,
+            [
+              null,
+              {
+                "type": "touchpad",
+                "axis": {
+                  "input": "axisXY",
+                  "output": "rightJoystick",
+                  "sensitivity": 5,
+                  "deadzone": {
+                    "threshold": 0,
+                    "radial": true
+                  }
+                },
+                "renderAsButton": true,
+                "action": [
+                  "gamepadB"
+                ],
+                "styles": {
+                  "default": {
+                    "faceImage": {
+                      "type": "icon",
+                      "value": "lightPunch3"
+                    }
+                  }
+                }
+              },
+              {
+                "type": "button",
+                "action": "gamepadY",
+                "styles": {
+                  "default": {
+                    "faceImage": {
+                      "type": "icon",
+                      "value": "interact"
+                    }
+                  }
+                }
+              }
+            ],
+            {
+              "type": "touchpad",
+              "axis": {
+                "input": "axisXY",
+                "output": "leftJoystick",
+                "sensitivity": 5,
+                "deadzone": {
+                  "threshold": 0,
+                  "radial": true
+                }
+              },
+              "renderAsButton": true,
+              "action": [
+                "gamepadX"
+              ],
+              "styles": {
+                "default": {
+                  "faceImage": {
+                    "type": "icon",
+                    "value": "fire"
+                  }
+                }
+              }
+            },
+            {
+              "type": "button",
+              "action": "leftThumb"
+            }
+          ]
+        },
+        "lower": {
+          "leftCenter": [
+            {
+              "type": "button",
+              "action": "view",
+              "styles": {
+                "default": {
+                  "faceImage": {
+                    "type": "icon",
+                    "value": "radio"
+                  }
+                }
+              }
+            }
+          ],
+          "rightCenter": [
+            {
+              "type": "button",
+              "action": "menu"
+            }
+          ]
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/touch-layouts/layouts/metal-gear-solid-3.json b/touch-layouts/layouts/metal-gear-solid-3.json
new file mode 100644
index 0000000..15d75bb
--- /dev/null
+++ b/touch-layouts/layouts/metal-gear-solid-3.json
@@ -0,0 +1,243 @@
+{
+  "schema_version": 1,
+  "layouts": {
+    "custom": {
+      "name": "Custom",
+      "author": "Kode-Z",
+      "content": {
+        "layers": {
+          "rJoystick": {
+            "right": {
+              "inner": [
+                {
+                  "type": "joystick",
+                  "axis": {
+                    "input": "axisXY",
+                    "output": "leftJoystick"
+                  }
+                }
+              ]
+            }
+          }
+        },
+        "left": {
+          "inner": [
+            {
+              "type": "joystick",
+              "axis": {
+                "input": "axisXY",
+                "output": "leftJoystick"
+              }
+            }
+          ],
+          "outer": [
+            {
+              "type": "button",
+              "action": "rightBumper",
+              "toggle": true
+            },
+            null,
+            [
+              {
+                "type": "directionalPad",
+                "interaction": {
+                  "activationType": "exclusive"
+                },
+                "scale": 1.3
+              }
+            ],
+            [
+              {
+                "type": "joystick",
+                "axis": {
+                  "input": "axisXY",
+                  "output": "leftJoystick",
+                  "deadzone": {
+                    "threshold": 0,
+                    "radial": true
+                  }
+                },
+                "action": "leftBumper",
+                "styles": {
+                  "default": {
+                    "knob": {
+                      "faceImage": {
+                        "type": "icon",
+                        "value": "leftBumper"
+                      },
+                      "background": {
+                        "type": "color",
+                        "value": "#ffffff",
+                        "opacity": 0.1
+                      },
+                      "stroke": {
+                        "opacity": 0.1
+                      }
+                    }
+                  }
+                }
+              }
+            ],
+            [
+              {
+                "type": "button",
+                "action": [
+                  "leftTrigger",
+                  {
+                    "type": "layer",
+                    "target": "rJoystick"
+                  }
+                ],
+                "styles": {
+                  "default": {
+                    "faceImage": {
+                      "type": "icon",
+                      "value": "leftTrigger"
+                    }
+                  }
+                }
+              }
+            ]
+          ]
+        },
+        "right": {
+          "inner": [
+            {
+              "type": "joystick",
+              "axis": {
+                "input": "axisXY",
+                "output": "rightJoystick"
+              }
+            }
+          ],
+          "outer": [
+            [
+              {
+                "type": "button",
+                "action": "rightTrigger"
+              }
+            ],
+            {
+              "type": "button",
+              "action": "gamepadA",
+              "styles": {
+                "default": {
+                  "faceImage": {
+                    "type": "icon",
+                    "value": "crouch"
+                  }
+                }
+              }
+            },
+            null,
+            [
+              null,
+              {
+                "type": "touchpad",
+                "axis": {
+                  "input": "axisXY",
+                  "output": "rightJoystick",
+                  "sensitivity": 5,
+                  "deadzone": {
+                    "threshold": 0,
+                    "radial": true
+                  }
+                },
+                "renderAsButton": true,
+                "action": [
+                  "gamepadB"
+                ],
+                "styles": {
+                  "default": {
+                    "faceImage": {
+                      "type": "icon",
+                      "value": "lightPunch3"
+                    }
+                  }
+                }
+              },
+              {
+                "type": "button",
+                "action": "gamepadY",
+                "styles": {
+                  "default": {
+                    "faceImage": {
+                      "type": "icon",
+                      "value": "interact"
+                    }
+                  }
+                }
+              }
+            ],
+            {
+              "type": "touchpad",
+              "axis": {
+                "input": "axisXY",
+                "output": "leftJoystick",
+                "sensitivity": 5,
+                "deadzone": {
+                  "threshold": 0,
+                  "radial": true
+                }
+              },
+              "renderAsButton": true,
+              "action": [
+                "gamepadX"
+              ],
+              "styles": {
+                "default": {
+                  "faceImage": {
+                    "type": "icon",
+                    "value": "fire"
+                  }
+                }
+              }
+            },
+            {
+              "type": "button",
+              "action": "leftThumb"
+            }
+          ]
+        },
+        "upper": {
+          "right": [
+            {
+              "type": "button",
+              "action": "rightThumb",
+              "styles": {
+                "default": {
+                  "faceImage": {
+                    "type": "icon",
+                    "value": "switchCamera"
+                  }
+                }
+              }
+            }
+          ]
+        },
+        "lower": {
+          "leftCenter": [
+            {
+              "type": "button",
+              "action": "view",
+              "styles": {
+                "default": {
+                  "faceImage": {
+                    "type": "icon",
+                    "value": "radio"
+                  }
+                }
+              }
+            }
+          ],
+          "rightCenter": [
+            {
+              "type": "button",
+              "action": "menu"
+            }
+          ]
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/touch-layouts/layouts/metal-gear-solid-hd.json b/touch-layouts/layouts/metal-gear-solid-hd.json
new file mode 100644
index 0000000..16a4746
--- /dev/null
+++ b/touch-layouts/layouts/metal-gear-solid-hd.json
@@ -0,0 +1,458 @@
+{
+  "schema_version": 1,
+  "layouts": {
+    "mgs2": {
+      "name": "MGS 2",
+      "author": "Kode-Z",
+      "content": {
+        "layers": {
+          "rJoystick": {
+            "right": {
+              "inner": [
+                {
+                  "type": "joystick",
+                  "axis": {
+                    "input": "axisXY",
+                    "output": "leftJoystick"
+                  }
+                }
+              ]
+            }
+          }
+        },
+        "left": {
+          "inner": [
+            {
+              "type": "joystick",
+              "axis": {
+                "input": "axisXY",
+                "output": "leftJoystick"
+              }
+            }
+          ],
+          "outer": [
+            {
+              "type": "button",
+              "action": "rightBumper",
+              "toggle": true
+            },
+            null,
+            null,
+            null,
+            [
+              {
+                "type": "joystick",
+                "axis": {
+                  "input": "axisXY",
+                  "output": "leftJoystick",
+                  "deadzone": {
+                    "threshold": 0,
+                    "radial": true
+                  }
+                },
+                "action": "leftBumper",
+                "styles": {
+                  "default": {
+                    "knob": {
+                      "faceImage": {
+                        "type": "icon",
+                        "value": "leftBumper"
+                      },
+                      "background": {
+                        "type": "color",
+                        "value": "#ffffff",
+                        "opacity": 0.1
+                      },
+                      "stroke": {
+                        "opacity": 0.1
+                      }
+                    }
+                  }
+                }
+              }
+            ],
+            [
+              {
+                "type": "button",
+                "action": [
+                  "leftTrigger",
+                  {
+                    "type": "layer",
+                    "target": "rJoystick"
+                  }
+                ],
+                "styles": {
+                  "default": {
+                    "faceImage": {
+                      "type": "icon",
+                      "value": "leftTrigger"
+                    }
+                  }
+                }
+              }
+            ]
+          ]
+        },
+        "right": {
+          "inner": [
+            {
+              "type": "joystick",
+              "axis": {
+                "input": "axisXY",
+                "output": "rightJoystick"
+              }
+            }
+          ],
+          "outer": [
+            [
+              {
+                "type": "button",
+                "action": "rightTrigger"
+              }
+            ],
+            {
+              "type": "button",
+              "action": "gamepadA",
+              "styles": {
+                "default": {
+                  "faceImage": {
+                    "type": "icon",
+                    "value": "crouch"
+                  }
+                }
+              }
+            },
+            null,
+            [
+              null,
+              {
+                "type": "touchpad",
+                "axis": {
+                  "input": "axisXY",
+                  "output": "rightJoystick",
+                  "sensitivity": 5,
+                  "deadzone": {
+                    "threshold": 0,
+                    "radial": true
+                  }
+                },
+                "renderAsButton": true,
+                "action": [
+                  "gamepadB"
+                ],
+                "styles": {
+                  "default": {
+                    "faceImage": {
+                      "type": "icon",
+                      "value": "lightPunch3"
+                    }
+                  }
+                }
+              },
+              {
+                "type": "button",
+                "action": "gamepadY",
+                "styles": {
+                  "default": {
+                    "faceImage": {
+                      "type": "icon",
+                      "value": "interact"
+                    }
+                  }
+                }
+              }
+            ],
+            {
+              "type": "touchpad",
+              "axis": {
+                "input": "axisXY",
+                "output": "leftJoystick",
+                "sensitivity": 5,
+                "deadzone": {
+                  "threshold": 0,
+                  "radial": true
+                }
+              },
+              "renderAsButton": true,
+              "action": [
+                "gamepadX"
+              ],
+              "styles": {
+                "default": {
+                  "faceImage": {
+                    "type": "icon",
+                    "value": "fire"
+                  }
+                }
+              }
+            },
+            {
+              "type": "button",
+              "action": "leftThumb"
+            }
+          ]
+        },
+        "lower": {
+          "leftCenter": [
+            {
+              "type": "button",
+              "action": "view",
+              "styles": {
+                "default": {
+                  "faceImage": {
+                    "type": "icon",
+                    "value": "radio"
+                  }
+                }
+              }
+            }
+          ],
+          "rightCenter": [
+            {
+              "type": "button",
+              "action": "menu"
+            }
+          ]
+        }
+      }
+    },
+    "mgs3": {
+      "name": "MGS 3",
+      "author": "Kode-Z",
+      "content": {
+        "layers": {
+          "rJoystick": {
+            "right": {
+              "inner": [
+                {
+                  "type": "joystick",
+                  "axis": {
+                    "input": "axisXY",
+                    "output": "leftJoystick"
+                  }
+                }
+              ]
+            }
+          }
+        },
+        "left": {
+          "inner": [
+            {
+              "type": "joystick",
+              "axis": {
+                "input": "axisXY",
+                "output": "leftJoystick"
+              }
+            }
+          ],
+          "outer": [
+            {
+              "type": "button",
+              "action": "rightBumper",
+              "toggle": true
+            },
+            null,
+            [
+              {
+                "type": "directionalPad",
+                "interaction": {
+                  "activationType": "exclusive"
+                },
+                "scale": 1.3
+              }
+            ],
+            [
+              {
+                "type": "joystick",
+                "axis": {
+                  "input": "axisXY",
+                  "output": "leftJoystick",
+                  "deadzone": {
+                    "threshold": 0,
+                    "radial": true
+                  }
+                },
+                "action": "leftBumper",
+                "styles": {
+                  "default": {
+                    "knob": {
+                      "faceImage": {
+                        "type": "icon",
+                        "value": "leftBumper"
+                      },
+                      "background": {
+                        "type": "color",
+                        "value": "#ffffff",
+                        "opacity": 0.1
+                      },
+                      "stroke": {
+                        "opacity": 0.1
+                      }
+                    }
+                  }
+                }
+              }
+            ],
+            [
+              {
+                "type": "button",
+                "action": [
+                  "leftTrigger",
+                  {
+                    "type": "layer",
+                    "target": "rJoystick"
+                  }
+                ],
+                "styles": {
+                  "default": {
+                    "faceImage": {
+                      "type": "icon",
+                      "value": "leftTrigger"
+                    }
+                  }
+                }
+              }
+            ]
+          ]
+        },
+        "right": {
+          "inner": [
+            {
+              "type": "joystick",
+              "axis": {
+                "input": "axisXY",
+                "output": "rightJoystick"
+              }
+            }
+          ],
+          "outer": [
+            [
+              {
+                "type": "button",
+                "action": "rightTrigger"
+              }
+            ],
+            {
+              "type": "button",
+              "action": "gamepadA",
+              "styles": {
+                "default": {
+                  "faceImage": {
+                    "type": "icon",
+                    "value": "crouch"
+                  }
+                }
+              }
+            },
+            null,
+            [
+              null,
+              {
+                "type": "touchpad",
+                "axis": {
+                  "input": "axisXY",
+                  "output": "rightJoystick",
+                  "sensitivity": 5,
+                  "deadzone": {
+                    "threshold": 0,
+                    "radial": true
+                  }
+                },
+                "renderAsButton": true,
+                "action": [
+                  "gamepadB"
+                ],
+                "styles": {
+                  "default": {
+                    "faceImage": {
+                      "type": "icon",
+                      "value": "lightPunch3"
+                    }
+                  }
+                }
+              },
+              {
+                "type": "button",
+                "action": "gamepadY",
+                "styles": {
+                  "default": {
+                    "faceImage": {
+                      "type": "icon",
+                      "value": "interact"
+                    }
+                  }
+                }
+              }
+            ],
+            {
+              "type": "touchpad",
+              "axis": {
+                "input": "axisXY",
+                "output": "leftJoystick",
+                "sensitivity": 5,
+                "deadzone": {
+                  "threshold": 0,
+                  "radial": true
+                }
+              },
+              "renderAsButton": true,
+              "action": [
+                "gamepadX"
+              ],
+              "styles": {
+                "default": {
+                  "faceImage": {
+                    "type": "icon",
+                    "value": "fire"
+                  }
+                }
+              }
+            },
+            {
+              "type": "button",
+              "action": "leftThumb"
+            }
+          ]
+        },
+        "upper": {
+          "right": [
+            {
+              "type": "button",
+              "action": "rightThumb",
+              "styles": {
+                "default": {
+                  "faceImage": {
+                    "type": "icon",
+                    "value": "switchCamera"
+                  }
+                }
+              }
+            }
+          ]
+        },
+        "lower": {
+          "leftCenter": [
+            {
+              "type": "button",
+              "action": "view",
+              "styles": {
+                "default": {
+                  "faceImage": {
+                    "type": "icon",
+                    "value": "radio"
+                  }
+                }
+              }
+            }
+          ],
+          "rightCenter": [
+            {
+              "type": "button",
+              "action": "menu"
+            }
+          ]
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/touch-layouts/layouts/quake.json b/touch-layouts/layouts/quake.json
index 32654c2..bab0b8b 100644
--- a/touch-layouts/layouts/quake.json
+++ b/touch-layouts/layouts/quake.json
@@ -64,21 +64,18 @@
                 "action": "rightBumper",
                 "styles": {
                   "default": {
-                    "outline": {
-                      "indicator": {
-                        "type": "color",
-                        "value": "#ffffff"
-                      },
-                      "stroke": {
-                        "type": "solid",
-                        "color": "#ffffff"
-                      },
-                      "opacity": 0.5
-                    },
                     "knob": {
                       "faceImage": {
                         "type": "icon",
                         "value": "weaponSelect"
+                      },
+                      "background": {
+                        "type": "color",
+                        "value": "#ffffff",
+                        "opacity": 0.1
+                      },
+                      "stroke": {
+                        "opacity": 0.1
                       }
                     }
                   }
@@ -195,4 +192,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/touch-layouts/layouts/resident-evil-4-remake.json b/touch-layouts/layouts/resident-evil-4-remake.json
index 135e076..54baa8a 100644
--- a/touch-layouts/layouts/resident-evil-4-remake.json
+++ b/touch-layouts/layouts/resident-evil-4-remake.json
@@ -62,21 +62,18 @@
                 "action": "leftBumper",
                 "styles": {
                   "default": {
-                    "outline": {
-                      "indicator": {
-                        "type": "color",
-                        "value": "#ffffff"
-                      },
-                      "stroke": {
-                        "type": "solid",
-                        "color": "#ffffff"
-                      },
-                      "opacity": 0.5
-                    },
                     "knob": {
                       "faceImage": {
                         "type": "icon",
                         "value": "leftBumper"
+                      },
+                      "background": {
+                        "type": "color",
+                        "value": "#ffffff",
+                        "opacity": 0.1
+                      },
+                      "stroke": {
+                        "opacity": 0.1
                       }
                     }
                   }
@@ -97,21 +94,18 @@
                 "action": "leftTrigger",
                 "styles": {
                   "default": {
-                    "outline": {
-                      "indicator": {
-                        "type": "color",
-                        "value": "#ffffff"
-                      },
-                      "stroke": {
-                        "type": "solid",
-                        "color": "#ffffff"
-                      },
-                      "opacity": 0.5
-                    },
                     "knob": {
                       "faceImage": {
                         "type": "icon",
-                        "value": "aim"
+                        "value": "leftTrigger"
+                      },
+                      "background": {
+                        "type": "color",
+                        "value": "#ffffff",
+                        "opacity": 0.1
+                      },
+                      "stroke": {
+                        "opacity": 0.1
                       }
                     }
                   }
diff --git a/touch-layouts/layouts/resident-evil-7.json b/touch-layouts/layouts/resident-evil-7.json
index 556a303..cba0f23 100644
--- a/touch-layouts/layouts/resident-evil-7.json
+++ b/touch-layouts/layouts/resident-evil-7.json
@@ -61,21 +61,18 @@
               "action": "leftTrigger",
               "styles": {
                 "default": {
-                  "outline": {
-                    "indicator": {
-                      "type": "color",
-                      "value": "#ffffff"
-                    },
-                    "stroke": {
-                      "type": "solid",
-                      "color": "#ffffff"
-                    },
-                    "opacity": 0.5
-                  },
                   "knob": {
                     "faceImage": {
                       "type": "icon",
                       "value": "aim"
+                    },
+                    "background": {
+                      "type": "color",
+                      "value": "#ffffff",
+                      "opacity": 0.1
+                    },
+                    "stroke": {
+                      "opacity": 0.1
                     }
                   }
                 }
@@ -231,4 +228,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/touch-layouts/layouts/resident-evil-village.json b/touch-layouts/layouts/resident-evil-village.json
index 556a303..cba0f23 100644
--- a/touch-layouts/layouts/resident-evil-village.json
+++ b/touch-layouts/layouts/resident-evil-village.json
@@ -61,21 +61,18 @@
               "action": "leftTrigger",
               "styles": {
                 "default": {
-                  "outline": {
-                    "indicator": {
-                      "type": "color",
-                      "value": "#ffffff"
-                    },
-                    "stroke": {
-                      "type": "solid",
-                      "color": "#ffffff"
-                    },
-                    "opacity": 0.5
-                  },
                   "knob": {
                     "faceImage": {
                       "type": "icon",
                       "value": "aim"
+                    },
+                    "background": {
+                      "type": "color",
+                      "value": "#ffffff",
+                      "opacity": 0.1
+                    },
+                    "stroke": {
+                      "opacity": 0.1
                     }
                   }
                 }
@@ -231,4 +228,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/touch-layouts/layouts/south-of-midnight.json b/touch-layouts/layouts/south-of-midnight.json
index 3e6963d..55c4d9c 100644
--- a/touch-layouts/layouts/south-of-midnight.json
+++ b/touch-layouts/layouts/south-of-midnight.json
@@ -57,7 +57,6 @@
           "inner": [
             {
               "type": "joystick",
-              "expand": false,
               "axis": {
                 "input": "axisXY",
                 "output": "rightJoystick"