diff --git a/alacritty/alacritty.yml b/alacritty/alacritty.yml
index 2deb0b2..90e73cd 100644
--- a/alacritty/alacritty.yml
+++ b/alacritty/alacritty.yml
@@ -181,9 +181,9 @@ font:
 # If `true`, bold text is drawn using the bright color variants.
 #draw_bold_text_with_bright_colors: false
 
-# Colors (Sonokai)
+# Theme import (sets colors key)
 import:
-  - ~/.config/alacritty/themes/bogster.yml
+  - ~/.config/alacritty/themes/{{alacritty_theme}}.yml
 
 # Colors (Tomorrow Night)
 #colors:
diff --git a/alacritty/themes/bogster.yml b/alacritty/themes/bogster-dark.yml
similarity index 100%
rename from alacritty/themes/bogster.yml
rename to alacritty/themes/bogster-dark.yml
diff --git a/alacritty/themes/bogster-light.yml b/alacritty/themes/bogster-light.yml
new file mode 100644
index 0000000..5bac0e8
--- /dev/null
+++ b/alacritty/themes/bogster-light.yml
@@ -0,0 +1,52 @@
+colors:
+  primary:
+    foreground: '#161c23'
+    background: '#c6b8ad'
+    bright_foreground: '#e5ded6'
+  cursor:
+    text: CellBackground
+    cursor: CellForeground
+  vi_mode_cursor:
+    text: CellBackground
+    cursor: CellForeground
+  search:
+    matches:
+      background: CellForeground
+      foreground: '#313f4e'
+    focused_match:
+      background: '#e5ded6'
+      foreground: '#313f4e'
+    bar:
+      foreground: '#e5ded6'
+      background: '#313f4e'
+  hints:
+    start:
+      background: '#232d38'
+      foreground: '#23a580'
+    end:
+      background: '#23a580'
+      foreground: '#232d38'
+  line_indicator:
+    background: None
+    foreground: None
+  selection:
+    text: CellForeground
+    foreground: '#313f4e'
+  normal:
+    black: '#161c23'
+    red: '#d32c5d'
+    green: '#57a331'
+    yellow: '#dc7759'
+    blue: '#36b2d4'
+    magenta: '#b759dc'
+    cyan: '#23a580'
+    white: '#c6b8ad'
+  bright:
+    black: '#415367'
+    red: '#dc597f'
+    green: '#7fdc59'
+    yellow: '#dcb659'
+    blue: '#59dcd8'
+    magenta: '#dc59c0'
+    cyan: '#59dcb7'
+    white: '#e5ded6'
diff --git a/bombadil.toml b/bombadil.toml
index 687cfe8..6a59686 100644
--- a/bombadil.toml
+++ b/bombadil.toml
@@ -4,36 +4,27 @@ dotfiles_dir = "src/dotfiles"
 [settings]
 # An array of toml files paths containing the variables to inject in your templatized dotfiles
 # You can have multiple var files as long as variable names does not colide. 
-vars = [ "vars.toml" ]
+vars = [ "dark.toml", "vars.toml" ]
 
 # An array of post install shell commands
 # hooks = [ "" ]
 
+[profiles.light]
+vars = [ "light.toml" ]
+
+[profiles.dark]
+vars = [ "dark.tml" ]
+
 [settings.dots]
 # A dot entry representing a symlink, `source` is relative to `dotfiles_dir` 
 # and `target` shall be relative to $HOME directory or absolute.
 # You can have as many dot entry as you want, linking files or directories
+
+# alacritty
 alacritty = { source = "alacritty", target = ".config/alacritty" }
-sway = { source = "sway", target = ".config/sway" }
-waybar = { source = "waybar", target = ".config/waybar" }
-wofi = { source = "wofi", target = ".config/wofi" }
 
-# zsh
-zsh = { source = "aliases", target = ".aliases" }
-p10k = { source = "p10k.zsh", target = ".p10k.zsh" }
-zshenv = { source = "zshenv", target = ".zshenv" }
-zshrc = { source = "zshrc", target = ".zshrc" }
-
-# vim
-nvim = { source = "nvim", target = ".config/nvim" }
-vimrc = { source = "vimrc", target = ".vimrc" }
-
-# helix
-helix = { source = "helix", target = ".config/helix" }
-
-# tmux
-tmux = { source = "tmux", target = ".config/tmux" }
-tmux_conf = { source = "tmux.conf", target = ".tmux.conf" }
+# broot
+broot = { source = "broot", target = ".config/broot" }
 
 # git
 git_template = { source = "git_template", target = ".git_template" }
@@ -44,11 +35,17 @@ gitui = { source = "gitui", target = ".config/gitui" }
 # gpg
 gpg_agent = { source = "gnupg/gpg-agent.conf", target = ".gnupg/gpg-agent.conf" }
 
-# zellij
-zellij = { source = "zellij", target = ".config/zellij" }
+# helix
+helix = { source = "helix", target = ".config/helix" }
 
 # navi
 navi = { source = "navi", target = ".config/navi" }
 
-# broot
-broot = { source = "broot", target = ".config/broot" }
+# tmux
+tmux = { source = "tmux", target = ".config/tmux" }
+tmux_conf = { source = "tmux.conf", target = ".tmux.conf" }
+
+# zsh
+zsh = { source = "aliases", target = ".aliases" }
+zshenv = { source = "zshenv", target = ".zshenv" }
+zshrc = { source = "zshrc", target = ".zshrc" }
diff --git a/dark.toml b/dark.toml
new file mode 100644
index 0000000..31bd47f
--- /dev/null
+++ b/dark.toml
@@ -0,0 +1,4 @@
+theme = "dark"
+alacritty_theme = "bogster-dark"
+helix_theme = "bogster-dark"
+tmux_theme = "bogster-dark"
diff --git a/helix/config.toml b/helix/config.toml
index ac0e615..c4102e3 100644
--- a/helix/config.toml
+++ b/helix/config.toml
@@ -1,4 +1,4 @@
-theme = "bogster"
+theme = "{{helix_theme}}"
 
 [editor]
 color-modes = true
@@ -10,3 +10,9 @@ true-color = true
 insert = "bar"
 normal = "block"
 select = "underline"
+
+[editor.search]
+smart-case = false
+
+[keys.normal]
+C-r = ":config-reload"
diff --git a/helix/themes/bogster.toml b/helix/themes/bogster-dark.toml
similarity index 93%
rename from helix/themes/bogster.toml
rename to helix/themes/bogster-dark.toml
index 46c90b7..81f3538 100644
--- a/helix/themes/bogster.toml
+++ b/helix/themes/bogster-dark.toml
@@ -48,9 +48,6 @@
 "ui.cursorline" = { bg = "#131920" }
 "ui.statusline" = { fg = "#e5ded6", bg = "#232d38" }
 "ui.statusline.inactive" = { fg = "#c6b8ad", bg = "#232d38" }
-"ui.statusline.insert" = { fg = "#e5ded6", bg = "red" }
-"ui.statusline.normal" = { fg = "#e5ded6", bg = "green" }
-"ui.statusline.select" = { fg = "#232d38", bg = "blue" }
 "ui.popup" = { bg = "#232d38" }
 "ui.window" = { bg = "#232d38" }
 "ui.help" = { bg = "#232d38", fg = "#e5ded6" }
diff --git a/helix/themes/bogster-light.toml b/helix/themes/bogster-light.toml
new file mode 100644
index 0000000..dc3a574
--- /dev/null
+++ b/helix/themes/bogster-light.toml
@@ -0,0 +1,77 @@
+# Author : Wojciech Kępka <wojciech@wkepka.dev>
+
+"attribute" = "#dc7759"
+"keyword" = { fg = "#dcb659", modifiers = ["bold"] }
+"keyword.directive" = "#dcb659"
+"namespace" = "#d32c5d"
+"punctuation" = "#dc7759"
+"punctuation.delimiter" = "#dc7759"
+"operator" = { fg = "#dc7759", modifiers = ["bold"] }
+"special" = "#7fdc59"
+"variable.other.member" = "#161c23"
+"variable" = "#161c23"
+"variable.parameter" = "#161c23"
+"type" = "#dc597f"
+"type.builtin" = { fg = "#d32c5d", modifiers = ["bold"] }
+"constructor" = "#dc597f"
+"function" = "#59dcd8"
+"function.macro" = { fg = "#dc7759", modifiers = ["bold"] }
+"function.builtin" = { fg = "#59dcd8", modifiers = ["bold"] }
+"comment" = "#627d9d"
+"variable.builtin" = "#161c23"
+"constant" = "#59dcb7"
+"constant.builtin" = "#59dcb7"
+"string" = "#59dcb7"
+"constant.numeric" = "#59c0dc"
+"constant.character.escape" = { fg = "#7fdc59", modifiers = ["bold"] }
+"label" = "#59c0dc"
+
+"module" = "#d32c5d"
+
+# TODO
+"markup.heading" = "blue"
+"markup.list" = "red"
+"markup.bold" = { fg = "yellow", modifiers = ["bold"] }
+"markup.italic" = { fg = "magenta", modifiers = ["italic"] }
+"markup.link.url" = { fg = "yellow", modifiers = ["underlined"] }
+"markup.link.text" = "red"
+"markup.quote" = "cyan"
+"markup.raw" = "green"
+
+"diff.plus" = "#59dcb7"
+"diff.delta" = "#dc7759"
+"diff.minus" = "#dc597f"
+
+"ui.background" = { bg = "#c6b8ad" }
+"ui.linenr" = { fg = "#415367" }
+"ui.linenr.selected" = { fg = "#e5ded6" }  # TODO
+"ui.cursorline" = { bg = "#131920" }
+"ui.statusline" = { fg = "#e5ded6", bg = "#232d38" }
+"ui.statusline.inactive" = { fg = "#161c23", bg = "#232d38" }
+"ui.statusline.insert" = { fg = "#e5ded6", bg = "red" }
+"ui.statusline.normal" = { fg = "#e5ded6", bg = "green" }
+"ui.statusline.select" = { fg = "#232d38", bg = "blue" }
+"ui.popup" = { bg = "#232d38" }
+"ui.window" = { bg = "#232d38" }
+"ui.help" = { bg = "#232d38", fg = "#e5ded6" }
+
+"ui.text" = { fg = "#e5ded6" }
+"ui.text.focus" = { fg = "#e5ded6", modifiers= ["bold"] }
+"ui.virtual.whitespace" = "#627d9d"
+"ui.virtual.ruler" = { bg = "#131920" }
+
+"ui.selection" = { bg = "#313f4e" }
+# "ui.cursor.match"  # TODO might want to override this because dimmed is not widely supported
+"ui.cursor.match" = { fg = "#313f4e", bg = "#dc7759" }
+"ui.cursor" = { fg = "#ABB2BF", modifiers = ["reversed"] }
+
+"ui.menu" = { fg = "#e5ded6bg", bg = "#232d38" }
+"ui.menu.selected" = { bg = "#313f4e" }
+
+"warning" = "#dc7759"
+"error" = "#dc597f"
+"info" = "#59dcb7"
+"hint" = "#59c0dc"
+
+# make diagnostic underlined, to distinguish with selection text.
+diagnostic = { modifiers = ["underlined"] }
diff --git a/light.toml b/light.toml
new file mode 100644
index 0000000..76f65b9
--- /dev/null
+++ b/light.toml
@@ -0,0 +1,4 @@
+theme = "light"
+alacritty_theme = "bogster-light"
+helix_theme = "bogster-light"
+tmux_theme = "bogster-light"
diff --git a/tmux.conf b/tmux.conf
index b74f745..d327868 100644
--- a/tmux.conf
+++ b/tmux.conf
@@ -1,7 +1,7 @@
 # Powerline
 run-shell "/usr/bin/powerline-daemon -q"
 source "/usr/share/powerline/bindings/tmux/powerline.conf"
-source "/home/daniel/.config/tmux/bogster.conf"
+source "/home/daniel/.config/tmux/{{tmux_theme}}.conf"
 
 # Mouse
 set-option -g mouse on
@@ -43,6 +43,9 @@ bind-key _ split-window -v -c '#{pane_current_path}' -p 25
 # Broadcast input
 bind-key C-x setw synchronize-panes
 
+# Reload configuration
+bind-key r source .tmux.conf
+
 # Better font term
 set -g default-terminal "tmux-256color"
 set -ga terminal-overrides ",alacritty:Tc"
diff --git a/tmux/bogster.conf b/tmux/bogster-dark.conf
similarity index 100%
rename from tmux/bogster.conf
rename to tmux/bogster-dark.conf
diff --git a/tmux/bogster-light.conf b/tmux/bogster-light.conf
new file mode 100644
index 0000000..6f45565
--- /dev/null
+++ b/tmux/bogster-light.conf
@@ -0,0 +1,22 @@
+# This tmux statusbar config was created by tmuxline.vim
+# on Wed, 16 Jun 2021
+
+set -g status-justify "centre"
+set -g status "on"
+set -g status-left-style "none"
+set -g message-command-style "fg=#c6b8ad,bg=#415367"
+set -g status-right-style "none"
+set -g pane-active-border-style "fg=#b759dc"
+set -g status-style "none,bg=#161c23"
+set -g message-style "fg=#c6b8ad,bg=#415367"
+set -g pane-border-style "fg=#415367"
+set -g status-right-length "100"
+set -g status-left-length "100"
+setw -g window-status-activity-style "none,fg=#2c2e34,bg=#161c23"
+setw -g window-status-separator ""
+setw -g window-status-style "none,fg=#c6b8ad,bg=#161c23"
+setw -g window-status-last-style "none,fg=#c6b8ad,bg=#161c23"
+set -g status-left "#[fg=#36b2d4,bg=#2c2e34,bold] #S #[fg=#2c2e34,bg=#416753,nobold,nounderscore,noitalics]#[fg=#c6b8ad,bg=#416753] %R #[fg=#416753,bg=#161c23,nobold,nounderscore,noitalics]#[fg=#c6b8ad,bg=#161c23] #{sysstat_mem} 祝#{upload_speed} #[fg=#161c23,bg=#161c23,nobold,nounderscore,noitalics]"
+set -g status-right "#[fg=#161c23,bg=#161c23,nobold,nounderscore,noitalics]#[fg=#c6b8ad,bg=#161c23] #{download_speed}  #{sysstat_cpu} #[fg=#416753,bg=#161c23,nobold,nounderscore,noitalics]#[fg=#c6b8ad,bg=#416753] %a #[fg=#2c2e34,bg=#416753,nobold,nounderscore,noitalics]#[fg=#36b2d4,bg=#2c2e34,bold] #H #{prefix_highlight} "
+setw -g window-status-format "#[fg=#161c23,bg=#161c23,nobold,nounderscore,noitalics]#[fg=#415367,bg=#161d23] #I #W #[fg=#161c23,bg=#161c23,nobold,nounderscore,noitalics]"
+setw -g window-status-current-format "#[fg=#161c23,bg=#34342c,nobold,nounderscore,noitalics]#[fg=#dc7759,bg=#34342c] #I #W #[fg=#34342c,bg=#161c23,nobold,nounderscore,noitalics]"