diff --git a/config/rofi/catppuccin-mocha.rasi b/config/rofi/catppuccin-mocha.rasi
deleted file mode 100644
index 96b858c..0000000
--- a/config/rofi/catppuccin-mocha.rasi
+++ /dev/null
@@ -1,117 +0,0 @@
-// adapted from: https://github.com/catppuccin/rofi/blob/main/basic/.local/share/rofi/themes/catppuccin-mocha.rasi
-* {
-    bg-col:  #1e1e2e;
-    bg-col-light: #1e1e2e;
-    border-col: #cba6f7;
-    selected-col: #1e1e2e;
-    blue: #89b4fa;
-    fg-col: #cdd6f4;
-    fg-col2: #f38ba8;
-    grey: #6c7086;
-
-    width: 600;
-}
-
-element-text, element-icon , mode-switcher {
-    background-color: inherit;
-    text-color:       inherit;
-}
-
-window {
-    height: 360px;
-    border: 2px;
-    border-radius: 10px;
-    transparency: "real";
-    border-color: @border-col;
-    background-color: @bg-col;
-}
-
-mainbox {
-    background-color: @bg-col;
-}
-
-inputbar {
-    children: [prompt,entry];
-    background-color: @bg-col;
-    border-radius: 5px;
-    padding: 2px;
-}
-
-prompt {
-    background-color: @blue;
-    padding: 6px;
-    text-color: @bg-col;
-    border-radius: 3px;
-    margin: 20px 0px 0px 20px;
-}
-
-textbox-prompt-colon {
-    expand: false;
-    str: ":";
-}
-
-entry {
-    padding: 6px;
-    margin: 20px 0px 0px 10px;
-    text-color: @fg-col;
-    background-color: @bg-col;
-}
-
-listview {
-    border: 0px 0px 0px;
-    padding: 6px 0px 0px;
-    margin: 10px 0px 0px 20px;
-    columns: 2;
-    lines: 5;
-    background-color: @bg-col;
-}
-
-element {
-    padding: 5px;
-    background-color: @bg-col;
-    text-color: @fg-col  ;
-}
-
-element-icon {
-    size: 25px;
-}
-
-element selected {
-    background-color:  @selected-col ;
-    text-color: @fg-col2  ;
-}
-
-mode-switcher {
-    spacing: 0;
-  }
-
-button {
-    padding: 10px;
-    background-color: @bg-col-light;
-    text-color: @grey;
-    vertical-align: 0.5; 
-    horizontal-align: 0.5;
-}
-
-button selected {
-  background-color: @bg-col;
-  text-color: @blue;
-}
-
-message {
-    background-color: @bg-col-light;
-    margin: 2px;
-    padding: 2px;
-    border-radius: 5px;
-}
-
-textbox {
-    padding: 6px;
-    margin: 20px 0px 0px 20px;
-    text-color: @blue;
-    background-color: @bg-col-light;
-}
-
-error-message {
-    background-color: @bg-col-light;
-}
diff --git a/modules/home/common/wm.nix b/modules/home/common/wm.nix
index 702b2cc..2d95e1b 100644
--- a/modules/home/common/wm.nix
+++ b/modules/home/common/wm.nix
@@ -1,14 +1,6 @@
-{
-  config,
-  paths,
-  pkgs,
-  ...
-}:
-{
+_: {
   # bars and launchers
-  # not using rofi's catppuccin option due to the theme having a few issues
-  # theme has been adapted and extended
-  catppuccin.rofi.enable = false;
+  catppuccin.tofi.enable = true;
   programs = {
     # not managing eww through home-manager
     # instead created a symlink in .config and added it to systemPackages
@@ -18,26 +10,31 @@
     #   package = pkgs.eww-wayland;
     #   configDir = ~/nixos-configs/eww;
     # };
-    rofi = {
+    tofi = {
       enable = true;
-      cycle = true;
-      font = "FiraCode Nerd Font Propo 14";
-      package = pkgs.rofi-wayland;
-      terminal = "${config.programs.kitty.package}/bin/kitty --hold";
-      # no interpolation to avoid unnecessary closure changes
-      theme = paths.config + "/rofi/catppuccin-mocha.rasi";
-      extraConfig = {
-        disable-history = false;
-        display-drun = "";
-        display-filebrowser = "󰉖";
-        display-run = "";
-        drun-display-format = "{icon} {name}";
-        hide-scrollbar = true;
-        matching = "normal";
-        modi = "drun,run,filebrowser";
-        run-display-format = "{name}";
-        show-icons = true;
-        sidebar-mode = true;
+      settings = {
+        # dimensions
+        height = 240;
+        width = 480;
+        padding-top = 20;
+        padding-bottom = 20;
+        padding-left = 20;
+        padding-right = 20;
+        num-results = 5;
+        result-spacing = 10;
+        # border/outline
+        border-color = "#cba6f7";
+        border-width = 2;
+        corner-radius = 10;
+        outline-width = 0;
+        # font
+        font = "FiraCode Nerd Font Propo";
+        font-size = 14;
+        # misc
+        terminal = "kitty";
+        text-cursor = true;
+        fuzzy-match = true;
+        drun-launch = true;
       };
     };
   };
@@ -69,7 +66,7 @@
           "$mainMod, M, exit, "
           "$mainMod, E, exec, dolphin"
           "$mainMod, V, togglefloating, "
-          "$mainMod, R, exec, rofi -show drun"
+          "$mainMod, R, exec, tofi-drun"
           "$mainMod, P, pseudo, # dwindle"
           "$mainMod, J, togglesplit, # dwindle"
           "$mainMod, F, fullscreen, 0"