diff --git a/user-modules/gaming/default.nix b/user-modules/gaming/default.nix
index 9c36c47..50bdeba 100644
--- a/user-modules/gaming/default.nix
+++ b/user-modules/gaming/default.nix
@@ -3,6 +3,7 @@
 {
   imports = [
     ./emulators/pcsx2.nix
+    ./emulators/retroarch.nix
     ./emulators/ryujinx.nix
     ./launchers/es-de.nix
     ./launchers/modrinth.nix
diff --git a/user-modules/gaming/emulators/retroarch.nix b/user-modules/gaming/emulators/retroarch.nix
new file mode 100644
index 0000000..002a3f2
--- /dev/null
+++ b/user-modules/gaming/emulators/retroarch.nix
@@ -0,0 +1,22 @@
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}:
+
+with lib;
+let
+  cfg = config.modules.retroarch;
+in
+{
+  options.modules.retroarch = {
+    enable = mkEnableOption "RetroArch";
+  };
+
+  config = mkIf cfg.enable {
+    home.packages = with pkgs; [
+      retroarch-free
+    ];
+  };
+}
diff --git a/user-modules/gaming/emulators/ryujinx.nix b/user-modules/gaming/emulators/ryujinx.nix
index 1d7b7f1..4943ad8 100644
--- a/user-modules/gaming/emulators/ryujinx.nix
+++ b/user-modules/gaming/emulators/ryujinx.nix
@@ -16,7 +16,10 @@ in
 
   config = mkIf cfg.enable {
     home.packages = with pkgs; [
-      ryujinx
+      ryubing
     ];
+
+    # TODO: Make more general
+    wayland.windowManager.river.settings.rule-add."-app-id"."'Ryujinx'" = "fullscreen";
   };
 }
diff --git a/users/jan.nix b/users/jan.nix
index e6b3fd9..dd1d856 100644
--- a/users/jan.nix
+++ b/users/jan.nix
@@ -67,6 +67,7 @@
       modrinth.enable = true;
       es-de.enable = true;
       pcsx2.enable = true;
+      retroarch.enable = true;
       ryujinx.enable = true;
 
       # Media