diff --git a/Dockerfile b/Dockerfile
index 64b275a..42f80df 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1
-FROM ghcr.io/linuxserver/baseimage-selkies:debianbookworm
+FROM ghcr.io/linuxserver/baseimage-selkies:debiantrixie
 
 # set version label
 ARG BUILD_DATE
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 6c278da..cf2af64 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1
-FROM ghcr.io/linuxserver/baseimage-selkies:arm64v8-debianbookworm
+FROM ghcr.io/linuxserver/baseimage-selkies:arm64v8-debiantrixie
 
 # set version label
 ARG BUILD_DATE
diff --git a/README.md b/README.md
index 6e8291e..71ab170 100644
--- a/README.md
+++ b/README.md
@@ -425,4 +425,5 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **15.08.25:** - Rebase to Debian Trixie for updated Dolphin, update controller mapping.
 * **18.06.25:** - Initial Version.
diff --git a/readme-vars.yml b/readme-vars.yml
index 36e68ec..d4e5cb7 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -105,4 +105,5 @@ init_diagram: |
   "dolphin:latest" <- Base Images
 # changelog
 changelogs:
+  - {date: "15.08.25:", desc: "Rebase to Debian Trixie for updated Dolphin, update controller mapping."}
   - {date: "18.06.25:", desc: "Initial Version."}
diff --git a/root/defaults/GCPadNew.ini b/root/defaults/GCPadNew.ini
index 2d1b86b..274d173 100644
--- a/root/defaults/GCPadNew.ini
+++ b/root/defaults/GCPadNew.ini
@@ -1,32 +1,31 @@
 [GCPad1]
-Device = evdev/0/Microsoft X-Box 360 pad
-Buttons/A = EAST
-Buttons/B = SOUTH
-Buttons/X = WEST
-Buttons/Y = NORTH
-Buttons/Z = THUMBR
-Buttons/Start = START
-Main Stick/Up = `Axis 1-`
-Main Stick/Down = `Axis 1+`
-Main Stick/Left = `Axis 0-`
-Main Stick/Right = `Axis 0+`
-Main Stick/Modifier = THUMBL
-Main Stick/Modifier/Range = 50.0
+Device = SDL/0/Microsoft X-Box 360 pad
+Buttons/A = `Button S`
+Buttons/B = `Button E`
+Buttons/X = `Button N`
+Buttons/Y = `Button W`
+Buttons/Z = `Shoulder R`
+Buttons/Start = Start
+Main Stick/Up = `Left Y+`
+Main Stick/Down = `Left Y-`
+Main Stick/Left = `Left X-`
+Main Stick/Right = `Left X+`
+Main Stick/Modifier = `Thumb L`
 Main Stick/Calibration = 100.00 141.42 100.00 141.42 100.00 141.42 100.00 141.42
-C-Stick/Up = `Axis 4-`
-C-Stick/Down = `Axis 4+`
-C-Stick/Left = `Axis 3-`
-C-Stick/Right = `Axis 3+`
-C-Stick/Modifier = `Ctrl`
-C-Stick/Modifier/Range = 50.0
+C-Stick/Up = `Right Y+`
+C-Stick/Down = `Right Y-`
+C-Stick/Left = `Right X-`
+C-Stick/Right = `Right X+`
+C-Stick/Modifier = `Thumb R`
 C-Stick/Calibration = 100.00 141.42 100.00 141.42 100.00 141.42 100.00 141.42
-Triggers/L = TL
-Triggers/R = TR
-D-Pad/Up = `Axis 7-`
-D-Pad/Down = `Axis 7+`
-D-Pad/Left = `Axis 6-`
-D-Pad/Right = `Axis 6+`
-Triggers/L-Analog = `Axis 2+`&`Axis 2-`&`Full Axis 2+`&`Full Axis 2-`
+Triggers/L = `Trigger L`
+Triggers/R = `Trigger R`
+D-Pad/Up = `Pad N`
+D-Pad/Down = `Pad S`
+D-Pad/Left = `Pad W`
+D-Pad/Right = `Pad E`
+Triggers/L-Analog = `Trigger L`
+Triggers/R-Analog = `Trigger R`
 [GCPad2]
 Device = evdev/1/Microsoft X-Box 360 pad
 Buttons/A = EAST
@@ -40,14 +39,12 @@ Main Stick/Down = `Axis 1+`
 Main Stick/Left = `Axis 0-`
 Main Stick/Right = `Axis 0+`
 Main Stick/Modifier = THUMBL
-Main Stick/Modifier/Range = 50.0
 Main Stick/Calibration = 100.00 141.42 100.00 141.42 100.00 141.42 100.00 141.42
 C-Stick/Up = `Axis 4-`
 C-Stick/Down = `Axis 4+`
 C-Stick/Left = `Axis 3-`
 C-Stick/Right = `Axis 3+`
 C-Stick/Modifier = `Ctrl`
-C-Stick/Modifier/Range = 50.0
 C-Stick/Calibration = 100.00 141.42 100.00 141.42 100.00 141.42 100.00 141.42
 Triggers/L = TL
 Triggers/R = TR
@@ -69,14 +66,12 @@ Main Stick/Down = `Axis 1+`
 Main Stick/Left = `Axis 0-`
 Main Stick/Right = `Axis 0+`
 Main Stick/Modifier = THUMBL
-Main Stick/Modifier/Range = 50.0
 Main Stick/Calibration = 100.00 141.42 100.00 141.42 100.00 141.42 100.00 141.42
 C-Stick/Up = `Axis 4-`
 C-Stick/Down = `Axis 4+`
 C-Stick/Left = `Axis 3-`
 C-Stick/Right = `Axis 3+`
 C-Stick/Modifier = `Ctrl`
-C-Stick/Modifier/Range = 50.0
 C-Stick/Calibration = 100.00 141.42 100.00 141.42 100.00 141.42 100.00 141.42
 Triggers/L = TL
 Triggers/R = TR
@@ -98,14 +93,12 @@ Main Stick/Down = `Axis 1+`
 Main Stick/Left = `Axis 0-`
 Main Stick/Right = `Axis 0+`
 Main Stick/Modifier = THUMBL
-Main Stick/Modifier/Range = 50.0
 Main Stick/Calibration = 100.00 141.42 100.00 141.42 100.00 141.42 100.00 141.42
 C-Stick/Up = `Axis 4-`
 C-Stick/Down = `Axis 4+`
 C-Stick/Left = `Axis 3-`
 C-Stick/Right = `Axis 3+`
 C-Stick/Modifier = `Ctrl`
-C-Stick/Modifier/Range = 50.0
 C-Stick/Calibration = 100.00 141.42 100.00 141.42 100.00 141.42 100.00 141.42
 Triggers/L = TL
 Triggers/R = TR