diff --git a/hosts/default/configuration.nix b/hosts/default/configuration.nix
index 80035ec..db8e7fb 100644
--- a/hosts/default/configuration.nix
+++ b/hosts/default/configuration.nix
@@ -82,7 +82,7 @@
   users.users.shoi = {
     isNormalUser = true;
     description = "Sho Ishida";
-    extraGroups = [ "networkmanager" "wheel" "inputs" ];
+    extraGroups = [ "networkmanager" "wheel" "input" ];
     shell = pkgs.zsh;
   };
   
diff --git a/modules/home-manager/ricing/default.nix b/modules/home-manager/ricing/default.nix
index 3c7825a..f1a2b74 100644
--- a/modules/home-manager/ricing/default.nix
+++ b/modules/home-manager/ricing/default.nix
@@ -2,7 +2,6 @@
 
 {
     imports = [
-        ./stylix
         ./hyprland
     ];
 
diff --git a/modules/home-manager/ricing/hyprland/default.nix b/modules/home-manager/ricing/hyprland/default.nix
index 06cba05..ac8e7d5 100644
--- a/modules/home-manager/ricing/hyprland/default.nix
+++ b/modules/home-manager/ricing/hyprland/default.nix
@@ -1,6 +1,11 @@
 { config, ... }:
 
 {
+    imports = [
+        ./rofi.nix
+        ./waybar.nix
+    ];
+
     wayland.windowManager.hyprland = {
         enable = true;
 
@@ -91,13 +96,19 @@
                 workspace_swipe = "false";
             };
 
+            "$browser" = "firefox";
+            "$terminal" = "kitty";
+            "$fileManager" = "nautilus";
+            "$launcher" = "rofi -show drun";
+
             "$mod" = "SUPER";
             bind = [
-                "$mod, F, exec, firefox"
-                "$mod, T, exec, kitty"
+                "$mod, F, exec, $browser"
+                "$mod, T, exec, $terminal"
                 "$mod, Q, killactive,"
                 "$mod, M, exit,"
-                "$mod, E, exec, nautilus"
+                "$mod, E, exec, $fileManager"
+                "$mod, R, exec, $launcher"
                 "$mod, V, togglefloating,"
                 "$mod, P, pseudo,"
                 "$mod, J, togglesplit,"
diff --git a/modules/home-manager/ricing/hyprland/rofi.nix b/modules/home-manager/ricing/hyprland/rofi.nix
new file mode 100644
index 0000000..2e852a9
--- /dev/null
+++ b/modules/home-manager/ricing/hyprland/rofi.nix
@@ -0,0 +1,7 @@
+{ pkgs, ... }:
+
+{
+    home.packages = with pkgs; [
+        rofi-wayland
+    ];
+}
\ No newline at end of file
diff --git a/modules/home-manager/ricing/hyprland/waybar.nix b/modules/home-manager/ricing/hyprland/waybar.nix
new file mode 100644
index 0000000..6512a30
--- /dev/null
+++ b/modules/home-manager/ricing/hyprland/waybar.nix
@@ -0,0 +1,14 @@
+{ ... }:
+
+{
+    programs.waybar = {
+        enable = true;
+        settings = {
+            mainBar = {
+                layer = "top";
+                position = "top";
+                height = 30;
+            };
+        };
+    };
+}
\ No newline at end of file
diff --git a/modules/home-manager/terminal/default.nix b/modules/home-manager/terminal/default.nix
index 8abe613..00ba443 100644
--- a/modules/home-manager/terminal/default.nix
+++ b/modules/home-manager/terminal/default.nix
@@ -3,6 +3,6 @@
 {
     imports = [
         ./shell
+        ./kitty
     ];
-    programs.kitty.enable = true;
 }
\ No newline at end of file
diff --git a/modules/home-manager/terminal/kitty/default.nix b/modules/home-manager/terminal/kitty/default.nix
new file mode 100644
index 0000000..a10b685
--- /dev/null
+++ b/modules/home-manager/terminal/kitty/default.nix
@@ -0,0 +1,9 @@
+{ ... }:
+
+{
+    imports = [
+        ./themes
+    ];
+
+    programs.kitty.enable = true;
+}
\ No newline at end of file
diff --git a/modules/home-manager/terminal/kitty/themes/default.nix b/modules/home-manager/terminal/kitty/themes/default.nix
new file mode 100644
index 0000000..cbd0f93
--- /dev/null
+++ b/modules/home-manager/terminal/kitty/themes/default.nix
@@ -0,0 +1,7 @@
+{ ... }:
+
+{
+    imports = [
+        ./retrofuturism
+    ];
+}
\ No newline at end of file
diff --git a/modules/home-manager/terminal/kitty/themes/retrofuturism/default.nix b/modules/home-manager/terminal/kitty/themes/retrofuturism/default.nix
new file mode 100644
index 0000000..e029591
--- /dev/null
+++ b/modules/home-manager/terminal/kitty/themes/retrofuturism/default.nix
@@ -0,0 +1,45 @@
+{ ... }:
+
+{
+    programs.kitty = {
+        settings = {
+            foreground = "#f8f8f2";
+            background = "#4c4c4c";
+
+            selection_foreground = "#4c4c4c";
+            selection_background = "#e7e7e7";
+
+            # black
+            color0 = "#4c4c4c";
+            color8 = "#acacac";
+
+            # red
+            color1 = "#fe7394";
+            color9 = "#ffedf1";
+            
+            # green
+            color2 = "#cacc73";
+            color10 = "#dadc9c";
+
+            # yellow
+            color3 = "#fedb5b";
+            color11 = "#fefbea";
+
+            # blue
+            color4 = "#7688ea";
+            color12 = "#edeffc";
+
+            # magenta
+            color5 = "#fac3ed";
+            color13 = "#fff6fe";
+
+            # cyan
+            color6 = "#96ceb4";
+            color14 = "#b8dfcd";
+
+            # white
+            color7 = "#e5e5cd";
+            color15 = "#f6f6ee";
+        };
+    };
+}
\ No newline at end of file
diff --git a/modules/ricing/default.nix b/modules/ricing/default.nix
index a39e3be..a0e24a1 100644
--- a/modules/ricing/default.nix
+++ b/modules/ricing/default.nix
@@ -2,7 +2,7 @@
 
 {
     imports = [
-        ./stylix
+        
     ];
 
     environment.systemPackages = with pkgs; [