diff --git a/.config/i3/config b/.config/i3/config
index 055e3bc..1a7a610 100644
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -242,7 +242,8 @@ exec --no-startup-id compton --unredir-if-possible -b
 exec --no-startup-id redshift-gtk &
 
 # Background
-set $set_bg feh --bg-fill ~/Slike/Wallpapers/1596344206877.jpg
+#set $set_bg feh --bg-fill "~/riz0m/Photos/sri lanka/IMG_20220220_120730.jpg"
+set $set_bg feh --bg-fill "$HOME/Slike/☭/bigstock-Sutjeska-National-Park-Bosnia-63011269.jpg" fill
 exec_always --no-startup-id $set_bg &
 
 # Network manager applet
@@ -255,9 +256,9 @@ exec_always --no-startup-id "setxkbmap -layout us,si -option grp:win_space_toggl
 exec_always setxkbmap -option "grp:win_space_toggle"
 
 # gaps between windows
-gaps inner 7
-gaps outer 0
-smart_gaps on
+#gaps inner 7
+#gaps outer 0
+#smart_gaps on
 
 # No titles
 for_window [class="^.*"] border pixel 2
@@ -316,17 +317,11 @@ bindsym 0xff61 exec gnome-screenshot -i
 # Keyring related
 #exec --no-startup-id /usr/share/gnome-settings-daemon
 
-# Pulseaudio zagon
-#exec --no-startup-id /usr/bin/pulseaudio -D
-
-# JACK audio baby
-#exec qjackctl
-
 # Polybar
-exec_always --no-startup-id ~/.config/polybar/launch.sh
+#exec_always --no-startup-id ~/.config/polybar/launch.sh
 
-# Signal chat ane
-#exec /usr/bin/signal-desktop
+# Autotiling https://github.com/nwg-piotr/autotiling
+exec ~/.local/bin/autotiling
 
-# autotajling
-#exec --no-startup-id autotiling
+# Rdecenje skrina
+exec gammastep -l 46.05108:14.50513
diff --git a/.config/kitty/kitty.conf b/.config/kitty/kitty.conf
index 073d3b7..4eb6282 100644
--- a/.config/kitty/kitty.conf
+++ b/.config/kitty/kitty.conf
@@ -9,7 +9,7 @@ background_opacity 0.9
 #include solarized.conf
 include gruvbox.conf
 
-window_padding_width 2
+window_padding_width 1
 
 touch_scroll_multiplier 10.0
 strip_trailing_spaces smart
diff --git a/.config/rofi/config.rasi b/.config/rofi/config.rasi
new file mode 100644
index 0000000..245ef4f
--- /dev/null
+++ b/.config/rofi/config.rasi
@@ -0,0 +1,14 @@
+configuration {
+combi-modi: "window,drun,run";
+terminal: "kitty";
+show-icons: true;
+sidebar-mode: true;
+color-normal: "#00383c4a, #c4cbd4, #96404552, #4084d6, #f9f9f9";
+color-urgent: "#002d303b, #cc6666, #e52d303b, #a54242, #f9f9f9";
+color-active: "#002d303b, #b5bd68, #e42d303b, #8c9440, #f9f9f9";
+color-window: "#f22d303b, #7c8389, #1d1f21";
+separator-style: "solid";
+font: "Iosevka 11";
+drun-icon-theme: "Papirus";
+}
+@theme "~/.config/rofi/themes/gruvbox/gruvbox-dark.rasi"
diff --git a/.config/sway/config b/.config/sway/config
index de4062b..f23ce03 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -16,24 +16,25 @@ set $term kitty
 font pango:Iosevka SS05 Medium 10
 
 # Launcher
-set $menu "rofi -combi-modi window,drun,run -show combi -modi combi -config ~/.local/rofi/config"
+set $menu "rofi -combi-modi window,drun,run -show combi -modi combi"
 #set $menu j4-dmenu-desktop
 #set $menu compgen -c | sort -u | fzf | xargs -r swaymsg -t command exec
 
 output eDP-1 {
   pos 0 0 
   resolution 1920x1080 
-  scale 1.25
+  scale 1.2
   scale_filter smart
 }
 #output eDP-1 resolution 2560x1440 scale 2
 #output eDP-1 resolution 1920x1080 scale 1
 #output "*" background ~/Slike/Wallpapers/1596344206877.jpg fill
-output "*" background "~/riz0m/Photos/sri lanka/IMG_20220220_120730.jpg" fill
+#output "*" background "~/riz0m/Photos/sri lanka/IMG_20220220_120730.jpg" fill
+output "*" background "~/Slike/☭/bigstock-Sutjeska-National-Park-Bosnia-63011269.jpg" fill
 # Zamik dobimo z SIRINA / SCALE
-output HDMI-A-2 pos 1536 0 scale 1
-output HDMI-A-1 pos 1536 0 scale 1
-output DP-5 pos 1536 0 scale 1
+output HDMI-A-2 pos 1600 0 scale 1
+output HDMI-A-1 pos 1600 0 scale 1
+output DP-5 pos 1600 0 scale 1
 
 # start a terminal
 bindsym $mod+Return exec $term
@@ -133,10 +134,10 @@ bindsym Mod1+Shift+j move workspace to output left
 bindsym Mod1+Tab workspace back_and_forth
 
 # workspace bindings
-assign [class="Firefox"] $w2
+assign [class="Firefox"] $w8
 assign [class="Gnote"] $w9
 assign [class="Slack"] $w4
-assign [class="Riot"] $w4
+assign [class="Element"] $w4
 assign [class="Lollypop"] $w3
 assign [class="Transmission"] $w3
 assign [class="Nicotine+"] $w3
@@ -215,6 +216,7 @@ bindsym $mod+r mode "resize"
 bar {
     position top
 #    status_command i3blocks
+#    status_command i3status-rs
     status_command i3status
     colors {
         focused_background #272727E5
@@ -267,7 +269,7 @@ input "type:touchpad" {
   natural_scroll enabled
   dwt enabled
   scroll_factor 0.25
-  pointer_accel 0.5
+  #pointer_accel 0.5
   click_method clickfinger
 }
 
@@ -309,9 +311,9 @@ bindsym 0xff61 exec ~/bin/screenshot
 
 # Scaling toggle
 bindsym $mod+i exec "swaymsg output eDP-1 scale 1"
-bindsym $mod+o exec "swaymsg output eDP-1 scale 1.25"
+bindsym $mod+o exec "swaymsg output eDP-1 scale 1.2"
 bindsym $mod+y exec "swaymsg output HDMI-A-1 pos 0 0 && swaymsg output eDP-1 pos 1920 0"
-bindsym $mod+u exec "swaymsg output HDMI-A-1 pos 1536 0 && swaymsg output eDP-1 pos 0 0"
+bindsym $mod+u exec "swaymsg output HDMI-A-1 pos 1600 0 && swaymsg output eDP-1 pos 0 0"
 
 bindsym $mod+space exec "/home/g1smo/bin/get-layout.sh"
 
@@ -319,6 +321,9 @@ bindsym $mod+space exec "/home/g1smo/bin/get-layout.sh"
 # AUTOSTART
 ###
 
+# Fix za pocasen GTK app startup
+exec dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK
+
 # transparenca nekativnih oken
 exec ~/sredstva/dotfiles/inactive-windows-transparency.py
 
@@ -329,7 +334,7 @@ exec mako --default-timeout=10000 --icon-path /usr/share/icons/Numix
 exec ~/.local/bin/autotiling
 
 # Rdece, da lahko spim, hvala
-exec gammastep-indicator -m wayland -l 46.05108:14.50513
+exec gammastep -m wayland -l 46.05108:14.50513
 
 # Zagoni programov razporejeni na workspejse
 workspace 1:
@@ -344,10 +349,11 @@ exec thunderbird
 
 workspace 4:
 #exec revolt
-exec element-desktop --enable-features=UseOzonePlatform --ozone-platform=wayland
+#exec element-desktop --enable-features=UseOzonePlatform --ozone-platform=wayland
+exec element-desktop
 
 workspace 9:
-exec gnome-keyring-daemon --start
+exec gnome-keyring-daemon --start --control-directory=/run/user/1000/keyring
 exec keepassxc
 
 # autolock in te fore
diff --git a/.emacs.d/bookmarks b/.emacs.d/bookmarks
new file mode 100644
index 0000000..f15df3d
--- /dev/null
+++ b/.emacs.d/bookmarks
@@ -0,0 +1,17 @@
+;;;; Emacs Bookmark Format Version 1;;;; -*- coding: utf-8-emacs; mode: lisp-data -*-
+;;; This format is meant to be slightly human-readable;
+;;; nevertheless, you probably don't want to edit it.
+;;; -*- End Of Bookmark File Format Version Stamp -*-
+(("org-capture-last-stored"
+ (filename . "~/.notes")
+ (front-context-string . "** TODO Zaraščen")
+ (rear-context-string)
+ (position . 9)
+ (last-modified 25598 13456 906334 599000))
+("IRS"
+ (filename . "~/rs/megla-sync/org/irs.org")
+ (front-context-string . "- nov X, dizajn\n")
+ (rear-context-string . "fadeout teksta)\n")
+ (position . 359)
+ (last-modified 25583 44635 333675 223000))
+)
diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 3b1e580..aa1bec3 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -43,6 +43,7 @@
   :init (setq evil-want-integration t
               evil-want-keybinding nil)
   :config
+  ;; Evil mode toggle <3
   (evil-mode 1)
   (defvar my-header-map (make-sparse-keymap)
     "Mapiranje za evil bliznjice (leader trigger)")    
@@ -59,6 +60,7 @@
   (define-key evil-window-map "l" 'windmove-right)
   (define-key evil-window-map "s" 'split-window-below)
   (define-key evil-window-map "v" 'split-window-right)
+  (define-key my-leader-map "w" 'evil-window-map)
 
   ;; BUFFER ukazi
   (define-prefix-command 'evil-buffer-map)
@@ -72,34 +74,45 @@
   (define-key evil-buffer-map "h" 'switch-to-home)
   (defun open-config () (interactive) (find-file-literally "~/.emacs.d/init.el"))
   (define-key evil-buffer-map "c" 'open-config)
+  (define-key my-leader-map "b" 'evil-buffer-map)
 
   ;; EVAL ukazi
-  (define-prefix-command 'eval-buffer-map)
+  (define-prefix-command 'eval-eval-map)
   (define-key evil-eval-map "b" 'eval-buffer)
   (define-key evil-eval-map "e" 'eval-expression)
   (define-key evil-eval-map "r" 'eval-region)
+  (define-key my-leader-map "e" 'evil-eval-map)
 
   ;; FILE ukazi
   (define-prefix-command 'evil-file-map)
   (define-key evil-file-map "f" 'counsel-find-file)
   (defun load-config () (interactive) (find-file "~/.emacs.d/init.el"))
   (define-key evil-file-map "c" 'load-config)
+  (define-key my-leader-map "f" 'evil-file-map)
+
+  ;; ORG ukazi
+  (define-prefix-command 'evil-org-map)
+  (define-key evil-org-map "c" 'org-capture)
+  (define-key evil-org-map "a" 'org-agenda)
+  (define-key my-leader-map "o" 'evil-org-map)
+
+  ;; Projectile map!
+  (define-key my-leader-map "p" 'projectile-command-map)
+
+  ;; Odpri ORG linke kar s tipko enter
+  (defun odpri-org-link ()
+    (interactive)
+    (if (org-in-regexp org-link-any-re nil t)
+        (org-open-at-point)
+        nil))
+  (define-key evil-normal-state-map (kbd "RET") 'odpri-org-link)
 
   ;; Mapiranje ukazov
   ;(define-key evil-normal-state-map (kbd "SPC") my-leader-map)
   ;(evil-global-set-key 'motion (kbd "SPC") my-leader-map)
   ;(evil-local-set-key 'motion (kbd "SPC") my-leader-map)
   ;(define-key evil-normal-state-map (kbd "SPC") my-leader-map)
-  (define-key my-leader-map "w" 'evil-window-map)
-  (define-key my-leader-map "b" 'evil-buffer-map)
-  (define-key my-leader-map "f" 'evil-file-map)
-  (define-key my-leader-map "e" 'evil-eval-map)
-
-  ;; Odpri bookmarke
-  (define-key evil-normal-state-map (kbd "RET") 'org-open-at-point)
-
-  ;; Projectile map!
-  (define-key my-leader-map "p" 'projectile-command-map))
+  )
 
 (use-package general
   :ensure t
@@ -232,9 +245,6 @@
                             (display-line-numbers-mode -1)))))
 (use-package treemacs-projectile :ensure t :after treemacs)
 
-;; Evil mode toggle <3
-(evil-mode)
-
 ;; Uporabi drevesne razveljavitve, undo tree
 (use-package undo-tree
   :ensure t
@@ -247,12 +257,28 @@
 ;; Markdown podpora
 (use-package markdown-mode :ensure t)
 
+;; Zapiraj zaklepaje
+(use-package smartparens
+  :ensure t
+  :config
+  (smartparens-global-mode 1))
+
 
 
 ;;;;;;;;;;;;;;;;;;;
 ;; PROGRAMIRANJE ;;
 ;;;;;;;;;;;;;;;;;;;
 
+;; Pametni tabi
+(use-package smart-tabs-mode
+  :ensure t
+  :disabled t
+  :after js2-mode
+  :config
+  ;(smart-tabs-insinuate javascript scheme)
+  ;; Pametni tabi za js2-mode
+  (smart-tabs-advice js2-indent-line js2-basic-offset))
+
 ;; Twig nacin (in drug web)
 (use-package web-mode :ensure t)
 
@@ -267,7 +293,6 @@
   (setq lsp-completion-provider :capf)
   (company-mode))
 
-;; Vue nacin
 ;; LSP potrebuje dependency iz npm: "sudo npm install -g vue-language-server
 (use-package lsp-mode
   :ensure t
@@ -339,6 +364,34 @@
   ;; Tidal cycles lokacija
   (setq tidal-boot-script-path "~/.cabal/store/ghc-9.0.2/tidal-1.9.2-8e9cf9a217d87a6950880512f51893a6434970cd0690e831c563fc64ebd5de8f/share/BootTidal.hs"))
 
+;; Config fajli
+(use-package toml-mode
+  :ensure t)
+
+;; js2 za javascript
+(use-package js2-mode
+  :ensure t
+  :mode "\\.js\\'"
+  :config
+  ;(add-to-list 'auto-mode-alist '("\\.js$" . js2-mode))
+  (setq js2-strict-missing-semi-warning nil
+        js2-missing-semi-one-line-override nil
+        js2-basic-offset 2
+        js-indent-level 2
+        indent-tabs-mode nil
+        tab-width 2))
+
+;; Še en mode za JS, bolj react
+(use-package rjsx-mode
+  :ensure t
+  :after js2-mode)
+
+;; css indent
+(setq css-indent-level 2)
+(setq css-indent-offset 2)
+
+
+
 ;;;;;;;;;;;;;
 ;; ORGMODE ;;
 ;;;;;;;;;;;;;
@@ -354,11 +407,12 @@
 (use-package org-caldav
   :ensure t
   :after org-mode
-  :config
-  (setq org-caldav-calendars
-        '((:calendar-id "riz0m"
-           :files ("~/org/koledar.org")
-           :inbox "~/org/koledar-in.org"))))
+  :init
+  (setq org-caldav-calendar-id "org"
+        org-caldav-files '("~/Dokumenti/todo.org")
+        org-caldav-inbox "~/Dokumenti/koledar-in.org"
+        org-caldav-url "https://goba.rhiz0.me/remote.php/dav/calendars/g1smo"
+        org-icalendar-timezone "Europe/Ljubljana"))
 
 ;; Nacin za pisanje brez distrakcij
 (use-package writeroom-mode
@@ -375,6 +429,12 @@
 ;; Lokacije ORG agenda vnosov
 (setq org-agenda-files (list "~/rs/org" "~/Dokumenti"))
 
+;; Zapiski
+(setq org-default-notes-file "~/Dokumenti/zapiski.org")
+
+;; Zacnimo na ponedeljek, kot se spodobi
+(setq calendar-week-start-day 1)
+
 ;; DOT diagrami
 (org-babel-do-load-languages
  'org-babel-load-languages
@@ -397,48 +457,6 @@
    '((mermaid . t)
      (scheme . t))))
 
-;; Pametni tabi
-(use-package smart-tabs-mode
-  :ensure t
-  :disabled t
-  :config
-  ;(smart-tabs-insinuate javascript scheme)
-  ;; Pametni tabi za js2-mode
-  (smart-tabs-advice js2-indent-line js2-basic-offset))
-
-;; js2 za javascript
-(use-package js2-mode
-  :ensure t
-  :mode "\\.js\\'"
-  :disabled t
-  :config
-  ;(add-to-list 'auto-mode-alist '("\\.js$" . js2-mode))
-  (setq js2-strict-missing-semi-warning nil)
-  (setq js2-missing-semi-one-line-override nil)
-  (setq js2-basic-offset 2)
-  (setq js-indent-level 2))
-
-;; Še en mode za JS, bolj react
-(use-package rjsx-mode
-  :ensure t
-  :after js2-mode)
-
-;; css indent
-(setq css-indent-level 2)
-(setq css-indent-offset 2)
-
-;; IVY
-(use-package ivy
-  :ensure t
-  :config
-  (ivy-mode)
-  (setq ivy-use-virtual-buffers t)
-  (setq enable-recursive-minibuffers t)
-  (local-set-key (kbd "C-j") 'ivy-next-line)
-  (local-set-key (kbd "C-k") 'ivy-prevous-line)
-  (global-set-key (kbd "C-c C-r") 'ivy-resume)
-  (global-set-key (kbd "<f6>") 'ivy-resume))
-
 ;; Swiper search
 (use-package swiper
   :ensure t
@@ -476,6 +494,18 @@
 ;; Razno ;;
 ;;;;;;;;;;;
 
+;; IVY
+(use-package ivy
+  :ensure t
+  :config
+  (ivy-mode)
+  (setq ivy-use-virtual-buffers t)
+  (setq enable-recursive-minibuffers t)
+  (local-set-key (kbd "C-j") 'ivy-next-line)
+  (local-set-key (kbd "C-k") 'ivy-prevous-line)
+  (global-set-key (kbd "C-c C-r") 'ivy-resume)
+  (global-set-key (kbd "<f6>") 'ivy-resume))
+
 ;; Vedno sledi symlinkom v git
 (setq vc-follow-symlinks t)
 
@@ -529,6 +559,10 @@
   (setq openwith-associations '(("\\.pdf\\'" "xdg-open" (file))))
   (openwith-mode t))
 
+;; Kolaborativno urejanje
+(use-package crdt
+  :ensure t)
+
 
 
 ;;;;;;;;;;;;
@@ -542,9 +576,12 @@
  '(custom-safe-themes
    '("db3e80842b48f9decb532a1d74e7575716821ee631f30267e4991f4ba2ddf56e" "d14f3df28603e9517eb8fb7518b662d653b25b26e83bd8e129acea042b774298" "7661b762556018a44a29477b84757994d8386d6edee909409fabe0631952dad9" default))
  '(iswitchb-mode t)
+ '(org-agenda-files
+   '("~/Dokumenti/todo.org" "/home/g1smo/Dokumenti/plac.org" "/home/g1smo/rs/org/2021-05-25-spletna-stran.org" "/home/g1smo/rs/org/2021-07-02-spletna.org" "/home/g1smo/rs/org/README.org" "/home/g1smo/rs/org/git-delavnica.org" "/home/g1smo/rs/org/irs-plan-period.org" "/home/g1smo/rs/org/irs-plan.org" "/home/g1smo/rs/org/irs.org" "/home/g1smo/rs/org/irs_old.org" "/home/g1smo/rs/org/kaki.org" "/home/g1smo/rs/org/prepoznava-komadov.org" "/home/g1smo/Dokumenti/agenda.org" "/home/g1smo/Dokumenti/blurb.org" "/home/g1smo/Dokumenti/delo.org" "/home/g1smo/Dokumenti/emanat.org" "/home/g1smo/Dokumenti/kompot.org" "/home/g1smo/Dokumenti/ljudmila.org" "/home/g1smo/Dokumenti/mu4e-setup.org" "/home/g1smo/Dokumenti/muska.org" "/home/g1smo/Dokumenti/org.org" "/home/g1smo/Dokumenti/projekti.org" "/home/g1smo/Dokumenti/recepti.org" "/home/g1smo/Dokumenti/samozaposlitev-prijava.org" "/home/g1smo/Dokumenti/shta.org" "/home/g1smo/Dokumenti/wtf.org" "/home/g1smo/Dokumenti/zapisi.org"))
  '(package-selected-packages
-   '(openwith evil-org-agenda company-org-block org-block-capf writeroom-mode racket-mode htmlize company-lsp web-mode tidal org-caldav format-all company-phpactor phpactor extempore-mode ob-mermaid use-package lsp-mode yaml-mode drupal-mode magit markdown-mode flycheck arduino-mode rjsx-mode gdscript-mode rainbow-delimiters which-key paredit geiser-guile geiser web-beautify vue-mode treemacs-evil treemacs-projectile treemacs smart-tabs-mode smart-tabs js2-mode smex clojure-mode helpful doom-themes counsel swiper all-the-icons doom-modeline evil-collection fennel-mode rg ivy company projectile evil))
+   '(toml-mode smartparens crdt.el openwith evil-org-agenda company-org-block org-block-capf writeroom-mode racket-mode htmlize company-lsp web-mode tidal org-caldav format-all company-phpactor phpactor extempore-mode ob-mermaid use-package lsp-mode yaml-mode drupal-mode magit markdown-mode flycheck arduino-mode rjsx-mode gdscript-mode rainbow-delimiters which-key paredit geiser-guile geiser web-beautify vue-mode treemacs-evil treemacs-projectile treemacs smart-tabs-mode smart-tabs js2-mode smex clojure-mode helpful doom-themes counsel swiper all-the-icons doom-modeline evil-collection fennel-mode rg ivy company projectile evil))
  '(tool-bar-mode nil)
+ '(warning-minimum-level :error)
  '(which-key-mode t))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
diff --git a/.emacs.d/projectile-bookmarks.eld b/.emacs.d/projectile-bookmarks.eld
new file mode 100644
index 0000000..b1aac51
--- /dev/null
+++ b/.emacs.d/projectile-bookmarks.eld
@@ -0,0 +1 @@
+("~/sredstva/dotfiles/" "~/projekti/radio-muse/" "~/projekti/esp32cam/galbot/" "~/projekti/hm/" "~/projekti/jugofuturizem/" "~/projekti/javnakoda.si/" "~/projekti/radio-muse/web/themes/custom/indiere2/")
\ No newline at end of file
diff --git a/.i3status.conf b/.i3status.conf
new file mode 100644
index 0000000..1cdb252
--- /dev/null
+++ b/.i3status.conf
@@ -0,0 +1,80 @@
+# i3status configuration file.
+# see "man i3status" for documentation.
+
+# It is important that this file is edited as UTF-8.
+# The following line should contain a sharp s:
+# ß
+# If the above line is not correctly displayed, fix your editor first!
+
+general {
+  colors = true
+  interval = 5
+  color_good = "#2AA198"
+  color_bad = "#586E75"
+  color_degraded = "#DC322F"
+  separator = ""
+}
+
+order += "ipv6"
+order += "ethernet _first_"
+order += "disk /"
+order += "disk /home"
+order += "wireless _first_"
+order += "load"
+order += "memory"
+order += "volume master"
+order += "battery all"
+order += "tztime local"
+
+wireless _first_ {
+  #format_up = "W: (%quality at %essid) %ip"
+  format_up = " %essid %ip %bitrate "
+  format_down = "    "
+}
+
+ethernet _first_ {
+  # if you use %speed, i3status requires root privileges
+  format_up = "E: %ip (%speed)"
+  format_down = "E: "
+}
+
+battery all {
+  format = " %status %percentage %remaining "
+  status_bat = ""
+  status_chr = ""
+  status_full = ""
+  status_unk = "?"
+  threshold_type = time
+}
+
+tztime local {
+  format = "%d.%m.%Y  %H:%M"
+}
+
+load {
+  format = " %1min"
+}
+
+disk "/" {
+  format = " %avail"
+}
+
+disk "/home" {
+  format = " %avail  "
+}
+
+ipv6 {
+  format_up = "IPv6 up"
+  #format_down = "no IPv6"
+}
+
+memory {
+  format = " %used  "
+}
+
+volume master {
+  device = "pulse"
+  format = " %volume"
+  format_muted = ""
+  mixer = "Master"
+}
diff --git a/.profile b/.profile
index 82dd376..0e84608 100644
--- a/.profile
+++ b/.profile
@@ -1,4 +1,4 @@
-# <3 default editor
+# <3 default editor (za manjse urejanje)
 export EDITOR="vim"
 export VISUAL="vim"
 
@@ -14,9 +14,6 @@ export PHANTOMJS_BIN=/usr/bin/phantomjs
 # emacspeak speech server
 export DTK_PROGRAM=espeak
 
-# Racket pot
-export PATH="$HOME/.racket/7.2/bin:$PATH"
-
 # Rust paketi
 export PATH="$HOME/.local/bin:$HOME/.cargo/bin:$PATH"
 
@@ -35,7 +32,9 @@ export MOZ_ENABLE_WAYLAND=1
 #export GDK_BACKEND=wayland
 
 # QT nastavitve
-export QT_QPA_PLATFORMTHEME="qt5ct"
+#export QT_QPA_PLATFORMTHEME="qt5ct"
+# GTK izgled: sudo apt install qt5-style-plugins
+export QT_QPA_PLATFORMTHEME=gtk
 export QT_FONT_DPI=95
 
 export _JAVA_OPTIONS="-Dawt.useSystemAAFontSettings=lcd -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel $_JAVA_OPTIONS" 
@@ -45,8 +44,24 @@ export QT_WAYLAND_FORCE_DPI=physical
 export QT_WAYLAND_DISABLE_WINDOWDECORATION=1
 export _JAVA_AWT_WM_NONREPARENTING=1
 
-# Loadamo sway na tty5!
+# Guile
+export GUILE_LOAD_COMPILED_PATH="/usr/local/lib/guile/3.0/ccache:/usr/local/lib/guile/3.0/site-ccache"
+export GUILE_SITE_DIR="$HOME/.local/guile/site_dir"
+
+# (FULL)Screen share
+export XDG_CURRENT_DESKTOP=sway
+
+# Guix
+export GUIX_LOCPATH="$HOME/.guix-profile/lib/locale"
+export GUIX_PROFILE="$HOME/.guix-profile"
+export XDG_DATA_DIRS="/usr/local/share:/usr/share:$XDG_DATA_DIRS"
+export XDG_DATA_DIRS="${GUIX_PROFILE}/share${XDG_DATA_DIRS:+:}$XDG_DATA_DIRS"
+export GUIX_PACKAGE_PATH="$HOME/projekti/guix-paketi"
+export PATH="$HOME/.config/guix/current/bin:$PATH"
+. "$GUIX_PROFILE/etc/profile"
+
+# Loadamo sway na tty1!
 # If running from tty1 start sway
-if [ "$(tty)" = "/dev/tty1" ]; then
-	QT_QPA_PLATFORM=wayland-egl SDL_VIDEODRIVER=wayland exec sway
-fi
+#if [ "$(tty)" = "/dev/tty1" ]; then
+#	QT_QPA_PLATFORM=wayland-egl SDL_VIDEODRIVER=wayland exec sway
+#fi
diff --git a/.ssh/config b/.ssh/config
index 6f6296c..93d9683 100644
--- a/.ssh/config
+++ b/.ssh/config
@@ -6,3 +6,7 @@ Host pi
 
 Host felis.kreten.si
   Port 2312
+
+Host a2z.si
+  HostkeyAlgorithms ssh-dss,ssh-rsa
+  KexAlgorithms +diffie-hellman-group1-sha1
diff --git a/.zlogin b/.zlogin
index b645c69..f13b979 100644
--- a/.zlogin
+++ b/.zlogin
@@ -24,3 +24,6 @@ if [ "$TERM" = "linux" ]; then
     clear # against bg artifacts
 fi
 
+#if [ -z $DISPLAY ] && [ "$(tty)" = "/dev/tty1" ]; then
+#  exec sway
+#fi
diff --git a/.zshrc b/.zshrc
index 98bc280..7a2e86c 100644
--- a/.zshrc
+++ b/.zshrc
@@ -16,7 +16,7 @@ autoload colors zsh/terminfo
 colors
 
 # BARVE!
-export GREP_COLOR='1;32'
+export GREP_COLORS='1;32'
 export CLICOLOR=1
 export LSCOLORS=ExFxCxDxBxegedabagacad
 
@@ -64,14 +64,11 @@ bindkey '^R' history-incremental-pattern-search-backward
 # Aliasi
 alias ls='ls --color -C'
 alias vi='vim'
-alias sudo="sudo "
+alias sudo='sudo env PATH=$PATH '
 alias grep="grep --color=auto"
 alias ag="rg"
 alias less="less -R"
 
-# Kitty terminal ssh fix
-alias ssh="kitty +kitten ssh"
-
 alias gitclean="git fetch -p && for branch in \$(git branch -vv | grep ': gone]' | gawk '{print \$1}'); do git branch -D \$branch; echo 'deleted \$branch'; done"
 alias sctl="systemctl"
 alias ddrush="ddev exec drush"
@@ -121,9 +118,6 @@ alias kill-zoom='pkill zoom'
 
 alias nmc='nmcli con up '
 
-# 32bit wine
-alias wine32="WINEPREFIX=~/.wine32 WINEARCH=win32 wine "
-
 # OBS fix
 #alias obs="QT_QPA_PLATFORM=xcb obs"
 
@@ -131,15 +125,13 @@ alias wine32="WINEPREFIX=~/.wine32 WINEARCH=win32 wine "
 #alias deb-build="dpkg-buildpackage -us -uc"
 alias deb-build="dpkg-buildpackage -b -rfakeroot -us -uc"
 
-alias run-gamma="pkill -f gammastep-indicator && screen -dm -- gammastep-indicator -m wayland -l 46.05108:14.50513"
+alias run-gamma="pkill -f gammastep; sleep 3; screen -dm -- gammastep -m wayland -l 46.05108:14.50513"
 
-# Guile
-export GUILE_LOAD_COMPILED_PATH="/usr/local/lib/guile/3.0/ccache:/usr/local/lib/guile/3.0/site-ccache"
 
-# (FULL)Screen share
-export XDG_CURRENT_DESKTOP=sway
+# Za LXD!
+export PATH="${PATH}:$(go env GOPATH)/bin:/sbin:/usr/sbin"
+export LD_LIBRARY_PATH="$(go env GOPATH)/deps/dqlite/.libs/:$(go env GOPATH)/deps/raft/.libs/:${LD_LIBRARY_PATH}"
 
-# Guix
-#GUIX_PROFILE="/home/g1smo/.config/guix/current"
-#. "$GUIX_PROFILE/etc/profile"
+# JS fix (prevec nov za openssl)
+#export NODE_OPTIONS="--openssl-legacy-provider"
 
diff --git a/povezi.sh b/povezi.sh
index d93e02e..b1fa09e 100755
--- a/povezi.sh
+++ b/povezi.sh
@@ -18,6 +18,9 @@ ln -s $DIR/.config/i3/config ~/.config/i3/config
 mkdir ~/.config/sway
 ln -s $DIR/.config/sway/config ~/.config/sway/config
 
+# i3status vrstica zgoraj
+ln -s $DIR/.i3status.conf ~/.i3status.conf
+
 # termite terminal (ok terminal za X)
 mkdir ~/.config/termite
 ln -s $DIR/.config/termite/config ~/.config/termite/config
@@ -38,15 +41,12 @@ ln -s $DIR/.config/redshift ~/.config/redshift
 ln -s $DIR/.i3blocks.conf ~/.i3blocks.conf
 
 # rofi launcher
-mkdir ~/.local/rofi
-ln -s $DIR/.local/rofi/config ~/.local/rofi/config
+mkdir ~/.config/rofi
+ln -s $DIR/.config/rofi/config.rasi ~/.config/rofi/config.rasi
 # ter gruvbox tema
 mkdir -p ~/.config/rofi/themes
 ln -s $DIR/.config/rofi/themes/gruvbox ~/.config/rofi/themes/gruvbox
 
-# spacemacs, uizi emacs starter config
-ln -s $DIR/.spacemacs ~/.spacemacs
-
 # VIM!
 ln -s $DIR/.vimrc ~/.vimrc
 
@@ -83,9 +83,11 @@ ln -s $DIR/.guile ~/.guile
 ln -s $DIR/applications/dbeaver.desktop ~/.local/share/applications/dbeaver.desktop
 ln -s $DIR/applications/dbeaver.desktop ~/.local/share/applications/com.obsproject.Studio.desktop
 
-# Emacs
+# Emacs <3
 mkdir ~/.emacs.d
 ln -s $DIR/.emacs.d/init.el ~/.emacs.d/init.el
+ln -s $DIR/.emacs.d/projectile-bookmarks.eld ~/.emacs.d/projectile-bookmarks.eld
+ln -s $DIR/.emacs.d/bookmarks ~/.emacs.d/bookmarks
 
 # SSH (timeout)
 mkdir ~/.ssh