diff --git a/modules/ags/config/widgets/media-player/gesture.tsx b/modules/ags/config/widgets/media-player/gesture.ts
similarity index 100%
rename from modules/ags/config/widgets/media-player/gesture.tsx
rename to modules/ags/config/widgets/media-player/gesture.ts
diff --git a/modules/ags/config/widgets/media-player/mpris.tsx b/modules/ags/config/widgets/media-player/mpris.ts
similarity index 97%
rename from modules/ags/config/widgets/media-player/mpris.tsx
rename to modules/ags/config/widgets/media-player/mpris.ts
index 788fd189..0866285d 100644
--- a/modules/ags/config/widgets/media-player/mpris.tsx
+++ b/modules/ags/config/widgets/media-player/mpris.ts
@@ -274,7 +274,7 @@ const PlayerButton = ({
     colors: Variable<Colors>
     children: Label[] | Icon[]
     onClick: keyof Mpris.Player
-    prop: string
+    prop: keyof Mpris.Player
 }) => {
     let hovered = false;
     const stack = new Stack({ children });
@@ -284,8 +284,7 @@ const PlayerButton = ({
 
         child: stack,
 
-        // @ts-expect-error FIXME
-        onButtonReleaseEvent: () => player[onClick](),
+        onButtonReleaseEvent: () => (player[onClick] as () => void)(),
 
         onHover: () => {
             hovered = true;
@@ -323,16 +322,12 @@ const PlayerButton = ({
         },
 
         setup: (self) => {
-            // @ts-expect-error FIXME
-            if (player[prop] && player[prop] !== false) {
-                // @ts-expect-error FIXME
+            if (player[prop] && (player[prop] as boolean) !== false) {
                 stack.shown = String(player[prop]);
             }
 
             player.connect(`notify::${kebabify(prop)}`, () => {
-                // @ts-expect-error FIXME
                 if (player[prop] !== 0) {
-                    // @ts-expect-error FIXME
                     stack.shown = String(player[prop]);
                 }
             });
@@ -476,7 +471,7 @@ export const PreviousButton = (
         })),
     ],
     onClick: 'previous',
-    prop: 'canGoPrev',
+    prop: 'canGoPrevious',
 });
 
 export const NextButton = (
diff --git a/modules/ags/config/widgets/media-player/player.tsx b/modules/ags/config/widgets/media-player/player.ts
similarity index 100%
rename from modules/ags/config/widgets/media-player/player.tsx
rename to modules/ags/config/widgets/media-player/player.ts