diff --git a/users/teidesu/assets/alacritty.toml b/users/teidesu/assets/alacritty.toml
deleted file mode 100644
index df8fefc..0000000
--- a/users/teidesu/assets/alacritty.toml
+++ /dev/null
@@ -1,52 +0,0 @@
-[font]
-normal = { family = "IosevkaSS05 Nerd Font", style = "Light" }
-size = 13
-builtin_box_drawing = false
-
-[shell]
-program = "/etc/profiles/per-user/teidesu/bin/fish"
-
-[window]
-blur = true
-opacity = 0.7
-
-[cursor]
-style.shape = "Beam"
-style.blinking = "On"
-
-[keyboard]
-bindings = [
-  { key = "Left", mods = "Option", "chars" = "\u001bb" },
-  { key = "Right", mods = "Option", "chars" = "\u001bf" },
-  { key = "Left", mods = "Command", "chars" = "\u0001" },
-  { key = "Right", mods = "Command", "chars" = "\u0005" },
-  { key = "Backspace", mods = "Option", "chars" = "\u001b\u007f" },
-  { key = "Backspace", mods = "Command", "chars" = "\u0015" },
-]
-
-# Atom One Dark
-[colors.primary]
-background = '#000000'
-foreground = '#cfd2d0'
-
-# Normal colors
-[colors.normal]
-black   = '#1e2127'
-red     = '#e06c75'
-green   = '#98c379'
-yellow  = '#d19a66'
-blue    = '#61afef'
-magenta = '#c678dd'
-cyan    = '#56b6c2'
-white   = '#abb2bf'
-
-# Bright colors
-[colors.bright]
-black   = '#5c6370'
-red     = '#e06c75'
-green   = '#98c379'
-yellow  = '#d19a66'
-blue    = '#61afef'
-magenta = '#c678dd'
-cyan    = '#56b6c2'
-white   = '#ffffff'
\ No newline at end of file
diff --git a/users/teidesu/assets/atuin.toml b/users/teidesu/assets/atuin/config.toml
similarity index 100%
rename from users/teidesu/assets/atuin.toml
rename to users/teidesu/assets/atuin/config.toml
diff --git a/users/teidesu/assets/karabiner.json b/users/teidesu/assets/karabiner/karabiner.json
similarity index 99%
rename from users/teidesu/assets/karabiner.json
rename to users/teidesu/assets/karabiner/karabiner.json
index afaa8d3..fdda43b 100644
--- a/users/teidesu/assets/karabiner.json
+++ b/users/teidesu/assets/karabiner/karabiner.json
@@ -83,7 +83,7 @@
                                 },
                                 "to": [
                                     {
-                                        "shell_command": "osascript /Users/teidesu/.config/new-brave-tab.scpt"
+                                        "shell_command": "osascript /Users/teidesu/.config/karabiner/new-ff-tab.scpt"
                                     }
                                 ],
                                 "type": "basic"
diff --git a/users/teidesu/assets/karabiner/new-ff-tab.scpt b/users/teidesu/assets/karabiner/new-ff-tab.scpt
new file mode 100644
index 0000000..66cf313
--- /dev/null
+++ b/users/teidesu/assets/karabiner/new-ff-tab.scpt
@@ -0,0 +1,8 @@
+tell application "Firefox Nightly"
+	activate
+	tell application "System Events"
+		tell process "firefox"
+			click menu item "New Tab" of menu "File" of menu bar 1
+		end tell
+	end tell
+end tell
\ No newline at end of file
diff --git a/users/teidesu/assets/micro/settings.json b/users/teidesu/assets/micro/settings.json
new file mode 100644
index 0000000..08f63f4
--- /dev/null
+++ b/users/teidesu/assets/micro/settings.json
@@ -0,0 +1,3 @@
+{
+    "colorscheme": "bubblegum"
+}
\ No newline at end of file
diff --git a/users/teidesu/assets/new-brave-tab.scpt b/users/teidesu/assets/new-brave-tab.scpt
deleted file mode 100644
index 2df8211..0000000
--- a/users/teidesu/assets/new-brave-tab.scpt
+++ /dev/null
@@ -1,4 +0,0 @@
-tell application "Brave Browser"
-	activate
-	tell front window to make new tab at after (get active tab)
-end tell
\ No newline at end of file
diff --git a/users/teidesu/assets/rio/config.toml b/users/teidesu/assets/rio/config.toml
new file mode 100644
index 0000000..31d6773
--- /dev/null
+++ b/users/teidesu/assets/rio/config.toml
@@ -0,0 +1,44 @@
+option-as-alt = 'left'
+
+[adaptive-theme]
+light = "ayu-light"
+dark = "ayu-dark"
+
+[cursor]
+shape = 'beam'
+blinking = true
+blinking-interval = 500 
+
+[editor]
+program = "micro"
+args = []
+
+[window]
+width = 800
+height = 600
+
+[renderer]
+performance = "high"
+backend = "automatic"
+
+[fonts]
+size = 13
+
+[fonts.regular]
+family = "IosevkaSS05 Nerd Font"
+style = "Light"
+
+[bindings]
+keys = [
+  { key = "left", with = "option", bytes = [27, 98] },
+  { key = "right", with = "option", bytes = [27, 102] },
+  { key = "left", with = "super", bytes = [1] },
+  { key = "right", with = "super", bytes = [5] },
+  { key = "back", with = "option", bytes = [27, 127] },
+  { key = "back", with = "super", bytes = [21] },
+  { key = "с", with = "super", action = "Copy"},
+  { key = "м", with = "super", action = "Paste"},
+  { key = "е", with = "super", action = "CreateTab"},
+  { key = "ц", with = "super", action = "CloseTab"},
+]
+
diff --git a/users/teidesu/assets/rio/themes/ayu-dark.toml b/users/teidesu/assets/rio/themes/ayu-dark.toml
new file mode 100644
index 0000000..9e5639f
--- /dev/null
+++ b/users/teidesu/assets/rio/themes/ayu-dark.toml
@@ -0,0 +1,23 @@
+# from https://github.com/mbadolato/iTerm2-Color-Schemes/blob/master/rio/ayu.toml
+[colors]
+background = '#0f1419'
+foreground = '#e6e1cf'
+selection-background = '#253340'
+selection-foreground = '#e6e1cf'
+cursor = '#f29718'
+black = '#000000'
+red = '#ff3333'
+green = '#b8cc52'
+yellow = '#e7c547'
+blue = '#36a3d9'
+magenta = '#f07178'
+cyan = '#95e6cb'
+white = '#ffffff'
+light_black = '#323232'
+light_red = '#ff6565'
+light_green = '#eafe84'
+light_yellow = '#fff779'
+light_blue = '#68d5ff'
+light_magenta = '#ffa3aa'
+light_cyan = '#c7fffd'
+light_white = '#ffffff'
\ No newline at end of file
diff --git a/users/teidesu/assets/rio/themes/ayu-light.toml b/users/teidesu/assets/rio/themes/ayu-light.toml
new file mode 100644
index 0000000..c9d7ca7
--- /dev/null
+++ b/users/teidesu/assets/rio/themes/ayu-light.toml
@@ -0,0 +1,23 @@
+# from https://github.com/mbadolato/iTerm2-Color-Schemes/blob/master/rio/ayu_light.toml
+[colors]
+background = '#fafafa'
+foreground = '#5c6773'
+selection-background = '#f0eee4'
+selection-foreground = '#5c6773'
+cursor = '#ff6a00'
+black = '#000000'
+red = '#ff3333'
+green = '#86b300'
+yellow = '#f29718'
+blue = '#41a6d9'
+magenta = '#f07178'
+cyan = '#4dbf99'
+white = '#ffffff'
+light_black = '#323232'
+light_red = '#ff6565'
+light_green = '#b8e532'
+light_yellow = '#ffc94a'
+light_blue = '#73d8ff'
+light_magenta = '#ffa3aa'
+light_cyan = '#7ff1cb'
+light_white = '#ffffff'
diff --git a/users/teidesu/darwin.nix b/users/teidesu/darwin.nix
index a6d4b5b..a0b9472 100644
--- a/users/teidesu/darwin.nix
+++ b/users/teidesu/darwin.nix
@@ -48,9 +48,17 @@
       ]))
     ];
 
-    home.file.".config/alacritty/alacritty.toml".source = ./assets/alacritty.toml;
-    home.file.".config/karabiner/karabiner.json".source = ./assets/karabiner.json;
-    home.file.".config/new-brave-tab.scpt".source = ./assets/new-brave-tab.scpt;
-    home.file.".config/atuin/config.toml".source = ./assets/atuin.toml;
+    home.file.".config/rio" = {
+      source = ./assets/rio;
+      recursive = true;
+    };
+    home.file.".config/karabiner" = {
+      source = ./assets/karabiner;
+      recursive = true;
+    };
+    home.file.".config/atuin" = {
+      source = ./assets/atuin;
+      recursive = true;
+    };
   };
 }
\ No newline at end of file
diff --git a/users/teidesu/fish.nix b/users/teidesu/fish.nix
index 7eb9571..176d5b3 100644
--- a/users/teidesu/fish.nix
+++ b/users/teidesu/fish.nix
@@ -81,6 +81,8 @@ in {
       export STARSHIP_CONFIG=${(pkgs.formats.toml {}).generate "starship.toml" starshipConfig}
       eval "$(${pkgs.starship}/bin/starship init fish)"
 
+      export BAT_THEME="ansi"
+
       if command -q carapace
         set -Ux CARAPACE_BRIDGES 'zsh,fish,bash,inshellisense' # optional
         if test ! -f ~/.config/fish/completions/carapace.fish