diff --git a/config/i3/config b/config/i3/config
new file mode 100644
index 0000000..096889a
--- /dev/null
+++ b/config/i3/config
@@ -0,0 +1,498 @@
+# i3 config file (v4)
+# Please see http://i3wm.org/docs/userguide.html for a complete reference!
+
+set $mod Mod4
+
+# Font for window titles. Will also be used by the bar unless a different font
+# is used in the bar {} block below.
+# Also changes titlebar height accordingly
+#font pango: tewi 9
+#font pango: terminus 16
+#font pango: mononoki Nerd Font 16
+font pango: FuraCode Nerd Font Bold 9
+#font pango:terminus 9
+#font pango: pxplus ibm vga8 8
+
+# Use Mouse+$mod to drag floating windows to their wanted position
+floating_modifier $mod
+
+# start a terminal
+bindsym $mod+Return exec $term
+bindsym $mod+t exec $term
+
+# start a floating terminal
+bindsym $mod+Shift+Return exec $term --title floatingterm --geometry 80x20
+for_window [title="floatingterm"] floating enable
+
+# kill focused window
+bindsym $mod+Shift+q kill
+# Doesnt work
+#bindsym $mod+q exec xkill
+
+# The middle button over a titlebar kills the window
+bindsym --release button2 kill
+
+# The right button toggles floating
+bindsym button3 floating toggle
+
+# The middle button and a modifer over any part of the window kills the window
+# Works but the middle click also goes through the window "under"
+# bindsym --whole-window $mod+button2 kill
+
+# start dmenu (a program launcher)
+#bindsym $mod+d exec dmenu_run SOS LOOK FOR "rofi" down down down
+# There also is the (new) i3-dmenu-desktop which only displays applications
+# shipping a .desktop file. It is a wrapper around dmenu, so you need that
+# installed.
+# bindsym $mod+d exec --no-startup-id i3-dmenu-desktop
+
+# change focus
+#bindsym $mod+j focus left
+#bindsym $mod+k focus down
+#bindsym $mod+l focus up
+#bindsym $mod+semicolon focus right
+
+# alternatively, you can use the cursor keys:
+bindsym $mod+Left focus left
+bindsym $mod+Down focus down
+bindsym $mod+Up focus up
+bindsym $mod+Right focus right
+
+# move focused window
+#bindsym $mod+Shift+j move left
+#bindsym $mod+Shift+k move down
+#bindsym $mod+Shift+l move up
+#bindsym $mod+Shift+semicolon move right
+
+# alternatively, you can use the cursor keys:
+bindsym $mod+Shift+Left move left
+bindsym $mod+Shift+Down move down
+bindsym $mod+Shift+Up move up
+bindsym $mod+Shift+Right move right
+
+# split in horizontal orientation
+bindsym $mod+h split h
+
+# split in vertical orientation
+bindsym $mod+v split v
+
+# enter fullscreen mode for the focused container
+bindsym $mod+f fullscreen toggle
+
+# change container layout (stacked, tabbed, toggle split)
+bindsym $mod+s layout stacking
+bindsym $mod+w layout tabbed
+bindsym $mod+e layout toggle split
+
+# toggle tiling / floating
+bindsym $mod+Shift+space floating toggle
+
+# change focus between tiling / floating windows
+bindsym $mod+space focus mode_toggle
+
+# focus the parent container
+bindsym $mod+a focus parent
+
+# focus the child container
+#bindsym $mod+d focus child
+
+# Terminal
+set $term urxvtc
+#set $term urxvt
+
+# Workspace variables
+set $ws1 "1"
+set $ws2 "2"
+set $ws3 "3"
+set $ws4 "4"
+set $ws5 "5"
+set $ws6 "6"
+set $ws7 "7"
+set $ws8 "8"
+set $ws9 "9"
+set $ws0 "10"
+
+# switch to workspace
+bindsym $mod+1 workspace $ws1
+bindsym $mod+2 workspace $ws2
+bindsym $mod+3 workspace $ws3
+bindsym $mod+4 workspace $ws4
+bindsym $mod+5 workspace $ws5
+bindsym $mod+6 workspace $ws6
+bindsym $mod+7 workspace $ws7
+bindsym $mod+8 workspace $ws8
+bindsym $mod+9 workspace $ws9
+bindsym $mod+0 workspace $ws0
+
+# move focused container to workspace
+bindsym $mod+Shift+1 move container to workspace $ws1
+bindsym $mod+Shift+2 move container to workspace $ws2
+bindsym $mod+Shift+3 move container to workspace $ws3
+bindsym $mod+Shift+4 move container to workspace $ws4
+bindsym $mod+Shift+5 move container to workspace $ws5
+bindsym $mod+Shift+6 move container to workspace $ws6
+bindsym $mod+Shift+7 move container to workspace $ws7
+bindsym $mod+Shift+8 move container to workspace $ws8
+bindsym $mod+Shift+9 move container to workspace $ws9
+bindsym $mod+Shift+0 move container to workspace $ws0
+
+# Specific Workspace options
+assign [class="Firefox"] $ws1
+#assign [class="wow_434.exe"] $ws2
+assign [class="discord"] $ws3
+#assign [class="skypeforlinux"] $ws3
+#assign [class="TeamSpeak 3"] $ws3
+#assign [class="Sublime_text"] $ws4
+#assign [class="Thunar"] $ws5
+#assign [class="Evince"] $ws5
+assign [class="Gimp"] $ws6
+#assign [class="VirtualBox"] $ws7
+#assign [class="vlc"] $ws8
+assign [class="Lutris"] $ws9
+assign [class="Steam"] $ws9
+
+# For gimp (not needed anymore since im using single window mode)
+#for_window [window_role="gimp-dock"] floating disable; move left; resize shrink width 50 px or 50ppt
+#for_window [window_role="gimp-toolbox"] floating disable; move right; resize grow width 30 px or 30ppt
+#for_window [class="Gimp"] floating enable
+
+
+# reload the configuration file
+bindsym $mod+Shift+c reload
+# restart i3 inplace (preserves your layout/session, can be used to upgrade i3)
+bindsym $mod+Shift+r restart
+# restart Xresources
+bindsym $mod+Shift+w exec xrdb ~/.Xresources
+
+# exit i3 (logs you out of your X session)
+#bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -b 'Yes, exit i3' 'i3-msg exit'"
+bindsym $mod+Shift+x exec i3-msg exit
+
+# resize window (you can also use the mouse for that)
+
+set $resize_mode "» resize"
+
+mode $resize_mode {
+ # These bindings trigger as soon as you enter the resize mode
+
+ # Pressing left will shrink the window’s width.
+ # Pressing right will grow the window’s width.
+ # Pressing up will shrink the window’s height.
+ # Pressing down will grow the window’s height.
+ bindsym h resize shrink width 10 px or 10 ppt
+ bindsym j resize grow height 10 px or 10 ppt
+ bindsym k resize shrink height 10 px or 10 ppt
+ bindsym l resize grow width 10 px or 10 ppt
+
+ # same bindings, but for the arrow keys
+ bindsym Left resize shrink width 10 px or 10 ppt
+ bindsym Down resize grow height 10 px or 10 ppt
+ bindsym Up resize shrink height 10 px or 10 ppt
+ bindsym Right resize grow width 10 px or 10 ppt
+
+ # back to normal: Enter or Escape
+ bindsym Return mode "default"
+ bindsym Escape mode "default"
+ bindsym r mode "default"
+ bindsym $mod+r mode "default"
+}
+
+bindsym $mod+r mode $resize_mode
+
+##################################### Customization ####################################
+
+# Default layout
+#workspace_layout default|stacking|tabbed
+#workspace_layout stacking
+
+# Focus follows mouse
+focus_follows_mouse no
+
+# For instance: Assume you are on workspace "1: www" and switch to "2: IM"
+# using mod+2 because somebody sent you a message. You don’t need to
+# remember where you came from now, you can just press $mod+2 again
+# to switch back to "1: www".
+workspace_auto_back_and_forth yes
+
+########################## STYLE ##########################
+
+# Borders
+# border normal|pixel (titlebar|notitlebar)
+# border none|toggle
+
+# Border width
+set $border_width 0
+
+# only titlebar (doesnt work well with gaps enabled (visual glitches) unless you are tabbed or stacked)
+# compton helps with the glitching a lot though
+#for_window [class="^.*"] border normal 0
+
+# border only
+for_window [class="^.*"] border pixel $border_width
+
+# no titlebar no border
+#for_window [class="^.*"] border none
+
+# Borders only on terminal
+#for_window [class="URxvt"] border pixel $border_width
+
+set $wave .:*~*:._.:*~*:.
+set $decor X
+
+# titlebar format
+
+# empty
+#for_window [class=".*"] title_format
+
+# full wave title
+#for_window [class=".*"] title_format $wave$wave$wave$wave$wave$wave$wave$wave$wave$wave$wave$wave$wave$wave$wave$wave$wave$wave
+
+# simple title
+#for_window [class=".*"] title_format » %title
+#for_window [class=".*"] title_format » %title
+#for_window [class=".*"] title_format » %title
+#for_window [class=".*"] title_format " » %title"
+
+# title box
+#for_window [class=".*"] title_format %title
+
+# class box - wave - title box
+#for_window [class=".*"] title_format %class $wave %title
+
+# Border width
+#new_window pixel 2
+#new_window normal 0
+
+# Firefox appearance
+#for_window [class="Firefox"] border none
+
+# Global gaps
+set $inner_default 10
+set $outer_default 25
+
+gaps inner $inner_default
+gaps outer $outer_default
+
+# Enable gaps only if there is more than one container
+# smart_gaps on
+
+# Hide borders when only 1 window is open in the workspace
+#hide_edge_borders both
+#hide_edge_borders smart
+
+# Wallpaper
+exec_always --no-startup-id ~/.fehbg
+
+##################################### Colors ####################################
+
+# Grab colors from Xresources (requires reloading xrdb and i3)
+set_from_resource $color0 i3wm.color0 #050505
+set_from_resource $color1 i3wm.color1 #AA0000
+set_from_resource $color2 i3wm.color2 #00AA00
+set_from_resource $color3 i3wm.color3 #FFFF55
+set_from_resource $color4 i3wm.color4 #0000AA
+set_from_resource $color5 i3wm.color5 #AA00AA
+set_from_resource $color6 i3wm.color6 #00AAAA
+set_from_resource $color7 i3wm.color7 #AAAAAA
+set_from_resource $color8 i3wm.color8 #666666
+set_from_resource $color9 i3wm.color1 #AA0000
+set_from_resource $color10 i3wm.color10 #00AA00
+set_from_resource $color11 i3wm.color11 #FFFF55
+set_from_resource $color12 i3wm.color12 #0000AA
+set_from_resource $color13 i3wm.color13 #AA00AA
+set_from_resource $color14 i3wm.color14 #00AAAA
+set_from_resource $color15 i3wm.color15 #AAAAAA
+
+# Urgent color
+set_from_resource $colorU i3wm.color1 #AAAAAA
+# Focused color
+set_from_resource $colorF i3wm.color6 #AAAAAA
+# Inactive color
+set_from_resource $colorI i3wm.color8 #AAAAAA
+# uNfocused color
+set_from_resource $colorN i3wm.color8 #666666
+# Background color
+set_from_resource $colorB i3wm.color2 #666666
+
+# Example
+#set $color7 #AAAAAA
+
+####### NORMAL #######
+# class border background text indicator child_border
+client.focused $colorF $colorF $color0 $colorF $colorF
+client.focused_inactive $colorI $colorI $color0 $colorI $colorI
+client.unfocused $colorN $colorN $color0 $colorN $colorN
+client.urgent $colorU $colorU $color0 $colorU $colorU
+client.placeholder $color7 $color0 $color7 $color7 $color7
+
+
+####### DARK #######
+# class border background text indicator child_border
+#client.focused $colorB $colorB $colorF $colorB $colorB
+#client.focused_inactive $colorB $colorB $colorI $colorB $colorB
+#client.unfocused $colorB $colorB $colorN $colorB $colorB
+#client.urgent $colorB $colorB $colorU $colorB $colorB
+#client.placeholder $colorB $colorB $color7 $colorB $colorB
+
+
+####### FOR POWERLINE / TRIANGLES / SYMBOLS ####### todo
+#client.focused $color0 $color0 $colorF $color0 $colorF
+#client.focused_inactive $color0 $color0 $colorI $color0 $color0
+#client.unfocused $color0 $color0 $colorI $color0 $color0
+#client.urgent $color0 $color0 $color7 $color0 $color0
+#client.placeholder $color0 $color0 $color7 $color0 $color0
+
+client.background #ffffff
+
+
+##################################### Keybinds ####################################
+
+# Gaps mode
+set $gaps_mode "» gaps"
+bindsym $mod+shift+g mode $gaps_mode
+mode $gaps_mode {
+
+ # arrow keys
+ bindsym Up gaps inner current plus 5
+ bindsym Down gaps inner current minus 5
+
+ bindsym Right gaps outer current plus 5
+ bindsym Left gaps outer current minus 5
+
+ # plus / minus
+ bindsym plus gaps inner current plus 5
+ bindsym minus gaps inner current minus 5
+ bindsym 0 gaps inner current set 0
+
+ bindsym shift+plus gaps outer current plus 5
+ bindsym shift+minus gaps outer current minus 5
+ bindsym shift+0 gaps outer current set 0
+
+ # Restore defaults
+ bindsym d gaps inner all set $inner_default
+ bindsym shift+d gaps outer all set $outer_default
+
+ # Exit gaps mode
+ bindsym g mode "default"
+ bindsym $mod+g mode "default"
+ bindsym $mod+shift+g mode "default"
+ bindsym Return mode "default"
+ bindsym Escape mode "default"
+}
+
+
+# System monitor
+bindsym $mod+Shift+h exec $term -e htop
+
+
+# Quick Launcher
+set $launcher_mode "» launcher"
+bindsym $mod+z mode $launcher_mode
+mode $launcher_mode {
+
+ bindsym w exec "notify-send 'Launching Firefox' --urgency low; firefox"
+ bindsym e exec "notify-send 'Launching Sublime Text' --urgency low; subl"
+ bindsym f exec "notify-send 'Launching Thunar' --urgency low; thunar"
+ bindsym l exec "notify-send 'Launching Lutris' --urgency low; lutris"
+ bindsym g exec "notify-send 'Launching GIMP' --urgency low; gimp"
+ bindsym s exec "notify-send 'Launching Steam' --urgency low; steam"
+ bindsym d exec "notify-send 'Launching Discord' --urgency low; discord"
+ bindsym c exec --no-startup-id compositor
+ bindsym x exec --no-startup-id flux
+
+ bindsym z mode "default"
+ bindsym $mod+z mode "default"
+ bindsym Return mode "default"
+ bindsym Escape mode "default"
+}
+
+# Music
+bindsym $mod+Shift+m exec $term -e ncmpcpp
+
+set $music_mode "» music"
+
+mode $music_mode {
+
+ bindsym Left exec --no-startup-id mpc prev
+ bindsym Right exec --no-startup-id mpc next
+
+ bindsym p exec --no-startup-id mpc toggle
+ bindsym n exec --no-startup-id mpc next
+ bindsym b exec --no-startup-id mpc prev
+
+ bindsym l exec --no-startup-id mpc next
+ bindsym h exec --no-startup-id mpc prev
+
+ bindsym m mode "default"
+ bindsym $mod+m mode "default"
+ bindsym Return mode "default"
+ bindsym Escape mode "default"
+}
+bindsym $mod+m mode $music_mode
+
+# File Manager
+bindsym $mod+Shift+f exec thunar
+
+# System Monitors (notification)
+bindsym $mod+n exec --no-startup-id ~/Scripts/monitor_notification.sh
+
+# Multimedia keys
+#increase sound volume
+#bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume 0 +5%
+bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-mute 0 0 && pactl set-sink-volume @DEFAULT_SINK@ +5%
+#decrease sound volume
+#bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume 0 -5%
+bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-mute 0 0 && pactl set-sink-volume @DEFAULT_SINK@ -5%
+# mute sound
+bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute 0 toggle
+
+# Rofi (Instead of dmenu) (Edit config for colors etc!)
+#bindsym $mod+d exec rofi -show run
+bindsym $mod+d exec ~/Scripts/fullrofi
+bindsym $mod+Tab exec ~/Scripts/fullrofi
+bindsym $mod+Shift+d exec --no-startup-id "rofi -show drun -run-command 'gksudo {cmd}'"
+
+# screenshots
+bindsym $mod+Print exec --no-startup-id thunar ~/Pictures/Screenshots
+bindsym Print exec --no-startup-id ~/Scripts/scrot_plus_notification.sh
+#bindsym $mod+Print exec scrot -e 'mv $f ~/Pictures/Screenshots'
+bindsym $mod+Shift+Print --release exec --no-startup-id ~/Scripts/scrot_plus_notification.sh -s
+#bindsym $mod+Shift+Print --release exec scrot -s -e 'mv $f ~/Pictures/Screenshots'
+
+##################################### autostart ####################################
+# urxvt daemon
+exec --no-startup-id urxvtd -q -o -f
+
+# Compton
+exec --no-startup-id compositor
+
+# Enable numlock
+exec --no-startup-id numlockx &
+
+# Keyboard lang
+exec --no-startup-id setxkbmap -layout "us,gr,ru" -option "grp:alt_shift_toggle"
+
+# Mpd
+exec --no-startup-id mpd ~/.config/mpd/mpd.conf
+
+# Bar
+exec_always --no-startup-id barstart
+
+# Run htop on $ws0 on startup
+#exec --no-startup-id i3-msg 'workspace $ws0; exec $term -e htop'
+
+# Lock the screen after booting
+# exec ~/mylock
+
+# Scratchpad
+#exec_always --no-startup-id $term -title=dropdown -e tmux
+#for_window [title="dropdown"] floating enable;
+#for_window [title="dropdown"] move scratchpad; [instance="dropdown"] scratchpad show; move scratchpad
+#bindsym $mod+u [title="dropdown"] scratchpad show
+
+# Fix a bug in gnome-settings-daemon: http://feeding.cloud.geek.nz/posts/creating-a-modern-tiling-desktop-environment-using-i3/
+#exec --no-startup-id dconf write /org/gnome/settings-daemon/plugins/cursor/active false
+
+# Needed to configure things
+#exec --no-startup-id cinnamon-settings-daemon &>/home/leni/cinnamon-debug
+#exec --no-startup-id nm-applet
diff --git a/config/i3/i3blocks.conf b/config/i3/i3blocks.conf
new file mode 100755
index 0000000..1988137
--- /dev/null
+++ b/config/i3/i3blocks.conf
@@ -0,0 +1,152 @@
+# i3blocks config file
+#
+# Please see man i3blocks for a complete reference!
+# The man page is also hosted at http://vivien.github.io/i3blocks
+#
+# List of valid properties:
+#
+# align
+# color
+# command
+# full_text
+# instance
+# interval
+# label
+# min_width
+# name
+# separator
+# separator_block_width
+# short_text
+# signal
+# urgent
+
+# Global properties
+# accent 444444
+# The top properties below are applied to every block, but can be overridden.
+# Each block command defaults to the script name to avoid boilerplate.
+command=/usr/share/i3blocks/$BLOCK_NAME
+separator_block_width=15
+markup=none
+
+# Volume indicator
+#
+# The first parameter sets the step (and units to display)
+# The second parameter overrides the mixer selection
+# See the script for details.
+[volume]
+#label=VOL
+label=♪
+instance=Master
+#instance=PCM
+interval=1
+signal=10
+command=/usr/share/i3blocks/volume 5 pulse
+
+# Memory usage
+#
+# The type defaults to "mem" if the instance is not specified.
+[memory]
+label=ram
+color=#444444
+separator=true
+interval=30
+
+# Disk usage
+#
+# The directory defaults to $HOME if the instance is not specified.
+# The script may be called with a optional argument to set the alert
+# (defaults to 10 for 10%).
+[disk]
+label=home
+#instance=/mnt/data
+interval=30
+
+# Network interface monitoring
+#
+# If the instance is not specified, use the interface used for default route.
+# The address can be forced to IPv4 or IPv6 with -4 or -6 switches.
+[iface]
+#instance=wlan0
+color=#444444
+interval=10
+#separator=false
+
+[wifi]
+#instance=wlp3s0
+interval=10
+#separator=false
+
+#[bandwidth]
+#instance=eth0
+interval=5
+
+# CPU usage
+#
+# The script may be called with -w and -c switches to specify thresholds,
+# see the script for details.
+[cpu_usage]
+label=CPU
+interval=10
+min_width=CPU: 100.00%
+#separator=false
+
+#[load_average]
+#interval=10
+
+# Battery indicator
+#
+# The battery instance defaults to 0.
+[battery]
+label=BAT
+label=⚡
+instance=0
+interval=5
+
+# Date Time
+#
+[time]
+#command=date '+%Y-%m-%d %H:%M:%S'
+command=date '+%Y-%m-%d %H:%M'
+color=#444444
+interval=10
+
+# Generic media player support
+#
+# This displays "ARTIST - SONG" if a music is playing.
+# Supported players are: spotify, vlc, audacious, xmms2, mplayer, and others.
+#[mediaplayer]
+#instance=spotify
+#interval=5
+#signal=10
+
+# OpenVPN support
+#
+# Support multiple VPN, with colors.
+#[openvpn]
+#interval=20
+
+# Temperature
+#
+# Support multiple chips, though lm-sensors.
+# The script may be called with -w and -c switches to specify thresholds,
+# see the script for details.
+[temperature]
+#label=TEMP
+label=
+interval=10
+
+# Key indicators
+#
+# Add the following bindings to i3 config file:
+#
+# bindsym --release Caps_Lock exec pkill -SIGRTMIN+11 i3blocks
+# bindsym --release Num_Lock exec pkill -SIGRTMIN+11 i3blocks
+#[keyindicator]
+#instance=CAPS
+#interval=once
+#signal=11
+
+#[keyindicator]
+#instance=NUM
+#interval=once
+#signal=11
diff --git a/config/nvim/.netrwhist b/config/nvim/.netrwhist
index 10a5ff2..a3c1153 100644
--- a/config/nvim/.netrwhist
+++ b/config/nvim/.netrwhist
@@ -1,3 +1,10 @@
let g:netrw_dirhistmax =10
-let g:netrw_dirhist_cnt =1
+let g:netrw_dirhist_cnt =8
let g:netrw_dirhist_1='/home/elena/Scripts'
+let g:netrw_dirhist_2='/home/elena/.config/ncmpcpp'
+let g:netrw_dirhist_3='/home/elena/.config/cava'
+let g:netrw_dirhist_4='/home/elena/.config/i3'
+let g:netrw_dirhist_5='/home/elena/.config/dunst'
+let g:netrw_dirhist_6='/home/elena/Scripts'
+let g:netrw_dirhist_7='/home/elena/.config/ncmpcpp'
+let g:netrw_dirhist_8='/home/elena/.config/nvim/plugged/vim-airline/autoload/airline'
diff --git a/config/nvim/colors/mynoctu.vim b/config/nvim/colors/mynoctu.vim
new file mode 120000
index 0000000..a0e9008
--- /dev/null
+++ b/config/nvim/colors/mynoctu.vim
@@ -0,0 +1 @@
+/home/elena/Themes/Vim/mynoctu.vim
\ No newline at end of file
diff --git a/config/nvim/colors/noctu.vim b/config/nvim/colors/noctu.vim
new file mode 100644
index 0000000..ea5d6b1
--- /dev/null
+++ b/config/nvim/colors/noctu.vim
@@ -0,0 +1,254 @@
+" noctu.vim - Vim color scheme for 16-color terminals
+" --------------------------------------------------------------
+" Author: Noah Frederick (http://noahfrederick.com/)
+" Version: 1.8.0
+" --------------------------------------------------------------
+
+" Scheme setup {{{
+set background=dark
+hi! clear
+
+if exists("syntax_on")
+ syntax reset
+endif
+
+let g:colors_name = "noctu"
+
+"}}}
+" Vim UI {{{
+hi Normal ctermfg=7
+hi Cursor ctermfg=7 ctermbg=1
+hi CursorLine ctermbg=0 cterm=NONE
+hi MatchParen ctermfg=7 ctermbg=NONE cterm=underline
+hi Pmenu ctermfg=15 ctermbg=0
+hi PmenuThumb ctermbg=7
+hi PmenuSBar ctermbg=8
+hi PmenuSel ctermfg=0 ctermbg=4
+hi ColorColumn ctermbg=0
+hi SpellBad ctermfg=1 ctermbg=NONE cterm=underline
+hi SpellCap ctermfg=10 ctermbg=NONE cterm=underline
+hi SpellRare ctermfg=11 ctermbg=NONE cterm=underline
+hi SpellLocal ctermfg=13 ctermbg=NONE cterm=underline
+hi NonText ctermfg=8
+hi LineNr ctermfg=8 ctermbg=NONE
+hi CursorLineNr ctermfg=11 ctermbg=0
+hi Visual ctermfg=0 ctermbg=12
+hi IncSearch ctermfg=0 ctermbg=13 cterm=NONE
+hi Search ctermfg=0 ctermbg=10
+hi StatusLine ctermfg=7 ctermbg=0 cterm=bold
+hi StatusLineNC ctermfg=8 ctermbg=0 cterm=bold
+hi VertSplit ctermfg=0 ctermbg=0 cterm=NONE
+hi TabLine ctermfg=8 ctermbg=0 cterm=NONE
+hi TabLineSel ctermfg=7 ctermbg=0
+hi Folded ctermfg=6 ctermbg=0 cterm=bold
+hi Conceal ctermfg=6 ctermbg=NONE
+hi Directory ctermfg=12
+hi Title ctermfg=3 cterm=bold
+hi ErrorMsg ctermfg=15 ctermbg=1
+hi DiffAdd ctermfg=0 ctermbg=2
+hi DiffChange ctermfg=0 ctermbg=3
+hi DiffDelete ctermfg=0 ctermbg=1
+hi DiffText ctermfg=0 ctermbg=11 cterm=bold
+hi User1 ctermfg=1 ctermbg=0
+hi User2 ctermfg=4 ctermbg=0
+hi User3 ctermfg=2 ctermbg=0
+hi User4 ctermfg=3 ctermbg=0
+hi User5 ctermfg=5 ctermbg=0
+hi User6 ctermfg=6 ctermbg=0
+hi User7 ctermfg=7 ctermbg=0
+hi User8 ctermfg=8 ctermbg=0
+hi User9 ctermfg=15 ctermbg=5
+hi! link CursorColumn CursorLine
+hi! link SignColumn LineNr
+hi! link WildMenu Visual
+hi! link FoldColumn SignColumn
+hi! link WarningMsg ErrorMsg
+hi! link MoreMsg Title
+hi! link Question MoreMsg
+hi! link ModeMsg MoreMsg
+hi! link TabLineFill StatusLineNC
+hi! link SpecialKey NonText
+
+"}}}
+" Generic syntax {{{
+hi Delimiter ctermfg=7
+hi Comment ctermfg=8
+hi Underlined ctermfg=4 cterm=underline
+hi Type ctermfg=4
+hi String ctermfg=11
+hi Keyword ctermfg=2
+hi Todo ctermfg=15 ctermbg=NONE cterm=bold,underline
+hi Function ctermfg=4
+hi Identifier ctermfg=7 cterm=NONE
+hi Statement ctermfg=2 cterm=bold
+hi Constant ctermfg=13
+hi Number ctermfg=12
+hi Boolean ctermfg=4
+hi Special ctermfg=13
+hi Ignore ctermfg=0
+hi PreProc ctermfg=8 cterm=bold
+hi! link Operator Delimiter
+hi! link Error ErrorMsg
+
+"}}}
+" HTML {{{
+hi htmlTagName ctermfg=2
+hi htmlTag ctermfg=2
+hi htmlArg ctermfg=10
+hi htmlH1 cterm=bold
+hi htmlBold cterm=bold
+hi htmlItalic cterm=underline
+hi htmlUnderline cterm=underline
+hi htmlBoldItalic cterm=bold,underline
+hi htmlBoldUnderline cterm=bold,underline
+hi htmlUnderlineItalic cterm=underline
+hi htmlBoldUnderlineItalic cterm=bold,underline
+hi! link htmlLink Underlined
+hi! link htmlEndTag htmlTag
+
+"}}}
+" XML {{{
+hi xmlTagName ctermfg=4
+hi xmlTag ctermfg=12
+hi! link xmlString xmlTagName
+hi! link xmlAttrib xmlTag
+hi! link xmlEndTag xmlTag
+hi! link xmlEqual xmlTag
+
+"}}}
+" JavaScript {{{
+hi! link javaScript Normal
+hi! link javaScriptBraces Delimiter
+
+"}}}
+" PHP {{{
+hi phpSpecialFunction ctermfg=5
+hi phpIdentifier ctermfg=11
+hi phpParent ctermfg=8
+hi! link phpVarSelector phpIdentifier
+hi! link phpHereDoc String
+hi! link phpDefine Statement
+
+"}}}
+" Markdown {{{
+hi! link markdownHeadingRule NonText
+hi! link markdownHeadingDelimiter markdownHeadingRule
+hi! link markdownLinkDelimiter Delimiter
+hi! link markdownURLDelimiter Delimiter
+hi! link markdownCodeDelimiter NonText
+hi! link markdownLinkTextDelimiter markdownLinkDelimiter
+hi! link markdownUrl markdownLinkText
+hi! link markdownAutomaticLink markdownLinkText
+hi! link markdownCodeBlock String
+hi markdownCode cterm=bold
+hi markdownBold cterm=bold
+hi markdownItalic cterm=underline
+
+"}}}
+" Ruby {{{
+hi! link rubyDefine Statement
+hi! link rubyLocalVariableOrMethod Identifier
+hi! link rubyConstant Constant
+hi! link rubyInstanceVariable Number
+hi! link rubyStringDelimiter rubyString
+
+"}}}
+" Git {{{
+hi gitCommitBranch ctermfg=3
+hi gitCommitSelectedType ctermfg=10
+hi gitCommitSelectedFile ctermfg=2
+hi gitCommitUnmergedType ctermfg=9
+hi gitCommitUnmergedFile ctermfg=1
+hi! link gitCommitFile Directory
+hi! link gitCommitUntrackedFile gitCommitUnmergedFile
+hi! link gitCommitDiscardedType gitCommitUnmergedType
+hi! link gitCommitDiscardedFile gitCommitUnmergedFile
+
+"}}}
+" Vim {{{
+hi! link vimSetSep Delimiter
+hi! link vimContinue Delimiter
+hi! link vimHiAttrib Constant
+
+"}}}
+" LESS {{{
+hi lessVariable ctermfg=11
+hi! link lessVariableValue Normal
+
+"}}}
+" NERDTree {{{
+hi! link NERDTreeHelp Comment
+hi! link NERDTreeExecFile String
+
+"}}}
+" Vimwiki {{{
+hi! link VimwikiHeaderChar markdownHeadingDelimiter
+hi! link VimwikiList markdownListMarker
+hi! link VimwikiCode markdownCode
+hi! link VimwikiCodeChar markdownCodeDelimiter
+
+"}}}
+" Help {{{
+hi! link helpExample String
+hi! link helpHeadline Title
+hi! link helpSectionDelim Comment
+hi! link helpHyperTextEntry Statement
+hi! link helpHyperTextJump Underlined
+hi! link helpURL Underlined
+
+"}}}
+" CtrlP {{{
+hi! link CtrlPMatch String
+hi! link CtrlPLinePre Comment
+
+"}}}
+" Mustache {{{
+hi mustacheSection ctermfg=14 cterm=bold
+hi mustacheMarker ctermfg=6
+hi mustacheVariable ctermfg=14
+hi mustacheVariableUnescape ctermfg=9
+hi mustachePartial ctermfg=13
+
+"}}}
+" Shell {{{
+hi shDerefSimple ctermfg=11
+hi! link shDerefVar shDerefSimple
+
+"}}}
+" Syntastic {{{
+hi SyntasticWarningSign ctermfg=3 ctermbg=NONE
+hi SyntasticErrorSign ctermfg=1 ctermbg=NONE
+hi SyntasticStyleWarningSign ctermfg=2 ctermbg=NONE
+hi SyntasticStyleErrorSign ctermfg=4 ctermbg=NONE
+
+"}}}
+" Netrw {{{
+hi netrwExe ctermfg=9
+hi netrwClassify ctermfg=8 cterm=bold
+
+"}}}
+" Ledger {{{
+hi ledgerAccount ctermfg=11
+hi! link ledgerMetadata Comment
+hi! link ledgerTransactionStatus Statement
+
+"}}}
+" Diff {{{
+hi diffAdded ctermfg=2
+hi diffRemoved ctermfg=1
+hi! link diffFile PreProc
+hi! link diffLine Title
+
+"}}}
+" Plug {{{
+hi plugSha ctermfg=3
+
+"}}}
+" Blade {{{
+hi! link bladeStructure PreProc
+hi! link bladeParen phpParent
+hi! link bladeEchoDelim PreProc
+
+"}}}
+
+" vim: fdm=marker:sw=2:sts=2:et
diff --git a/config/nvim/init.vim b/config/nvim/init.vim
index c0b0e0a..81a577b 100644
--- a/config/nvim/init.vim
+++ b/config/nvim/init.vim
@@ -1,15 +1,53 @@
+"Show line numbers
set number
+
+" Only works in vim
set t_Co=256
-colorscheme DarkDefault
+"Case insensitive searching
+set ignorecase
+"Will automatically switch to case sensitive if you use any capitals
+set smartcase
+
+" noctu only uses the 16 terminal colors ^_^
+colorscheme noctu
+"colorscheme mynoctu
+
+"colorscheme DarkDefault
+"colorscheme 3dglasses
+"colorscheme LightDefault
+"colorscheme base16-ateliercave
+
+
+" ~~~ Plugins ~~~
call plug#begin('$HOME/.config/nvim/plugged')
+" Updating every startup costs time, there's no need for that.
"Plug 'shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' }
Plug 'shougo/deoplete.nvim'
Plug 'tpope/vim-sensible'
+Plug 'vim-airline/vim-airline'
+Plug 'scrooloose/nerdcommenter'
+"Plug 'ryanoasis/vim-devicons'
call plug#end()
+" ~~~ Plugin Configuration ~~~
+" vim-airline
+"let g:airline_powerline_fonts = 1
+"let g:airline_detect_whitespace=0
+let g:airline#extensions#whitespace#enabled = 0
+
+" deoplete
let g:deoplete#enable_at_startup = 1
inoremap pumvisible() ? "\" : "\"
nnoremap :noh
+" NerdCommenter
+" Change bind from default \
+let mapleader=","
+set notimeout
+
+" vim-devicons
+let g:webdevicons_enable = 1
+set encoding=utf8
+set guifont=FuraCode\ Nerd\ Font\ 9
diff --git a/config/nvim/plugged/deoplete.nvim b/config/nvim/plugged/deoplete.nvim
index 8d97424..a338ca8 160000
--- a/config/nvim/plugged/deoplete.nvim
+++ b/config/nvim/plugged/deoplete.nvim
@@ -1 +1 @@
-Subproject commit 8d97424a22715ad350799904501185253e582025
+Subproject commit a338ca8bbee086cc7b9265ae181f22de86d38491
diff --git a/config/nvim/plugged/nerdcommenter b/config/nvim/plugged/nerdcommenter
new file mode 160000
index 0000000..2f973bd
--- /dev/null
+++ b/config/nvim/plugged/nerdcommenter
@@ -0,0 +1 @@
+Subproject commit 2f973bd4fa009fe852b1c1c6f025bf38742a8b1c
diff --git a/config/nvim/plugged/vim-airline b/config/nvim/plugged/vim-airline
new file mode 160000
index 0000000..c2ffb8b
--- /dev/null
+++ b/config/nvim/plugged/vim-airline
@@ -0,0 +1 @@
+Subproject commit c2ffb8b3ec114301795036f7bf22995746d2acaf
diff --git a/config/nvim/plugged/vim-sensible b/config/nvim/plugged/vim-sensible
index 49ee364..2d60332 160000
--- a/config/nvim/plugged/vim-sensible
+++ b/config/nvim/plugged/vim-sensible
@@ -1 +1 @@
-Subproject commit 49ee364222dc2a5a00dddf89fd61880e3e39d46a
+Subproject commit 2d60332fa5b2b1ea346864245569df426052865a
diff --git a/config/polybar/bottom-bar b/config/polybar/bottom-bar
deleted file mode 100644
index 7beb4e5..0000000
--- a/config/polybar/bottom-bar
+++ /dev/null
@@ -1,17 +0,0 @@
-bottom = true
-height = 25
-width = 100%
-offset-x = 0
-offset-y = 0
-background = ${colors.background}
-foreground = ${colors.foreground}
-wm-restack = i3
-override-redirect = true
-fixed-center = true
-font-0 = NotoSans-Regular:size=6;2
-font-1 = unifont:fontformat=truetype:size=8:antialias=false;0
-font-2 = "Material Icons:antialias=false:size=9;5"
-padding-left = 30%
-padding-right = 50%
-module-margin-left = 2
-module-margin-right = 2
diff --git a/config/polybar/config b/config/polybar/config
index 2778fa0..b08d4c2 100644
--- a/config/polybar/config
+++ b/config/polybar/config
@@ -1,334 +1,861 @@
+;=====================================================
+
[colors]
-background = #364A45
-background-alt = ${xrdb:color0}
-foreground = #F9F9F6
-foreground-alt = ${xrdb:color7}
-primary = ${xrdb:color6}
-secondary = ${xrdb:color13}
-alert = ${xrdb:color9}
+background = ${xrdb:color0:#222}
+;background-alt = #DDD
+background-alt = #444
-[bar/top]
-dpi = 133
-;monitor = ${env:MONITOR:HDMI-1}
-include-file = ~/.config/polybar/top-bar
-modules-left = hostname tor ip mpd volume
-modules-center = i3
-modules-right = mail memory cpu temperature battery wlan eth date lock
+foreground = ${xrdb:color7}
+foreground-alt = ${xrdb:color8}
-[bar/bottom]
-dpi = 133
-monitor = "eDP-1"
-include-file = ~/.config/polybar/bottom-bar
-modules-left = torDaemon dnsDaemon firewallDaemon
-modules-center = webbrowser wallpapers tchat wireshark
-modules-right = uptime last
+; for light theme
+;foreground-alt = #DDD
+;for dark theme
+;foreground-alt = #222
-[module/lock]
-type = custom/text
-content = " "
-content-foreground = ${colors.alert}
-click-left = i3lock -i ~/images/i3lock-gentoo-1366.png -e
+primary = #ffb52a
+alert = #bd2c40
-[module/uptime]
+color0 = ${xrdb:color0}
+color1 = ${xrdb:color1}
+color2 = ${xrdb:color2}
+color3 = ${xrdb:color3}
+color4 = ${xrdb:color4}
+color5 = ${xrdb:color5}
+color6 = ${xrdb:color6}
+color7 = ${xrdb:color7}
+color8 = ${xrdb:color8}
+color9 = ${xrdb:color9}
+color10 = ${xrdb:color10}
+color11 = ${xrdb:color11}
+color12 = ${xrdb:color12}
+color13 = ${xrdb:color13}
+color14 = ${xrdb:color14}
+color15 = ${xrdb:color15}
+
+boxbg = ${xrdb:color0}
+boxfg = ${xrdb:color7}
+boxaccent = ${xrdb:color5}
+
+focused = ${xrdb:color4}
+unfocused = ${xrdb:color8}
+urgent = ${xrdb:color1}
+
+accent = ${xrdb:color1}
+accentmusic = ${xrdb:color7}
+
+;=================================================
+; General bar settings
+; (to be used on both bars)
+[barsettings]
+height = 25
+border_width = 0
+
+
+;border_color = ${colors.color8}
+; transparent
+border_color = #00000000
+
+;;;;;;;;;;;;;;;;;; polybar
+[bar/bar]
+;monitor = ${env:MONITOR:HDMI-1}
+width = 100%
+;width = 1000
+height = ${barsettings.height}
+;offset-x = 10%
+;offset-y = 20
+;override-redirect = true
+;wm-restack = i3
+radius = 0.0
+fixed-center = true
+tray-detached = false
+tray-background = ${colors.color0}
+;disable tray position to hide tray.
+;currently tray is on bottom bar
+tray-position =
+;tray-position = right
+tray-padding = 2
+; set maxsize to 0 to disable tray
+; maxsize is icon size
+tray-maxsize = 16;
+;tray-transparent = true
+
+background = ${colors.color0}
+foreground = ${colors.color7}
+
+line-size = 2
+line-color = ${colors.color5}
+
+;border-size = 0
+;top bar borders
+border-bottom-size = ${barsettings.border_width}
+;border-top-size = ${barsettings.border_width}
+;border-left-size = ${barsettings.border_width}
+;border-right-size = ${barsettings.border_width}
+border-color = ${barsettings.border_color}
+
+spacing = 0
+
+padding-left = 0
+padding-right = 0
+
+module-margin = 0
+
+module-margin-left = 0
+module-margin-right = 0
+
+font-0 = FuraCode Nerd Font:pixelsize=9:bold;2
+;font-0 = terminus:pixelsize=15;1
+;font-0 = tewi:pixelsize=10;1
+;font-0 = terminus:pixelsize=10;1
+;font-0 = pxplus ibm vga8:size=12:antialias=false;2
+font-1 = tewi:fontformat=truetype:size=9:antialias=false;1
+font-2 = siji:pixelsize=12;2
+font-3 = Iosevka Nerd Font:pixelsize=13;3
+font-4 = Weather Icons:size=12;1
+;;;;;;;;;;;;;;;;;;;;; MODULES TOP;;;;;;;;;;;;;;;;;;;;;;
+
+; minimal blocks
+modules-left = pad xwindow
+modules-center= i3
+modules-right = xkeyboard pad divider pad accuweather pad divider pad date
+
+; ~~~~ minimal with triangles ~~~~
+;modules-left = rtriangle_inv mympd pad_alt rtriangle pad pad volume
+;modules-center= rtriangle_inv i3 rtriangle pad pad
+;modules-right = xkeyboard pad pad battery pad rtriangle_inv date rtriangle pad
+
+
+
+; ~~~ full with triangles ~~~
+;modules-left = rtriangle_inv i3 rtriangle pad pad xwindow
+;modules-center= wave rtriangle_inv mympd pad_alt rtriangle pad pad wave
+;modules-right = xkeyboard pad pad volume pad pad battery pad rtriangle_inv date rtriangle pad
+;modules-right = xkeyboard pad pad volume pad pad cpu pad pad battery pad pad temperature pad rtriangle_inv date rtriangle pad
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+scroll-up = i3wm-wsnext
+scroll-down = i3wm-wsprev
+click-right = ~/Scripts/fullrofi
+;scroll-up = i3-msg workspace next_on_output
+;scroll-down = i3-msg workspace prev_on_output
+
+
+# Enable cursor changing when hovering over clickable / scrollable modules
+;cursor-click = pointer
+;cursor-scroll = ns-resize
+
+
+;;;;;;;;;;;;;;;;;;;;;; bottom bar ;;;;;;;;;;;;;;;;;;;;;;;;
+
+[bar/bot]
+;monitor = ${env:MONITOR:HDMI-1}
+width = 100%
+;width = 1000
+height = ${barsettings.height}
+;offset-x = 10%
+;offset-y = 20
+;override-redirect = true
+;wm-restack = i3
+radius = 0.0
+fixed-center = true
+tray-detached = false
+tray-background = ${colors.color0}
+tray-position = center
+tray-padding = 2
+; set maxsize to 0 to disable tray
+; maxsize is icon size
+tray-maxsize = 16;
+;tray-transparent = true
+
+background = ${colors.color0}
+foreground = ${colors.color7}
+
+line-size = 2
+line-color = ${colors.color5}
+
+;border-size = 0
+; bottom bar borders
+;border-bottom-size = ${barsettings.border_width}
+border-top-size = ${barsettings.border_width}
+;border-left-size = ${barsettings.border_width}
+;border-right-size = ${barsettings.border_width}
+border-color = ${barsettings.border_color}
+
+spacing = 0
+
+padding-left = 0
+padding-right = 0
+
+module-margin = 0
+
+module-margin-left = 0
+module-margin-right = 0
+
+font-0 = FuraCode Nerd Font:pixelsize=9:bold;3
+;font-0 = terminus:pixelsize=15;1
+;font-0 = tewi:pixelsize=10;2
+;font-0 = terminus:pixelsize=10;2
+;font-0 = pxplus ibm vga8:size=12:antialias=false;2
+font-1 = tewi:fontformat=truetype:size=9:antialias=false;1
+font-2 = siji:pixelsize=12;2
+font-3 = Iosevka Nerd Font:pixelsize=13;3
+font-4 = Weather Icons:size=12;1
+;;;;;;;;;;;;;;;;;;;;; MODULES BOTTOM ;;;;;;;;;;;;;;;;;;;;;;
+
+bottom = true
+
+; minimal blocks
+modules-left = pad volume pad divider pad mympd
+modules-center=
+modules-right = cpu pad divider pad memory pad divider pad temperature pad divider pad battery pad
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+scroll-up = i3wm-wsnext
+scroll-down = i3wm-wsprev
+click-right = ~/Scripts/fullrofi &
+;scroll-up = i3-msg workspace next_on_output
+;scroll-down = i3-msg workspace prev_on_output
+
+
+# Enable cursor changing when hovering over clickable / scrollable modules
+;cursor-click = pointer
+;cursor-scroll = ns-resize
+
+;;;;;;;;;;;;;;;;;;;;;;;;;; CUSTOM MODULES ;;;;;;;;;;;;;;;;;;;
+
+[module/accuweather]
type = custom/script
-exec = uptime|awk '{print $2 " " $3 " " $4 " " $5 " " $6}'|cut -d ',' -f -2
-interval = 5
-format-prefix=" "
-format-prefix-foreground = ${colors.primary}
-format-foreground = ${colors.secondary}
+exec = ~/Scripts/accuweather.sh
+interval = 1200
+format-foreground = ${colors.color7}
+format-background = ${colors.color0}
+; fontawesome
+format-prefix = " "
+;format-prefix = "home » "
+;format-prefix = "HOME » "
-[module/last]
+;siji ???
+;format-prefix = " "
+;siji waterdrop
+;format-prefix = " "
+format-prefix-foreground = ${colors.accent}
+click-left = urxvt -e ~/Scripts/weather_details.sh &
+click-right= urxvt -e ~/Scripts/weather_forecast.sh &
+
+[module/mympd]
type = custom/script
-exec = last -s yesterday |head -n1 | awk '{print $1 " " $2 " " $6 " " $7 " " $8 " " $9}'
-interval = 5
-format-prefix = " "
-format-prefix-foreground = ${colors.primary}
-format-foreground = ${colors.secondary}
+exec = ~/Scripts/mpd-query-song.sh
+format-foreground = ${colors.boxfg}
+format-background = ${colors.boxbg}
+;siji
+;format-prefix = " "
-[module/wallpapers]
-type = custom/text
-content = " "
-content-foreground = ${colors.secondary}
-click-left = feh --draw-tinted -x -g 640x480 -B black -D 2.0 ~/images
+;fontawesome
+format-prefix = " "
-[module/webbrowser]
-type = custom/text
-content = " "
-content-foreground = ${colors.primary}
-click-left = vivaldi --proxy-server='phaeton:39901' --host-resolver-rules='MAP * 0.0.0.0 , EXCLUDE localhost' -incognito
+;format-prefix = "MPD » "
+;format-prefix = "music » "
+;format-prefix = "mpd » "
+format-prefix-foreground = ${colors.accent}
+label = %output:0:30:...%
-[module/tchat]
-type = custom/text
-content = " "
-content-foreground = ${colors.primary}
-click-left = termite -e weechat &
+; Will the script output continous content?
+; Default: false
+tail = true
+click-left = mpc toggle
+click-right = pavucontrol &
+click-middle = music &
+scroll-up = mpc prev
+scroll-down = mpc next
-[module/wireshark]
-type = custom/text
-content = " "
-content-foreground = ${colors.secondary}
-click-left = wireshark-gtk &
-
-[module/torDaemon]
+[module/openweathermap_simple]
type = custom/script
-exec = ~/.config/polybar/status tor
-interval = 4
-format =