diff --git a/applications/feh/default.nix b/applications/feh/default.nix
index 733638e..39c3ea0 100644
--- a/applications/feh/default.nix
+++ b/applications/feh/default.nix
@@ -2,28 +2,44 @@
   home-manager.sharedModules = [{
     programs.feh = {
       enable = true;
+
       keybindings = {
+        next_img = [ "k" "Right" ];
+        prev_img = [ "j" "Left" ];
+        quit = "q";
+        toggle_fullscreen = "f";
+
+        zoom_in = "h";
+        zoom_out = "l";
+
+        toggle_filenames = "d";
+        toggle_fixed_geometry = "g";
+        toggle_pause = "h";
+        toggle_pointer = "a";
+        size_to_image = "w";
+        jump_random = "z";
+        jump_first = "J";
+        jump_last = "K";
+        jump_fwd = "H";
+        jump_back = "L";
+        scroll_left = "b";
+        scroll_right = "n";
+        scroll_up = [ "u" "Up" ];
+        scroll_down = [ "d" "Down" ];
+        zoom_default = "o";
+        zoom_fill = "p";
+        toggle_auto_zoom = "m";
+
         toggle_actions = null;
         toggle_aliasing = null;
         toggle_caption = null;
-        toggle_filenames = "d";
         toggle_exif = null;
         save_filelist = null;
-        toggle_fixed_geometry = "g";
-        toggle_pause = "h";
         toggle_info = null;
         toggle_keep_vp = null;
         toggle_menu = null;
-        next_img = [ "k" "Right" ];
-        toggle_pointer = "a";
-        prev_img = [ "j" "Left" ];
-        quit = "q";
         reload_image = null;
         save_image = null;
-        toggle_fullscreen = "f";
-        size_to_image = "w";
-        close = null;
-        jump_random = "z";
         prev_dir = null;
         next_dir = null;
         orient_3 = null;
@@ -40,35 +56,23 @@
         action_7 = null;
         action_8 = null;
         action_9 = null;
-        jump_first = "J";
-        jump_last = "K";
-        jump_fwd = "H";
-        jump_back = "L";
+        close = null;
         reload_plus = null;
         reload_minus = null;
         remove = null;
         delete = null;
-        scroll_left = "b";
-        scroll_right = "n";
-        scroll_up = [ "u" "Up" ];
-        scroll_down = [ "d" "Down" ];
         scroll_left_page = null;
         scroll_right_page = null;
         scroll_up_page = null;
         scroll_down_page = null;
         render = null;
-        zoom_in = "h";
-        zoom_out = "l";
-        zoom_default = "o";
         zoom_fit = null;
-        zoom_fill = "p";
         menu_close = null;
         menu_up = null;
         menu_down = null;
         menu_parent = null;
         menu_child = null;
         menu_select = null;
-        toggle_auto_zoom = "m";
       };
     };
   }];
diff --git a/applications/kitty/default.nix b/applications/kitty/default.nix
index cb2e662..016a935 100644
--- a/applications/kitty/default.nix
+++ b/applications/kitty/default.nix
@@ -2,20 +2,26 @@
   home-manager.sharedModules = [{
     programs.kitty = {
       enable = true;
+
       settings = {
         enable_audio_bell = false;
-        allow_remote_control = true;
-        dynamic_background_opacity = true;
         close_on_child_death = true;
         cursor_blink_interval = 0;
-        wayland_titlebar_color = "background";
-        listen_on = "unix:/tmp/kitty";
+
         open_url_with = "librewolf";
+        wayland_titlebar_color = "background";
+
+        allow_remote_control = true;
+        listen_on = "unix:/tmp/kitty";
+        dynamic_background_opacity = true;
+
         window_padding_width = 5;
         tab_bar_margin_width = 5;
+
         modify_font = "cell_height 110%";
       };
     };
+
     xdg.configFile."kitty/diff.conf".text = ''
       map d scroll_to next-page
       map u scroll_to prev-page
diff --git a/applications/librewolf/default.nix b/applications/librewolf/default.nix
index 5535963..d6ff0df 100644
--- a/applications/librewolf/default.nix
+++ b/applications/librewolf/default.nix
@@ -2,13 +2,18 @@
   home-manager.sharedModules = [{
     programs.librewolf = {
       enable = true;
+
       settings = {
         "middlemouse.paste" = false;
-        "browser.download.useDownloadDir" = true;
+
         "ui.use_activity_cursor" = true;
+
+        "privacy.resistFingerprinting.letterboxing" = true;
+
+        "browser.download.useDownloadDir" = true;
         "browser.tabs.insertAfterCurrent" = true;
         "browser.toolbars.bookmarks.visibility" = "never";
-        "privacy.resistFingerprinting.letterboxing" = true;
+
         "sidebar.position_start" = false;
       };
     };
diff --git a/applications/thunar/default.nix b/applications/thunar/default.nix
index 15605aa..3ae8d67 100644
--- a/applications/thunar/default.nix
+++ b/applications/thunar/default.nix
@@ -3,11 +3,13 @@
 {
   programs.thunar.enable = true;
   services.tumbler.enable = true; # Thumbnail support
+
   environment.systemPackages = with pkgs; [
     xfce.exo # Open with kitty support
     glib
     (pkgs.callPackage ../../packages/go-thumbnailer { })
   ];
+
   services.gvfs.enable = true; # Trash support
   services.gnome.gnome-keyring.enable = true; # Mount support
 
diff --git a/applications/zathura/default.nix b/applications/zathura/default.nix
index 922242b..07a9aa0 100644
--- a/applications/zathura/default.nix
+++ b/applications/zathura/default.nix
@@ -2,6 +2,7 @@
   home-manager.sharedModules = [{
     programs.zathura = {
       enable = true;
+
       options = {
         guioptions = "v";
         adjust-open = "width";