diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index 657b4d2..33920ee 100755
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -95,7 +95,7 @@ noremap <Leader>v :<C-u>vsplit<CR>
 
 "Plugins
 filetype off
-set rtp+=~/.vim/bundle/Vundle.vim
+set rtp+=~/.config/nvim/bundle/Vundle.vim
 call vundle#begin()
 
 Plugin 'VundleVim/Vundle.vim'
@@ -133,7 +133,7 @@ Plugin 'mattn/emmet-vim'
 
 "syntax, colorscheme, etc. (visuals)
 Plugin 'itchyny/lightline.vim'
-Plugin 'taohex/lightline-buffer'
+Plugin 'mgee/lightline-bufferline'
 Plugin 'ryanoasis/vim-devicons'
 Plugin 'PotatoesMaster/i3-vim-syntax'
 Plugin 'vim-scripts/octave.vim--'
@@ -203,14 +203,14 @@ let g:startify_custom_header = [
 "LIGHTLINE
 let g:lightline = {
             \ 'tabline': {
-            \ 'left': [ [ 'bufferinfo' ], [ 'bufferbefore', 'buffercurrent', 'bufferafter' ], ],
-            \ 'right': [ [ 'close' ], ],
+            \ 'left': [[ 'buffers' ]],
+            \ 'right': [[ 'close' ]],
             \ },
             \ 'component_expand': {
-            \ 'buffercurrent': 'lightline#buffer#buffercurrent2',
+            \ 'buffers': 'lightline#bufferline#buffers',
             \ },
             \ 'component_type': {
-            \ 'buffercurrent': 'tabsel',
+            \ 'buffers': 'tabsel',
             \ },
             \ 'mode_map': { 'c': 'NORMAL' },
             \ 'active': {
diff --git a/.i3/config b/.i3/config
index 33fd618..6edfcb3 100644
--- a/.i3/config
+++ b/.i3/config
@@ -1,4 +1,5 @@
 # T's desktop v3
+#exec --no-stratup-id xrandr --output eDP1 --primary --auto
 exec --no-startup-id xrandr --output HDMI-0 --auto --mode 1920x1080 --primary --dpi 96/HDMI-0
 exec --no-startup-id mplayer -fs ~/.i3/boot.mp4
 exec --no-startup-id xautolock -time 10 -locker ~/.i3/scripts/locker.sh
@@ -18,7 +19,7 @@ exec --no-startup-id xmodmap ~/.config/i3/custom.map
 # US brackets on slovene special characters
 #exec xmodmap ~/.i3/custom.map
 
-font pango: FontAwesome, xos4 Terminess Powerline 10
+font pango: FontAwesome, xos4 Terminess Powerline 12
 
 
 #--APPEARANCE--#
diff --git a/install.sh b/install.sh
index 2ea26a2..c7cd811 100755
--- a/install.sh
+++ b/install.sh
@@ -16,8 +16,10 @@ symlink_dotfiles() {
     for file in .config/*; do
         ln -s "${SCRIPT_DIR}/${file}" "${HOME}/${file}"
     done
+    ln -s "${SCRIPT_DIR}/zsh-themes" "${HOME}/.oh-my-zsh/custom/themes"
 
 }
+git submodule update
 for var in "$@"
 do
     if [ $var == "-u" ] ; then
diff --git a/zsh-themes/T-i3.zsh-theme b/zsh-themes/T-i3.zsh-theme
new file mode 100755
index 0000000..85402ed
--- /dev/null
+++ b/zsh-themes/T-i3.zsh-theme
@@ -0,0 +1,2 @@
+PROMPT='%F{blue}%n%f@%m %F{green}%~%f %# '
+RPROMPT='%t'
diff --git a/zsh-themes/T-netbook.zsh-theme b/zsh-themes/T-netbook.zsh-theme
new file mode 100755
index 0000000..a0d9364
--- /dev/null
+++ b/zsh-themes/T-netbook.zsh-theme
@@ -0,0 +1,2 @@
+PROMPT='%F{green}%n%f@%m %F{green}%~%f %# '
+RPROMPT='%t'
diff --git a/zsh-themes/TServer.zsh-theme b/zsh-themes/TServer.zsh-theme
new file mode 100755
index 0000000..5ea414e
--- /dev/null
+++ b/zsh-themes/TServer.zsh-theme
@@ -0,0 +1,2 @@
+PROMPT='%F{red}%n%f@%m %F{green}%~%f %# '
+RPROMPT='%t'