From ade164717f9240b04f0d4a374f52fe5a550f9eb9 Mon Sep 17 00:00:00 2001
From: Harri Lahtinen <lahtinen.harri@gmail.com>
Date: Wed, 27 Oct 2021 20:56:26 +0300
Subject: [PATCH] Playing with flavours

---
 .config/kitty/kitty.conf                      |   6 +-
 .config/networkmanager-dmenu/config.ini       |   2 +-
 .config/nvim/config/main.vim                  |  10 +-
 .config/nvim/config/plugin-settings.vim       |   2 +-
 .config/polybar/colors.ini                    |  18 ++
 .config/polybar/config                        | 268 +++++++++---------
 .config/rofi/config.rasi                      |   2 +-
 .config/wpg/templates/config_twmn_twmn.conf   |   1 -
 .../wpg/templates/config_twmn_twmn.conf.base  |  34 ---
 .zshrc                                        |   2 +-
 addons/yay-packages                           |   1 +
 11 files changed, 165 insertions(+), 181 deletions(-)
 create mode 100644 .config/polybar/colors.ini
 delete mode 120000 .config/wpg/templates/config_twmn_twmn.conf
 delete mode 100644 .config/wpg/templates/config_twmn_twmn.conf.base

diff --git a/.config/kitty/kitty.conf b/.config/kitty/kitty.conf
index 937dc6a..bd798b3 100644
--- a/.config/kitty/kitty.conf
+++ b/.config/kitty/kitty.conf
@@ -1,6 +1,6 @@
 # vim:fileencoding=utf-8:ft=conf
 
-include ~/.cache/wal/colors-kitty.conf
+include ~/.config/kitty/colors.conf
 
 # Font family. You can also specify different fonts for the
 # bold/italic/bold-italic variants. By default they are derived automatically,
@@ -27,10 +27,10 @@ box_drawing_scale 0.001, 1, 1.5, 2
 #background       #202020
 
 # The foreground for selections
-selection_foreground #2f2f2f
+#selection_foreground #2f2f2f
 
 # The background for selections
-selection_background #d75f5f
+#selection_background #d75f5f
 
 # The cursor color
 #cursor           #8fee96
diff --git a/.config/networkmanager-dmenu/config.ini b/.config/networkmanager-dmenu/config.ini
index 2e25f6f..dceb480 100644
--- a/.config/networkmanager-dmenu/config.ini
+++ b/.config/networkmanager-dmenu/config.ini
@@ -15,7 +15,7 @@ dmenu_command = rofi -dmenu -theme-str '@import "network.rasi"'
 # m = number of monitor to display on
 # p = Custom Prompt for the networks menu
 pinentry = /usr/bin/pinentry
-rofi_highlight = False
+rofi_highlight = True
 compact = True
 # wifi_chars = <string of 4 unicode characters representing 1-4 bars strength>
 wifi_chars = ▂▄▆█
diff --git a/.config/nvim/config/main.vim b/.config/nvim/config/main.vim
index 10b7b69..4b883ff 100644
--- a/.config/nvim/config/main.vim
+++ b/.config/nvim/config/main.vim
@@ -11,13 +11,16 @@
 " Enable true colors support. Do not use this option if your terminal does not
 " support true colors! For a comprehensive list of terminals supporting true
 " colors, see https://github.com/termstandard/colors and https://bit.ly/2InF97t.
-set termguicolors
 
 " Use dark background
 set background=dark
 
+" Enable syntax highlighting
+syntax on
+
 " Colorscheme
-colorscheme nord
+colorscheme base16
+set termguicolors
 
 augroup specify_filetype
     autocmd!
@@ -68,9 +71,6 @@ set autoindent
 set smartindent
 set shiftround
 
-" Enable syntax highlighting
-syntax on
-
 " Print syntax highlighting.
 set printoptions+=syntax:y
 
diff --git a/.config/nvim/config/plugin-settings.vim b/.config/nvim/config/plugin-settings.vim
index 5175ce4..0e81bec 100644
--- a/.config/nvim/config/plugin-settings.vim
+++ b/.config/nvim/config/plugin-settings.vim
@@ -98,7 +98,7 @@ let g:NERDTreeIndicatorMapCustom = {
 "Airline   "
 """"""""""""
 "main settings
-let g:airline_theme='nord'
+let g:airline_theme='base16'
 let g:airline_powerline_fonts = 1
 let g:airline_symbols = {}
 let g:airline_skip_empty_sections = 1
diff --git a/.config/polybar/colors.ini b/.config/polybar/colors.ini
new file mode 100644
index 0000000..0ac66a0
--- /dev/null
+++ b/.config/polybar/colors.ini
@@ -0,0 +1,18 @@
+[colors]
+background = #00000000
+base00 = ee2E3440
+base01 = 3B4252
+base02 = 434C5E
+base03 = 4C566A
+base04 = D8DEE9
+base05 = E5E9F0
+base06 = ECEFF4
+base07 = 8FBCBB
+base08 = BF616A
+base09 = D08770
+base0A = EBCB8B
+base0B = A3BE8C
+base0C = 88C0D0
+base0D = 81A1C1
+base0E = B48EAD
+base0F = 5E81AC
diff --git a/.config/polybar/config b/.config/polybar/config
index 4f12b94..393d8d4 100644
--- a/.config/polybar/config
+++ b/.config/polybar/config
@@ -4,7 +4,7 @@
 ; |  \_/|_| |_)/--\| \
 ;
 [colors]
-include-file = ~/.config/polybar/colors
+include-file = ~/.config/polybar/colors.ini
 
 [bar/top]
 monitor = ${env:MONITOR:eDP-1}
@@ -28,93 +28,93 @@ modules-right = arrowb1 openweather
 [module/arrowb01]
 type = custom/text
 content = ""
-content-foreground = ${colors.color9}
-content-background = #00000000
+content-foreground = ${colors.base0C}
+content-background = ${background}
 
 [module/arrowb1]
 type = custom/text
 content = ""
-content-foreground = ${colors.color5}
-content-background = #00000000
+content-foreground = ${colors.base0B}
+content-background = ${background}
 
 [module/arrowb2]
 type = custom/text
 content = ""
-content-foreground = ${colors.color6}
-content-background = #00000000
+content-foreground = ${colors.base09}
+content-background = ${background}
 
 [module/arrow01]
 type = custom/text
 content = ""
-content-foreground = ${colors.color8}
-content-background = ${colors.color4}
+content-foreground = ${colors.base03}
+content-background = ${colors.base0A}
 
 
 [module/arrow0]
 type = custom/text
 content = ""
-content-foreground = ${colors.color4}
-content-background = #00000000
+content-foreground = ${colors.base0A}
+content-background = ${background}
 
 [module/arrow1]
 type = custom/text
 content = ""
-content-foreground = ${colors.color15}
-content-background = ${colors.color4}
+content-foreground = ${colors.base07}
+content-background = ${colors.base0A}
 
 [module/arrow2]
 type = custom/text
 content = ""
-content-foreground = ${colors.color4}
-content-background = ${colors.color3}
+content-foreground = ${colors.base0A}
+content-background = ${colors.base0F}
 
 [module/arrow3]
 type = custom/text
 content = ""
-content-foreground = ${colors.color3}
-content-background = ${colors.color2}
+content-foreground = ${colors.base0F}
+content-background = ${colors.base08}
 
 [module/arrow4]
 type = custom/text
 content = ""
-content-foreground = ${colors.color2}
-content-background = ${colors.color6}
+content-foreground = ${colors.base08}
+content-background = ${colors.base09}
 
 [module/arrow5]
 type = custom/text
 content = ""
-content-foreground = ${colors.color6}
-content-background = ${colors.color9}
+content-foreground = ${colors.base09}
+content-background = ${colors.base0C}
 
 [module/arrow6]
 type = custom/text
 content = ""
-content-foreground = ${colors.color9}
-content-background = ${colors.color5}
+content-foreground = ${colors.base0C}
+content-background = ${colors.base0B}
 
 [module/arrow7]
 type = custom/text
 content = ""
-content-foreground = ${colors.color5}
-content-background = ${colors.color3}
+content-foreground = ${colors.base0B}
+content-background = ${colors.base0F}
 
 [module/arrow8]
 type = custom/text
 content = ""
-content-foreground = ${colors.color3}
-content-background = ${colors.color4}
+content-foreground = ${colors.base0F}
+content-background = ${colors.base0A}
 
 [module/arrow9]
 type = custom/text
 content = ""
-content-foreground = ${colors.color4}
-content-background = ${colors.color6}
+content-foreground = ${colors.base0A}
+content-background = ${colors.base09}
 
 [module/arrow10]
 type = custom/text
 content = ""
-content-foreground = ${colors.color6}
-content-background = #00000000
+content-foreground = ${colors.base09}
+content-background = ${background}
 
 [module/bluetoothctl]
 type = custom/script
@@ -122,16 +122,16 @@ exec = ~/.config/polybar/scripts/bluetoothctl.sh
 tail = true
 click-left = ~/.config/polybar/scripts/bluetoothctl.sh --toggle
 label = " %output% "
-label-foreground = ${colors.color0}
-label-background = ${colors.color6}
+label-foreground = ${colors.base00}
+label-background = ${colors.base09}
 
 ;[module/vpn-nordvpn-status]
 ;type = custom/script
 ;exec = ~/.config/polybar/scripts/nordvpn/vpn-nordvpn-status.sh
 ;interval = 5
 ;label = " %output% "
-;label-foreground = ${colors.color0} 
-;label-background = ${colors.color3}
+;label-foreground = ${colors.base00} 
+;label-background = ${colors.base0F}
 
 [module/vpn]
 type = custom/script
@@ -141,7 +141,7 @@ click-right = ~/.config/polybar/scripts/nordvpn/vpn_module.sh --location-menu
 click-middle = ~/.config/polybar/scripts/nordvpn/vpn_module.sh --ip_address
 interval = 5
 format = "   <label> "
-format-background = ${colors.color3}
+format-background = ${colors.base0F}
 
 
 [module/pavolume]
@@ -153,8 +153,8 @@ click-right = exec pavucontrol
 click-left = ~/.config/polybar/scripts/pavolume.sh --togmute
 scroll-up = ~/.config/polybar/scripts/pavolume.sh --up
 scroll-down = ~/.config/polybar/scripts/pavolume.sh --down
-format-foreground = ${colors.color0}
-format-background = ${colors.color6}
+format-foreground = ${colors.base00}
+format-background = ${colors.base09}
 
 [module/filesystem]
 type = internal/fs
@@ -165,10 +165,10 @@ spacing = 4
 format-mounted = <label-mounted>
 format-unmounted = <label-unmounted>
 label-mounted = "  %percentage_used%%"
-label-mounted-foreground = ${colors.foreground}
+label-mounted-foreground = ${colors.base09}
 label-mounted-background = ${colors.background}
 label-unmounted = %mountpoint%: not mounted
-label-unmounted-foreground = ${colors.foreground-alt}
+label-unmounted-foreground = ${colors.base0D}
 
 [module/redshift]
 type = custom/script
@@ -178,8 +178,8 @@ click-left = source ~/.config/polybar/scripts/redshift/env.sh && ~/.config/polyb
 scroll-up = source ~/.config/polybar/scripts/redshift/env.sh && ~/.config/polybar/scripts/redshift/redshift.sh increase
 scroll-down = source ~/.config/polybar/scripts/redshift/env.sh && ~/.config/polybar/scripts/redshift/redshift.sh decrease
 interval=0.5
-format-foreground = ${colors.color0}
-format-background = ${colors.color6}
+format-foreground = ${colors.base00}
+format-background = ${colors.base09}
 
 [module/backlight]
 type = custom/script
@@ -188,11 +188,11 @@ exec = ~/.config/polybar/scripts/backlight.sh
 scroll-up = exec light -A 5
 scroll-down = exec light -U 5
 format-prefix = "  "
-format-prefix-foreground = ${colors.color0}
-format-prefix-background = ${colors.color3}
+format-prefix-foreground = ${colors.base00}
+format-prefix-background = ${colors.base0F}
 label = "%output%% "
-label-foreground = ${colors.color0}
-label-background = ${colors.color3}
+label-foreground = ${colors.base00}
+label-background = ${colors.base0F}
 
 [module/popup-calendar]
 type = custom/script
@@ -200,11 +200,11 @@ exec = ~/.config/polybar/scripts/popup-calendar.sh
 interval = 5
 click-left = ~/.config/polybar/scripts/popup-calendar.sh --popup
 format-prefix = "  "
-format-prefix-foreground = ${colors.color0}
-format-prefix-background = ${colors.color15}
+format-prefix-foreground = ${colors.base0}
+format-prefix-background = ${colors.base07}
 label = "%output% "
-format-foreground = ${colors.color0}
-format-background = ${colors.color15}
+format-foreground = ${colors.base00}
+format-background = ${colors.base07}
 
 [module/vpncheck]
 type = custom/script
@@ -212,10 +212,10 @@ exec = pgrep openvpn
 interval = 5
 label = "VPN "
 format-prefix = "   "
-format-prefix-foreground = ${colors.color0}
-format-prefix-background = ${colors.color6}
-label-foreground = ${colors.color0}
-label-background = ${colors.color6}
+format-prefix-foreground = ${colors.base00}
+format-prefix-background = ${colors.base09}
+label-foreground = ${colors.base00}
+label-background = ${colors.base09}
 
 [module/hostname]
 type = custom/script
@@ -224,19 +224,19 @@ format = "<label>"
 format-prefix = "  "
 ;format-prefix = ""
 exec = echo "$(uname -nr)"
-format-prefix-foreground = ${colors.color0}
-format-prefix-background = ${colors.color9}
+format-prefix-foreground = ${colors.base00}
+format-prefix-background = ${colors.base0C}
 label = "%output% "
-label-foreground = ${colors.color0}
-label-background = ${colors.color9}
+label-foreground = ${colors.base00}
+label-background = ${colors.base0C}
 
 [module/vpn-wireguard-wg]
 type = custom/script
 exec = ~/.config/polybar/scripts/wireguard/vpn-wireguard-wg.sh
 interval = 5
 click-left = ~/.config/polybar/scripts/wireguard/vpn-wireguard-wg.sh --toggle &
-label-foreground = ${colors.color0}
-label-background = ${colors.color4}
+label-foreground = ${colors.base00}
+label-background = ${colors.base0A}
 
 [module/temperature]
 type = internal/temperature
@@ -245,18 +245,18 @@ thermal-zone = 6
 hwmon-path = ${env:HWMON_PATH}
 warn-temperature = 65
 format = <ramp> <label>
-format-underline = ${colors.foreground}
+format-underline = ${colors.base09}
 format-warn = <ramp> <label-warn>
 format-warn-underline = ${self.format-underline}
 label = "%temperature-c% "
 label-warn = " %temperature-c% "
-label-warn-foreground = ${colors.alert}
+label-warn-foreground = ${colors.base0C}
 ramp-0 = " "
 ramp-1 = " "
 ramp-2 = " "
 ramp-3 = " "
 ramp-4 = " "
-ramp-foreground = ${colors.foreground}
+ramp-foreground = ${colors.base09}
 
 [module/pkg]
 type = custom/script
@@ -265,9 +265,9 @@ tail = true
 format = "<label> "
 #format-prefix = "  "
 format-prefix = "  "
-format-prefix-foreground = ${colors.color0}
-format-foreground = ${colors.color0}
-format-background = ${colors.color9}
+format-prefix-foreground = ${colors.base00}
+format-foreground = ${colors.base00}
+format-background = ${colors.base0C}
 click-left = kitty -e yay --noconfirm -Syu
 click-right = "~/.config/polybar/scripts/arch/arch-updates.sh -c&"
 click-middle = "~/.config/polybar/scripts/arch/arch-updates.sh -n"
@@ -279,8 +279,8 @@ tail = true
 interval = 600
 click-left = ~/.config/polybar/scripts/wttr.sh
 format = <label>
-format-foreground = ${colors.color0}
-format-background = ${colors.color5}
+format-foreground = ${colors.base00}
+format-background = ${colors.base0B}
 
 [module/i3]
 type = internal/i3
@@ -300,61 +300,61 @@ ws-icon-7 = 8:;
 ws-icon-8 = 9:;
 ws-icon-9 = 10:;
 label-mode-padding = 1
-label-mode-foreground = ${colors.foreground}
-label-mode-background = ${colors.color8}
+label-mode-foreground = ${colors.base09}
+label-mode-background = ${colors.base03}
 ; focused = Active workspace on focused monitor
 label-focused = %icon%
-label-focused-foreground = ${colors.foreground-alt}
-label-focused-background = ${colors.color8}
+label-focused-foreground = ${colors.base0D}
+label-focused-background = ${colors.base03}
 label-focused-padding = 1
 ; unfocused = Inactive workspace on any monitor
 label-unfocused = %icon%
-label-unfocused-foreground = ${colors.foreground}
-label-unfocused-background = ${colors.color8}
+label-unfocused-foreground = ${colors.base09}
+label-unfocused-background = ${colors.base03}
 label-unfocused-padding = 1
 ; urgent = Workspace with urgency hint set
 label-urgent = %icon%
-label-urgent-background = ${colors.alert}
+label-urgent-background = ${colors.base0C}
 label-urgent-padding = 1
 
 [module/fm]
 type = custom/text
 content = " "
-content-foreground = ${colors.foreground}
+content-foreground = ${colors.base09}
 click-left = st -e ranger &
 click-right = pcmanfm &
 
 [module/term]
 type = custom/text
 content = " "
-content-foreground = ${colors.foreground}
+content-foreground = ${colors.base09}
 click-left = st &
 click-right = st -e tmux new -s tmux1 &
 
 [module/vpn1]
 type = custom/text
 content = " "
-content-foreground = ${colors.foreground}
+content-foreground = ${colors.base09}
 click-left = "exec nordvpn connect"
 click-right = "exec nordvpn disconnect"
 
 [module/editor]
 type = custom/text
 content = " "
-content-foreground = ${colors.foreground}
+content-foreground = ${colors.base09}
 click-left = st -e nvim &
 click-right = leafpad &
 
 [module/chrome]
 type = custom/text
 content = " "
-content-foreground = ${colors.foreground}
+content-foreground = ${colors.base09}
 click-left = google-chrome-stable &
 
 [module/music]
 type = custom/text
 content = " "
-content-foreground = ${colors.foreground}
+content-foreground = ${colors.base09}
 click-left = st -e ncmpcpp &
 click-right = gpmdp &
 
@@ -365,9 +365,9 @@ label = %{A4:wmctrl -s "$(($(xprop -root _NET_CURRENT_DESKTOP | cut -d '=' -f 2
 exec = echo "$(($(xprop -root _NET_CURRENT_DESKTOP | cut -d '=' -f 2 | cut -d ' ' -f 2)+1))"
 format = <label>
 format-prefix = "  "
-format-prefix-foreground = ${colors.color0}
-format-prefix-background = ${colors.color2}
-format-background = ${colors.color2}
+format-prefix-foreground = ${colors.base00}
+format-prefix-background = ${colors.base08}
+format-background = ${colors.base08}
 
 [module/window_count]
 type = custom/script
@@ -376,7 +376,7 @@ label = %{A1:rofi -width 30 -location 1 -xoffset 3 -show window:}%output% %{A
 exec = echo "$(($(lsw | wc -l)-1))"
 format = <label>
 format-prefix = " "
-format-prefix-foreground = ${colors.foreground-alt}
+format-prefix-foreground = ${colors.base0D}
 
 [module/xtitle]
 type = custom/script
@@ -385,9 +385,9 @@ label = %output%
 label-maxlen = 40
 exec = echo "$(xtitle)"
 format = <label>
-format-background = ${colors.background-alt}
+format-background = ${colors.base01}
 format-prefix = " "
-format-prefix-foreground = ${colors.foreground}
+format-prefix-foreground = ${colors.base09}
 format-padding = 1
 
 [module/xwindow]
@@ -397,16 +397,16 @@ type = internal/xwindow
 ;label = "%title%"
 label = " %title:0:30:...%"
 label-maxlen = 150
-label-foreground = ${colors.color0}
-label-background = ${colors.color4}
+label-foreground = ${colors.base00}
+label-background = ${colors.base0A}
 
 [module/mpd]
 type = internal/mpd
 format-online = <icon-prev> <icon-stop> <toggle> <icon-next> <label-song>
 format-online-prefix = " "
-format-online-prefix-foreground = ${colors.foreground-alt}
-fomat-online-foreground = ${colors.color9}
-format-online-background = ${colors.background-alt}
+format-online-prefix-foreground = ${colors.base0D}
+fomat-online-foreground = ${colors.base0C}
+format-online-background = ${colors.base01}
 format-online-padding = 1
 icon-play = 
 icon-pause = 
@@ -417,18 +417,18 @@ icon-random = 
 label-song = %title%
 label-song-maxlen = 25
 label-song-ellipsis = true
-toggle-on-foreground = ${colors.foreground}
-toggle-off-foreground = ${colors.foreground-alt}
+toggle-on-foreground = ${colors.base09}
+toggle-off-foreground = ${colors.base0D}
 
 [module/xkeyboard]
 type = internal/xkeyboard
 color0list-0 = num lock
 format-prefix = " "
-format-prefix-foreground = ${colors.foreground-alt}
+format-prefix-foreground = ${colors.base0D}
 label-layout = %layout%
 label-indicator-padding = 1
 label-indicator-margin = 1
-label-indicator-foreground = ${colors.color2}
+label-indicator-foreground = ${colors.base08}
 label-indicator-background = ${colors.background}
 
 [module/cpu]
@@ -437,20 +437,20 @@ format = <label>
 type = internal/cpu
 interval = 2
 label = " %percentage%% "
-format-foreground = ${colors.foreground}
+format-foreground = ${colors.base09}
 
 [module/memory]
 type = internal/memory
 interval = 2
 label = " %percentage_used%%"
-format-foreground = ${colors.foreground}
+format-foreground = ${colors.base09}
 
 [module/cputemp]
 type = custom/script
 exec = sensors | grep --max-count=1 "temp1" | awk '{print substr($0,16,2)}'
 interval = 10
 label = " %output%°C"
-format-foreground = ${colors.foreground-alt}
+format-foreground = ${colors.base0D}
 
 [module/clock]
 type = custom/script
@@ -458,7 +458,7 @@ interval = 5
 exec = echo "$(date +%R)"
 format = <label>
 ;format-prefix = " "
-format-foreground = ${colors.foreground-alt}
+format-foreground = ${colors.base0D}
 label = %{A1:gsimplecal &:}%output%%{A}
 
 [module/alsa]
@@ -474,13 +474,13 @@ mapped = true
 interval = 5
 format-volume = <ramp-volume> <label-volume>
 label-volume = %percentage%%
-label-volume-foreground = ${colors.foreground}
+label-volume-foreground = ${colors.base09}
 format-muted = <label-muted>
-format-muted-foreground = ${colors.alert}
+format-muted-foreground = ${colors.base0C}
 label-muted =  muted
 ramp-volume-0 = 
 ramp-volume-1 = 
-ramp-volume-foreground = ${colors.foreground}
+ramp-volume-foreground = ${colors.base09}
 ramp-headphones-0 = 
 ramp-headphones-1 = 
 
@@ -495,27 +495,27 @@ label-charging = " %percentage%% "
 label-discharging = " %percentage%% "
 format-charging = <animation-charging><label-charging>
 format-discharging = <animation-discharging><label-discharging>
-format-charging-foreground = ${colors.color0}
-format-charging-background = ${colors.color2}
-label-charging-foreground = ${colors.color0}
-label-charging-background = ${colors.color2}
-format-discharging-foreground = ${colors.color0}
-format-discharging-background = ${colors.color2} 
-label-discharging-foreground = ${colors.color0}
-label-discharging-background = ${colors.color2}
+format-charging-foreground = ${colors.base00}
+format-charging-background = ${colors.base08}
+label-charging-foreground = ${colors.base00}
+label-charging-background = ${colors.base08}
+format-discharging-foreground = ${colors.base00}
+format-discharging-background = ${colors.base08} 
+label-discharging-foreground = ${colors.base00}
+label-discharging-background = ${colors.base08}
 format-full-prefix = "  "
-format-full-prefix-foreground = ${colors.color0}
-format-full-prefix-background = ${colors.color2}
-format-low = ${colors.color0}
-label-full-foreground = ${colors.color0}
-label-full-background = ${colors.color2}
+format-full-prefix-foreground = ${colors.base00}
+format-full-prefix-background = ${colors.base08}
+format-low = ${colors.base00}
+label-full-foreground = ${colors.base00}
+label-full-background = ${colors.base08}
 animation-charging-0 = " "
 animation-charging-1 = " "
 animation-charging-2 = " "
 animation-charging-3 = " "
 animation-charging-4 = " "
-animation-charging-foreground = ${colors.color0}
-animation-charging-background = ${colors.color2}
+animation-charging-foreground = ${colors.base00}
+animation-charging-background = ${colors.base08}
 animation-charging-framerate = 500
 animation-discharging-0 = " "
 animation-discharging-1 = " "
@@ -523,14 +523,14 @@ animation-discharging-2 = " "
 animation-discharging-3 = " "
 animation-discharging-4 = " "
 animation-discharging-framerate = 1000
-animation-discharging-foreground = ${colors.color0}
-animation-discharging-background = ${colors.color2}
+animation-discharging-foreground = ${colors.base00}
+animation-discharging-background = ${colors.base08}
 
 [module/networkmanager]
 type = custom/text
 content = " net  " 
-content-foreground = ${colors.color0}
-content-background = ${colors.color4}
+content-foreground = ${colors.base00}
+content-background = ${colors.base0A}
 click-left = networkmanager_dmenu
 
 [module/eth]
@@ -539,10 +539,10 @@ interface = enp0s25
 interval = 3.0
 format-connected = <label-connected>
 format-connected-prefix = " "
-format-connected-prefix-foreground = ${colors.foreground-alt}
+format-connected-prefix-foreground = ${colors.base0D}
 format-disconnected = <label-disconnected>
 label-connected = %{A1:networkmanager_dmenu:}%downspeed%%{A}
-label-connected-foreground = ${colors.foreground}
+label-connected-foreground = ${colors.base09}
 label-disconnected =
 
 [module/wlan]
@@ -551,34 +551,34 @@ interface = wlan0
 interval = 3.0
 format-connected = <label-connected>
 label-connected = "  %essid%   %signal%  %upspeed:7%  %downspeed:7% "
-format-connected-foreground = ${colors.color0}
-format-connected-background = ${colors.color5}
+format-connected-foreground = ${colors.base00}
+format-connected-background = ${colors.base0B}
 format-disconnected = <label-disconnected>
 label-disconnected = "%{A1:connman-gtk &:}%{A}"
-format-disconnected-foreground = ${colors.color0}
-format-disconnected-background = ${colors.color2}
+format-disconnected-foreground = ${colors.base00}
+format-disconnected-background = ${colors.base08}
 ramp-signal-0 = 
 ramp-signal-1 = 
 ramp-signal-2 = 
 ramp-signal-3 = 
 ramp-signal-4 = 
-ramp-signal-foreground = ${colors.color0}
+ramp-signal-foreground = ${colors.base00}
 
 [module/powermenu]
 type = custom/menu
 format-spacing = 1
 label-open = 
 label-open-font = 2
-label-open-foreground = ${colors.color2}
+label-open-foreground = ${colors.base08}
 label-close = 
-label-close-foreground = ${colors.foreground}
+label-close-foreground = ${colors.base09}
 label-separator = |
-label-separator-foreground = ${colors.foreground-alt}
+label-separator-foreground = ${colors.base0D}
 menu-0-0 = 
-menu-0-0-foreground = ${colors.color9}
+menu-0-0-foreground = ${colors.base0C}
 menu-0-0-exec = menu-open-1
 menu-0-1 = 
-menu-0-1-foreground = ${colors.color2}
+menu-0-1-foreground = ${colors.base08}
 menu-0-1-exec = menu-open-2
 menu-1-0 = reboot?
 menu-1-0-exec = /sbin/reboot
diff --git a/.config/rofi/config.rasi b/.config/rofi/config.rasi
index a0c10fc..1588bec 100644
--- a/.config/rofi/config.rasi
+++ b/.config/rofi/config.rasi
@@ -25,4 +25,4 @@ element-text,
 element-icon {
   background-color: transparent;
 }
-@import "~/.cache/wal/colors-rofi-dark"
+@import "colors"
diff --git a/.config/wpg/templates/config_twmn_twmn.conf b/.config/wpg/templates/config_twmn_twmn.conf
deleted file mode 120000
index c45b1c2..0000000
--- a/.config/wpg/templates/config_twmn_twmn.conf
+++ /dev/null
@@ -1 +0,0 @@
-/home/hate/.config/twmn/twmn.conf
\ No newline at end of file
diff --git a/.config/wpg/templates/config_twmn_twmn.conf.base b/.config/wpg/templates/config_twmn_twmn.conf.base
deleted file mode 100644
index d95b261..0000000
--- a/.config/wpg/templates/config_twmn_twmn.conf.base
+++ /dev/null
@@ -1,34 +0,0 @@
-[gui]
-absolute_position=
-always_on_top=true
-background_color={color0}
-bounce=true
-bounce_duration=500
-font=UbuntuMono Nerd Font 
-font_size=12
-font_variant=medium
-foreground_color=#999999
-height=16
-in_animation=38
-in_animation_duration=2000
-max_length=-1
-offset_x=0
-offset_y=0
-opacity=100
-out_animation=13
-out_animation_duration=1000
-position=top_right
-screen=
-
-[icons]
-critical_icon=
-info_icon=
-warning_icon=
-
-[main]
-activate_command=
-duration=6000
-enable_shortcuts=true
-host=127.0.0.1
-port=9797
-sound_command=
diff --git a/.zshrc b/.zshrc
index 747b8d8..fbb0af8 100644
--- a/.zshrc
+++ b/.zshrc
@@ -82,7 +82,7 @@ source $ZSH/oh-my-zsh.sh
 PATH=/home/hate/go/bin:/usr/local/bin:/home/hate/.local/bin:/home/hate/.config/Scripts:$PATH
 
 # Wpg restore on terminals
-(cat ~/.config/wpg/sequences &)
+#(cat ~/.config/wpg/sequences &)
 
 #FASD
 eval "$(fasd --init auto)"
diff --git a/addons/yay-packages b/addons/yay-packages
index 322a6a7..f32809e 100644
--- a/addons/yay-packages
+++ b/addons/yay-packages
@@ -11,6 +11,7 @@ dell-bios-fan-control-git
 downgrade
 duf-bin
 fasd-git
+flavours
 google-chrome
 googler
 gtk-theme-arc-gruvbox-git