diff --git a/.emacs.d/emacs-custom.el b/.emacs.d/emacs-custom.el
index b89167d..8d9f742 100644
--- a/.emacs.d/emacs-custom.el
+++ b/.emacs.d/emacs-custom.el
@@ -5,7 +5,9 @@
  ;; If there is more than one, they won't work right.
  '(custom-safe-themes
    '("2dff5f0b44a9e6c8644b2159414af72261e38686072e063aa66ee98a2faecf0e" default))
- '(markdown-command "/usr/bin/pandoc"))
+ '(markdown-command "/usr/bin/pandoc")
+ '(package-selected-packages
+   '(company-jedi yaml-mode use-package treemacs-projectile treemacs-persp treemacs-magit treemacs-icons-dired treemacs-evil switch-window smex robe ox-reveal multiple-cursors move-text lsp-java jedi-core htmlize helm flymake-yaml flymake-shellcheck flymake-shell flymake-ruby flycheck-haskell flycheck-bashate dracula-theme dockerfile-mode dired-sidebar company-tabnine company-c-headers company-ansible auto-complete-clang apache-mode ansible-doc ansible)))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.
diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 7cd6534..cd9976f 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -425,6 +425,17 @@
   :ensure t
   :config (treemacs-set-scope-type 'Perspectives))
 
+;; Python
+(use-package company-jedi
+    :ensure t
+    :config
+)
+
+(defun my/python-mode-hook ()
+  (add-to-list 'company-backends 'company-jedi))
+
+(add-hook 'python-mode-hook 'my/python-mode-hook)
+
 ;;; --- Look & Feel ---
 
 ;; Helm
diff --git a/.emacs.d/smex-items b/.emacs.d/smex-items
index 9ceb053..a00fef1 100644
--- a/.emacs.d/smex-items
+++ b/.emacs.d/smex-items
@@ -1,13 +1,13 @@
 
 ;; ----- smex-history -----
 (
- goto-line
- overwrite-mode
- shell
+ table-insert
+ table-insert-row
  load-theme
+ disable-theme
+ shell
+ package-refresh-contents
  treemacs
- inf-ruby-console-auto
- compile
 )
 
 ;; ----- smex-data -----
@@ -31,12 +31,17 @@
  (ruby-indent-line . 1)
  (ruby-mode-menu . 1)
  (inf-ruby-console-auto . 8)
- (shell . 4)
+ (shell . 6)
  (package-install-selected-packages . 1)
  (package-install . 1)
  (compile . 2)
  (lsp-mode . 2)
- (load-theme . 14)
+ (load-theme . 15)
  (overwrite-mode . 1)
  (goto-line . 2)
+ (package-refresh-contents . 1)
+ (epc:pop-to-last-server-process-buffer . 3)
+ (disable-theme . 1)
+ (table-insert . 3)
+ (table-insert-row . 1)
 )
diff --git a/.local/bin/backupSynology b/.local/bin/backupSynology
index 7014b6c..0a5bf1b 100755
--- a/.local/bin/backupSynology
+++ b/.local/bin/backupSynology
@@ -2,7 +2,6 @@
 source ~/.password
 mkdir -p ~/Movies/{Anime,Videos}
 mkdir -p ~/Music
-mkdir -p ~/Collage
 
 #sudo mount -t cifs //192.168.0.220/Mega -o username=${USERNAME},password=${PASSWORD},vers=2\.0 /mnt/Synology
 #sudo mount -t cifs //192.168.0.220/music -o username=${USERNAME},password=${PASSWORD},vers=2\.0 ~/Music
diff --git a/.vimrc b/.vimrc
index e505d94..9c848e6 100644
--- a/.vimrc
+++ b/.vimrc
@@ -86,6 +86,18 @@ set bg=dark
 hi CursorLine cterm=NONE term=NONE ctermbg=NONE guibg=NONE
 hi CursorLine ctermbg=235
 
+" columne
+augroup collumnLimit
+  autocmd!
+  autocmd BufEnter,WinEnter,FileType *
+        \ highlight CollumnLimit ctermbg=DarkGrey guibg=DarkGrey
+  let collumnLimit = 79 " feel free to customize
+  let pattern =
+        \ '\%<' . (collumnLimit+1) . 'v.\%>' . collumnLimit . 'v'
+  autocmd BufEnter,WinEnter,FileType *
+        \ let w:m1=matchadd('CollumnLimit', pattern, -1)
+augroup END
+
 " map
 nnoremap S :%s//g<Left><Left>
 nnoremap ee :!mupdf $(echo % \| sed 's/tex$/pdf/') & disown<CR><CR>
@@ -105,6 +117,7 @@ autocmd BufWritePost *.tex silent! execute "!sudo rm -rf *.fls *.ilg *.nav *.snm
 autocmd BufWritePost *.tex silent! execute "!sudo pkill -HUP mupdf > /dev/null" | redraw!
 
 " mutt
+highlight ColorColumn ctermbg=gray
 autocmd BufRead,BufNewFile /tmp/neomutt* let g:goyo_width=80
 autocmd BufRead,BufNewFile /tmp/neomutt* :Goyo
 autocmd BufRead,BufNewFile /tmp/neomutt* map ZZ :Goyo\|x!<CR>
diff --git a/.xinitrc b/.xinitrc
index c66c26e..2a2f58d 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -10,8 +10,8 @@ xrandr --auto
 xset b off&
 
 # Lock screen
-xset s 600&
-xautolock -time 15 -locker slock&
+xset s 3600&
+xautolock -time 60 -locker slock&
 
 # Programs
 dwmblocks&
@@ -19,7 +19,7 @@ nm-applet --sm-disable&
 dunst -config&
 browser-x&
 QT_SCALE_FACTOR=1.5 keepassxc &
-/usr/local/bin/st -e /bin/sh -c "tmux new-session -s BASE -n HOME '/bin/zsh'\; split-window -h 'cpumhz'\; split-window 'htop'\; new-window -n MAIL 'neomutt'\; new-window -n NEWSBOAT 'newsboat -r '\; new-window -n MUSIC 'cmus'"&
+/usr/local/bin/st -e /bin/sh -c "tmux new-session -s BASE -n HOME '/bin/zsh'\; split-window -h 'cpumhz'\; split-window 'htop'\; new-window -n MAIL 'neomutt'\; new-window -n MUSIC 'cmus'"&
 sudo /usr/bin/rdate -s ntp.task.gda.pl && sudo /sbin/hwclock --systohc
 megasync &
 ibus-daemon&
diff --git a/.zshrc b/.zshrc
index 801f084..1d0db2a 100644
--- a/.zshrc
+++ b/.zshrc
@@ -1,3 +1,8 @@
+
+# ZSHRC
+
+CONFIG=$HOME/.config
+
 parse_git_branch() {
     command=$(git symbolic-ref --short HEAD 2> /dev/null)
     [ -z $command ] && echo -e "$ " || echo -e "$(git symbolic-ref --short HEAD 2> /dev/null) $ "
@@ -17,24 +22,20 @@ SAVEHIST=10000000
 autoload -U colors && colors
 setopt PROMPT_SUBST
 PS1='%(!.%{$fg_bold[red]%}.%{$fg_bold[green]%}%n@)%m %{$fg_bold[blue]%}%(!.%1~.%~) $(parse_git_branch)%{$reset_color%}'
-#PS1='%B%{$fg[red]%}[%{$fg[yellow]%}%n%{$fg[green]%}@%{$fg[blue]%}%m %{$fg[magenta]%}%~%{$fg[red]%} $(parse_git_branch)]%{$reset_color%}$%b '
 plugins=(rake ruby vagrant knife knife_ssh kitchen )
 
 ZSH_DISABLE_COMPFIX=true
 source $ZSH/oh-my-zsh.sh
-source $HOME/.password
-source $HOME/Linux/configs/zsh-autosuggestions/zsh-autosuggestions.plugin.zsh &>> /dev/null
-source $HOME/Linux/configs/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh &>> /dev/null
-source $HOME/.plannaplan &>> /dev/null
-[ ! -d $HOME/.config/fzf ] && git clone https://github.com/junegunn/fzf.git $HOME/.config/fzf
-[ -f $HOME/.config/fzf/shell/key-bindings.zsh ] && source $HOME/.config/fzf/shell/key-bindings.zsh
+
+[ ! -d $CONFIG/zsh ] && { mkdir -p $CONFIG/zsh ; cd $CONFIG/zsh ; git clone https://github.com/zsh-users/zsh-syntax-highlighting.git ; git clone https://github.com/zsh-users/zsh-autosuggestions.git }
+[ -d $CONFIG/zsh ] && source $CONFIG/zsh/zsh-autosuggestions/zsh-autosuggestions.plugin.zsh &>> /dev/null
+[ -d $CONFIG/zsh ] && source $CONFIG/zsh/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh &>> /dev/null
+[ ! -f $HOME/.password ] && source $HOME/.password
+[ ! -d $CONFIG/fzf ] && git clone https://github.com/junegunn/fzf.git $HOME/.config/fzf
+[ -f $CONFIG/fzf/shell/key-bindings.zsh ] && source $HOME/.config/fzf/shell/key-bindings.zsh
 [ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
 FPATH=/usr/local/share/zsh/site-functions:$FPATH
 
-#xset b off &>> /dev/null
-#set bell-style none &>> /dev/null
-#setxkbmap pl &>> /dev/null
-
 export GPG_TTY=$(tty)
 export TERM=xterm-256color
 export SHELL=/bin/bash
@@ -51,8 +52,8 @@ export FZF_DEFAULT_OPTS='--height 40% --layout=reverse'
 export EIX_LIMIT_COMPACT=0
 export TERMINAL="st"
 export QT_SCALE_FACTOR=1.5
-export VISUAL='vim'
-export EDITOR='vim'
+export VISUAL='emacs'
+export EDITOR='emacs -nw'
 alias svm="sudo vim /etc/portage/make.conf"
 alias svr="sudo vim /etc/portage/repos.conf"
 alias svp="sudo vim /etc/portage/package.use"
@@ -98,6 +99,7 @@ alias vim="vim -p"
 alias denpl="trans en:pl"
 alias dplen="trans pl:en"
 alias notes="vim $HOME/git/notes/index.md"
+alias mgr="cd $HOME/Documents/Collage/Magisterka-Marcin/Semestr1/"
 alias mpv="__NV_PRIME_RENDER_OFFLOAD_PROVIDER=NVIDIA-G0 __GLX_VENDOR_LIBRARY_NAME=nvidia __GL_SYNC_TO_VBLANK=0 mpv --vo=x11 --hwdec=no --ytdl-raw-options="yes-playlist=" --ytdl-format='bestvideo[ext=mp4][height<=?1080]+bestaudio[ext=m4a]' --no-resume-playback"
 alias aria2c="aria2c --seed-time=0 --disable-ipv6 --max-upload-limit=1k"