diff --git a/alacritty/alacritty.yml b/alacritty/alacritty.yml
index 7ed5334..0a8b426 100644
--- a/alacritty/alacritty.yml
+++ b/alacritty/alacritty.yml
@@ -559,47 +559,5 @@ shell:
   #- { key: Home,      mods: Shift,   action: ScrollToTop,    mode: ~Alt       }
   #- { key: End,       mods: Shift,   action: ScrollToBottom, mode: ~Alt       }
 
-# Start flavours
-# Base16 Dracula 256 - alacritty color config
-# Mike Barkmin (http://github.com/mikebarkmin) based on Dracula Theme (http://github.com/dracula)
-colors:
-  # Default colors
-  primary:
-    background: '0x282936'
-    foreground: '0xe9e9f4'
-
-  # Colors the cursor will use if `custom_cursor_colors` is true
-  cursor:
-    text: '0x282936'
-    cursor: '0xe9e9f4'
-
-  # Normal colors
-  normal:
-    black:   '0x282936'
-    red:     '0xea51b2'
-    green:   '0xebff87'
-    yellow:  '0x00f769'
-    blue:    '0x62d6e8'
-    magenta: '0xb45bcf'
-    cyan:    '0xa1efe4'
-    white:   '0xe9e9f4'
-
-  # Bright colors
-  bright:
-    black:   '0x626483'
-    red:     '0xea51b2'
-    green:   '0xebff87'
-    yellow:  '0x00f769'
-    blue:    '0x62d6e8'
-    magenta: '0xb45bcf'
-    cyan:    '0xa1efe4'
-    white:   '0xf7f7fb'
-
-  indexed_colors:
-    - { index: 16, color: '0xb45bcf' }
-    - { index: 17, color: '0x00f769' }
-    - { index: 18, color: '0x3a3c4e' }
-    - { index: 19, color: '0x4d4f68' }
-    - { index: 20, color: '0x62d6e8' }
-    - { index: 21, color: '0xf1f2f8' }
-# End flavours
+import:
+  - ~/.config/alacritty/colours.yml
diff --git a/alacritty/theme.mustache b/alacritty/theme.mustache
new file mode 100644
index 0000000..47f69f8
--- /dev/null
+++ b/alacritty/theme.mustache
@@ -0,0 +1,42 @@
+# Base16 {{scheme-name}} 256 - alacritty color config
+# {{scheme-author}}
+colors:
+  # Default colors
+  primary:
+    background: '0x{{base00-hex}}'
+    foreground: '0x{{base05-hex}}'
+
+  # Colors the cursor will use if `custom_cursor_colors` is true
+  cursor:
+    text: '0x{{base00-hex}}'
+    cursor: '0x{{base05-hex}}'
+
+  # Normal colors
+  normal:
+    black:   '0x{{base00-hex}}'
+    red:     '0x{{base08-hex}}'
+    green:   '0x{{base0B-hex}}'
+    yellow:  '0x{{base0A-hex}}'
+    blue:    '0x{{base0D-hex}}'
+    magenta: '0x{{base0E-hex}}'
+    cyan:    '0x{{base0C-hex}}'
+    white:   '0x{{base05-hex}}'
+
+  # Bright colors
+  bright:
+    black:   '0x{{base03-hex}}'
+    red:     '0x{{base08-hex}}'
+    green:   '0x{{base0B-hex}}'
+    yellow:  '0x{{base0A-hex}}'
+    blue:    '0x{{base0D-hex}}'
+    magenta: '0x{{base0E-hex}}'
+    cyan:    '0x{{base0C-hex}}'
+    white:   '0x{{base07-hex}}'
+
+  indexed_colors:
+    - { index: 16, color: '0x{{base09-hex}}' }
+    - { index: 17, color: '0x{{base0F-hex}}' }
+    - { index: 18, color: '0x{{base01-hex}}' }
+    - { index: 19, color: '0x{{base02-hex}}' }
+    - { index: 20, color: '0x{{base04-hex}}' }
+    - { index: 21, color: '0x{{base06-hex}}' }
diff --git a/fish/config.fish b/fish/config.fish
index 827dd69..45b3047 100644
--- a/fish/config.fish
+++ b/fish/config.fish
@@ -63,24 +63,7 @@ set -x PYTHONPATH "$HOME/scripts" $PYTHONPATH
 set -x PATH "$HOME/.cargo/bin" $PATH
 set -x SVDIR "$HOME/.service"
 
-# Start flavours
-set base00 282936
-set base01 3a3c4e
-set base02 4d4f68
-set base03 626483
-set base04 62d6e8
-set base05 e9e9f4
-set base06 f1f2f8
-set base07 f7f7fb
-set base08 ea51b2
-set base09 b45bcf
-set base0A 00f769
-set base0B ebff87
-set base0C a1efe4
-set base0D 62d6e8
-set base0E b45bcf
-set base0F 00f769
-# End flavours
+source ~/.config/fish/colours.fish 2>/dev/null
 
 set -x LS_COLORS (cat ~/.config/fish/ls_colors)
 
diff --git a/fish/theme.mustache b/fish/theme.mustache
new file mode 100644
index 0000000..949bcdf
--- /dev/null
+++ b/fish/theme.mustache
@@ -0,0 +1,16 @@
+set base00 {{base00-hex}}
+set base01 {{base01-hex}}
+set base02 {{base02-hex}}
+set base03 {{base03-hex}}
+set base04 {{base04-hex}}
+set base05 {{base05-hex}}
+set base06 {{base06-hex}}
+set base07 {{base07-hex}}
+set base08 {{base08-hex}}
+set base09 {{base09-hex}}
+set base0A {{base0A-hex}}
+set base0B {{base0B-hex}}
+set base0C {{base0C-hex}}
+set base0D {{base0D-hex}}
+set base0E {{base0E-hex}}
+set base0F {{base0F-hex}}
diff --git a/flavours/config.toml b/flavours/config.toml
index d2d134f..bce4eca 100644
--- a/flavours/config.toml
+++ b/flavours/config.toml
@@ -1,16 +1,14 @@
 [[items]]
-file = "~/.config/alacritty/alacritty.yml"
+file = "~/.config/alacritty/colours.yml"
 template = "alacritty"
 subtemplate = "custom"
-start = "# Start flavours"
-end = "# End flavours"
+rewrite = true
 
 [[items]]
-file = "~/.tmux.conf"
+file = "~/.config/tmux/colours.conf"
 template = "tmux"
 subtemplate = "custom"
-start = "# Start flavours"
-end = "# End flavours"
+rewrite = true
 hook = "tmux source-file ~/.config/tmux/tmux.conf"
 
 [[items]]
@@ -20,11 +18,10 @@ subtemplate = "custom"
 rewrite = true
 
 [[items]]
-file = "~/.config/fish/config.fish"
-template = "../../../../.local/share/flavours/base16/templates/fish"
+file = "~/.config/fish/colours.fish"
+template = "fish"
 subtemplate = "custom"
-start = "# Start flavours"
-end = "# End flavours"
+rewrite = true
 
 [[items]]
 file = "~/.config/vivid/custom_theme.yml"
diff --git a/link.sh b/link.sh
index 181bca8..9b857bf 100755
--- a/link.sh
+++ b/link.sh
@@ -22,6 +22,8 @@ link() {
 	full_src=$(realpath -s "$src")
 	full_dst=$(realpath -s "$dst")
 
+	mkdir -p "$(dirname "$full_dst")"
+
 	if [ -L "$dst" ]; then
 		if [ "$full_dst" != "$full_src" ]; then
 			ln -s -f "$full_src" "$full_dst"
@@ -34,9 +36,11 @@ link() {
 cd "$(dirname "$(readlink -f "$0")")" || exit 1
 
 link ./alacritty/alacritty.yml "$HOME/.config/alacritty/alacritty.yml"
+link ./alacritty/theme.mustache "$HOME/.local/share/flavours/base16/templates/alacritty/templates/custom.mustache"
 
 link ./fish/abbr.fish "$HOME/.config/fish/abbr.fish"
 link ./fish/config.fish "$HOME/.config/fish/config.fish"
+link ./fish/theme.mustache "$HOME/.local/share/flavours/base16/templates/fish/templates/custom.mustache"
 
 link ./flavours/config.toml "$HOME/.config/flavours/config.toml"
 
@@ -45,4 +49,8 @@ link ./newsboat/config "$HOME/.config/newsboat/config"
 link ./nvim/init.lua "$HOME/.config/nvim/init.lua"
 link ./nvim/vim_plugins.sh "$HOME/scripts/vim_plugins.sh"
 
-link ./tmux/tmux.conf "$HOME/.tmux.conf"
+link ./tmux/tmux.conf "$HOME/.config/tmux/tmux.conf"
+link "$HOME/.config/tmux/tmux.conf" "$HOME/.tmux.conf"
+link ./tmux/theme.mustache "$HOME/.local/share/flavours/base16/templates/tmux/templates/custom.mustache"
+
+link ./vivid/theme.mustache "$HOME/.local/share/flavours/base16/templates/vivid/templates/custom.mustache"
diff --git a/tmux/theme.mustache b/tmux/theme.mustache
new file mode 100644
index 0000000..e238f4d
--- /dev/null
+++ b/tmux/theme.mustache
@@ -0,0 +1,43 @@
+# Base16 {{scheme-name}}
+# Scheme author: {{scheme-author}}
+# Template author: Tinted Theming: (https://github.com/tinted-theming)
+
+# default statusbar colors
+set-option -g status-style "fg=#{{base04-hex}},bg=#{{base01-hex}}"
+
+# default window title colors
+set-window-option -g window-status-style "fg=#{{base04-hex}},bg=default"
+
+# active window title colors
+set-window-option -g window-status-current-style "fg=#{{base0A-hex}},bg=default"
+
+# pane border
+set-option -g pane-border-style "fg=#{{base01-hex}}"
+set-option -g pane-active-border-style "fg=#{{base02-hex}}"
+
+# message text
+set-option -g message-style "fg=#{{base05-hex}},bg=#{{base01-hex}}"
+
+# pane number display
+set-option -g display-panes-active-colour "#{{base0B-hex}}"
+set-option -g display-panes-colour "#{{base0A-hex}}"
+
+# clock
+set-window-option -g clock-mode-colour "#{{base0B-hex}}"
+
+# copy mode highligh
+set-window-option -g mode-style "fg=#{{base04-hex}},bg=#{{base02-hex}}"
+
+# bell
+set-window-option -g window-status-bell-style "fg=#{{base01-hex}},bg=#{{base08-hex}}"
+
+
+set -g window-style 'bg=#{{base00-hex}}'
+set -g window-active-style 'bg=black'
+
+set -g status-style 'bg=#{{base01-hex}} fg=#{{base04-hex}} dim'
+
+setw -g window-status-style          'fg=#{{base04-hex}} bg=#{{base01-hex}}'
+setw -g window-status-current-style  'fg=#{{base06-hex}} bg=#{{base02-hex}} bold'
+setw -g window-status-format         ' #I#[fg=#{{base05-hex}}]:#W '
+setw -g window-status-current-format ' #I#[fg=#{{base06-hex}}]:#W '
diff --git a/tmux/tmux.conf b/tmux/tmux.conf
index 5780347..fa59261 100644
--- a/tmux/tmux.conf
+++ b/tmux/tmux.conf
@@ -40,63 +40,4 @@ set -g status-left ''
 set -g status-right-length 50
 set -g status-left-length 20
 
-# Start flavours
-# Base16 Dracula
-# Scheme author: Mike Barkmin (http://github.com/mikebarkmin) based on Dracula Theme (http://github.com/dracula)
-# Template author: Tinted Theming: (https://github.com/tinted-theming)
-
-# default statusbar colors
-set-option -g status-style "fg=#62d6e8,bg=#3a3c4e"
-
-# default window title colors
-set-window-option -g window-status-style "fg=#62d6e8,bg=default"
-
-# active window title colors
-set-window-option -g window-status-current-style "fg=#00f769,bg=default"
-
-# pane border
-set-option -g pane-border-style "fg=#3a3c4e"
-set-option -g pane-active-border-style "fg=#4d4f68"
-
-# message text
-set-option -g message-style "fg=#e9e9f4,bg=#3a3c4e"
-
-# pane number display
-set-option -g display-panes-active-colour "#ebff87"
-set-option -g display-panes-colour "#00f769"
-
-# clock
-set-window-option -g clock-mode-colour "#ebff87"
-
-# copy mode highligh
-set-window-option -g mode-style "fg=#62d6e8,bg=#4d4f68"
-
-# bell
-set-window-option -g window-status-bell-style "fg=#3a3c4e,bg=#ea51b2"
-
-######
-
-set -g window-style 'bg=#282936'
-set -g window-active-style 'bg=black'
-
-# #  modes
-# setw -g clock-mode-colour colour5
-# setw -g mode-style 'fg=colour1 bg=colour18 bold'
-
-# # panes
-# set -g pane-border-style 'fg=colour19 bg=colour0'
-# set -g pane-active-border-style 'bg=colour0 fg=colour9'
-
-set -g status-style 'bg=#3a3c4e fg=#62d6e8 dim'
-# set -g status-right '#[fg=colour233,bg=colour19] %d/%m #[fg=colour233,bg=colour8] %H:%M:%S '
-
-setw -g window-status-style          'fg=#626483 bg=#3a3c4e'
-setw -g window-status-current-style  'fg=#62d6e8 bg=#4d4f68 bold'
-setw -g window-status-format         ' #I#[fg=#62d6e8]:#W '
-setw -g window-status-current-format ' #I#[fg=#62d6e8]:#W '
-
-# setw -g window-status-bell-style 'fg=colour255 bg=colour1 bold'
-
-# # messages
-# set -g message-style 'fg=colour232 bg=colour16 bold'
-# End flavours
+source-file ~/.config/tmux/colours.conf
diff --git a/vivid/theme.mustache b/vivid/theme.mustache
new file mode 100644
index 0000000..062b0d2
--- /dev/null
+++ b/vivid/theme.mustache
@@ -0,0 +1,122 @@
+colors:
+  base00: '{{base00-hex}}'
+  base01: '{{base01-hex}}'
+  base02: '{{base02-hex}}'
+  base03: '{{base03-hex}}'
+  base04: '{{base04-hex}}'
+  base05: '{{base05-hex}}'
+  base06: '{{base06-hex}}'
+  base07: '{{base07-hex}}'
+  base08: '{{base08-hex}}'
+  base09: '{{base09-hex}}'
+  base0A: '{{base0A-hex}}'
+  base0B: '{{base0B-hex}}'
+  base0C: '{{base0C-hex}}'
+  base0D: '{{base0D-hex}}'
+  base0E: '{{base0E-hex}}'
+
+core:
+  normal_text: {}
+  regular_file: {}
+  reset_to_normal: {}
+
+  directory:
+    foreground: base09
+
+  symlink:
+    foreground: base05
+
+  multi_hard_link: {}
+
+  fifo:
+    foreground: base05
+    background: base00
+
+  socket:
+    foreground: base05
+    background: base00
+
+  door:
+    foreground: base05
+    background: base00
+
+  block_device:
+    foreground: base0B
+    background: base00
+
+  character_device:
+    foreground: base05
+    background: base00
+
+  broken_symlink:
+    foreground: base05
+    background: base00
+
+  missing_symlink_target:
+    foreground: base05
+    background: base00
+
+  setuid: {}
+
+  setgid: {}
+
+  file_with_capability: {}
+
+  sticky_other_writable: {}
+
+  other_writable: {}
+
+  sticky: {}
+
+  executable_file:
+    foreground: base05
+    font-style: bold
+
+text:
+  special:
+    foreground: base05
+    background: base00
+
+  todo:
+    font-style: bold
+
+  licenses:
+    foreground: base05
+
+  configuration:
+    foreground: base05
+
+  other:
+    foreground: base05
+
+markup:
+  foreground: base05
+
+programming:
+  source:
+    foreground: base05
+
+  tooling:
+    foreground: base05
+
+    continuous-integration:
+      foreground: base05
+
+media:
+  foreground: base05
+
+office:
+  foreground: base05
+
+archives:
+  foreground: base05
+  font-style: underline
+
+executable:
+  foreground: base05
+  font-style: bold
+
+unimportant:
+  foreground: base05
+
+# vim: syntax=yaml