diff --git a/home/kitty.nix b/home/kitty.nix
index 4799950..fa8a1ba 100644
--- a/home/kitty.nix
+++ b/home/kitty.nix
@@ -12,13 +12,12 @@
       # how many windows should be open before kitty asks
       # for confirmation
       confirm_os_window_close = 0;
-      clear_all_shortcuts = true;
     };
     keybindings = {
       # kitty_mod is ctrl+shift by default
       "kitty_mod+c" = "copy_to_clipboard";
       "kitty_mod+v" = "paste_from_clipboard";
-      # "ctrl+q" = "quit";
+      "ctrl+q" = "quit";
 
       # windows
       "kitty_mod+h" = "neighboring_window left";
@@ -29,14 +28,12 @@
       "kitty_mod+alt+j" = "move_window down";
       "kitty_mod+k" = "neighboring_window up";
       "kitty_mod+alt+k" = "move_window up";
+      "ctrl+f2" = "detach_tab";
       "ctrl+f3" = "detach_window new-tab";
-      "ctrl+f4" = "detach_window tab-left";
-      "ctrl+f5" = "load_config_file";
+      "ctrl+f4" = "detach_window prev-tab";
       "ctrl+alt+l" = "next_layout";
       "ctrl+alt+t" = "goto_layout tall";
       "ctrl+alt+s" = "goto_layout stack";
-      "kitty_mod+enter" = "new_window_with_cwd";
-      "kitty_mod+r" = "resize_window";
 
       # tabs
       "kitty_mod+n" = "next_tab";
@@ -44,16 +41,6 @@
       "kitty_mod+alt+n" = "move_tab_forward";
       "kitty_mod+alt+p" = "move_tab_backward";
       "kitty_mod+w" = "close_tab";
-      "kitty_mod+t" = "new_tab_with_cwd";
-      "ctrl+f2" = "detach_tab";
-
-      # hints
-      "kitty_mod+o>o" = "open_url_with_hints";
-      "kitty_mod+o>p" = "kitten hints --type path --program -";
-      "kitty_mod+o>n" = "kitten hints --type line --program -";
-      "kitty_mod+o>w" = "kitten hints --type word --program -";
-      "kitty_mod+o>h" = "kitten hints --type hash --program -";
-      "kitty_mod+o>l" = "kitten hints --type linenum";
     };
   };
 }
diff --git a/home/niri/default.nix b/home/niri/default.nix
index 92f5701..5661d44 100644
--- a/home/niri/default.nix
+++ b/home/niri/default.nix
@@ -94,8 +94,6 @@ in
             title = "^Browse";
           }
           { app-id = "com.mitchellh.ghostt"; }
-          { app-id = "org.kde.okular"; }
-          { app-id = "kitty"; }
         ];
         default-column-width.proportion = .5;
       }
diff --git a/home/nixvim/default.nix b/home/nixvim/default.nix
index 8a302b0..98a97ee 100644
--- a/home/nixvim/default.nix
+++ b/home/nixvim/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, inputs, ... }:
+{ pkgs, ... }:
 {
   programs.nixvim = {
     enable = true;
@@ -15,18 +15,15 @@
       incsearch = true;
       smartcase = true;
     };
-    colorscheme = "github_dark_tritanopia";
-    clipboard.register = "unnamed";
+    colorscheme = "iceberg";
+    clipboard.register = "unnamedplus";
 
     globals = {
       mapleader = ",";
     };
 
-    extraPlugins = [
-      (pkgs.vimUtils.buildVimPlugin {
-        name = "gitub-theme";
-        src = inputs.nvim-github-theme;
-      })
+    extraPlugins = with pkgs.vimPlugins; [
+      iceberg-vim
     ];
 
     keymaps = [
diff --git a/home/yt/ytnix.nix b/home/yt/ytnix.nix
index 4dd56cc..b1af7f5 100644
--- a/home/yt/ytnix.nix
+++ b/home/yt/ytnix.nix
@@ -22,9 +22,9 @@
 
   qt = {
     enable = true;
-    platformTheme.name = "kde";
-    style.name = "breeze-dark";
-    style.package = pkgs.kdePackages.breeze;
+    platformTheme.name = "gtk";
+    style.name = "adwaita-dark";
+    style.package = pkgs.adwaita-qt;
   };
 
   gtk = {