diff --git a/.config/fish/config.fish b/.config/fish/config.fish
index b5f2f40..5947ff3 100644
--- a/.config/fish/config.fish
+++ b/.config/fish/config.fish
@@ -15,6 +15,7 @@ alias ggpush='git push origin (git_current_branch)'
 alias docker-composer='docker-compose'
 alias docker-start='systemctl start docker'
 alias docker-stop='systemctl stop docker'
+alias mux='tmuxinator'
 
 function vpn-start
   sudo systemctl start openvpn-client@$1
diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index a8d05c8..f33f996 100644
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -36,8 +36,6 @@ Plug 'digitaltoad/vim-jade'
 "PHP
 Plug 'StanAngeloff/php.vim', {'for': 'php'}
 Plug 'lumiliet/vim-twig'
-Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' }
-Plug 'padawan-php/deoplete-padawan', { 'for': 'php' }
 Plug 'roxma/LanguageServer-php-neovim',  {'do': 'composer install && composer run-script parse-stubs', 'for': 'php'}
 Plug 'SirVer/ultisnips' | Plug 'phux/vim-snippets'
 "Git plugin
@@ -55,7 +53,6 @@ Plug 'sbdchd/neoformat'
 function! DoRemote(arg)
   UpdateRemotePlugins
 endfunction
-Plug 'Shougo/deoplete.nvim', { 'do': function('DoRemote') }
 
 call plug#end()
 
@@ -102,43 +99,6 @@ set statusline+=%*
 " let g:deoplete#sources = get(g:,'deoplete#sources',{})
 " let g:deoplete#sources.php = ['padawan', 'ultisnips', 'tags', 'buffer', 'LanguageClient']
 
-let g:deoplete#enable_at_startup = 1
-let g:deoplete#enable_ignore_case = 1
-let g:deoplete#enable_smart_case = 1
-let g:deoplete#enable_camel_case = 1
-let g:deoplete#enable_refresh_always = 1
-let g:deoplete#file#enable_buffer_path = 1
-let g:deoplete#max_abbr_width = 0
-let g:deoplete#max_menu_width = 0
-let g:deoplete#omni#input_patterns = get(g:,'deoplete#omni#input_patterns',{})
-let g:deoplete#omni#input_patterns.java = [
-    \'[^. \t0-9]\.\w*',
-    \'[^. \t0-9]\->\w*',
-    \'[^. \t0-9]\::\w*',
-    \]
-
-call deoplete#custom#source('buffer', 'mark', 'ℬ')
-call deoplete#custom#source('ternjs', 'mark', '')
-call deoplete#custom#source('omni', 'mark', '⌾')
-call deoplete#custom#source('file', 'mark', 'file')
-call deoplete#custom#source('jedi', 'mark', '')
-call deoplete#custom#source('typescript', 'mark', '')
-call deoplete#custom#source('neosnippet', 'mark', '')
-call deoplete#custom#source('java', 'mark', '')
-call deoplete#custom#source('javacomplete2', 'mark', '')
-
-call deoplete#custom#source('typescript',  'rank', 630)
-
-set completefunc=autoprogramming#complete
-let g:deoplete#auto_complete_delay = 50
-let g:deoplete#ignore_sources = get(g:,'deoplete#ignore_sources',{})
-let g:deoplete#ignore_sources.java = ['omni']
-let g:deoplete#ignore_sources.php = ['omni']
-let g:deoplete#omni#functions = get(g:,'deoplete#omni#functions',{})
-call deoplete#custom#source('_', 'matchers', ['matcher_full_fuzzy'])
-inoremap <expr><C-h> deoplete#mappings#smart_close_popup()."\<C-h>"
-inoremap <expr><BS> deoplete#mappings#smart_close_popup()."\<C-h>"
-inoremap <expr><C-x><C-o> deoplete#mappings#manual_complete()
 
 function! GutentagsFilter(path) abort
     if fnamemodify(a:path, ':e') == 'java'
diff --git a/.config/sway/golem-sway b/.config/sway/golem-sway
index b811cc2..3acbe1a 100644
--- a/.config/sway/golem-sway
+++ b/.config/sway/golem-sway
@@ -3,7 +3,7 @@
 set $mod Mod4
 set $alt Mod1
 
-font pango:FiraCode, FontAwesome 12
+font pango:FiraCode, FontAwesome 12, Noto
 
 bindsym $mod+F7 exec --no-startup-id xset r rate 250 25 && xset b off && setxkbmap -option caps:escape
 
@@ -20,9 +20,9 @@ bindsym $mod+q kill
 bindsym $mod+$alt+s exec swaylock
 
 exec swayidle -w \
-  timeout 300 'swaylock'
+  timeout 600 'swaylock'
 exec swayidle -w \
-  timeout 600 'swaymsg "output * dpms off"'\
+  timeout 1200 'swaymsg "output * dpms off"'\
     resume 'swaymsg "output * dpms on"'
 #  before-sleep 'swaylock'
 
@@ -219,20 +219,21 @@ bindsym $mod+Control+Left resize shrink width 5 px or 5 ppt
 # Start i3bar to display a workspace bar (plus the system information i3status
 # finds out, if available)
 bar {
-  position top
-  status_command i3blocks
-  font pango:Liberation 10, FontAwesome 12
-  strip_workspace_numbers yes
-
-  colors {
-    separator #586e75
-    background #0c1014
-    statusline #aea79f
-    focused_workspace #091f2e #091f2e #ffffff
-    active_workspace #073642 #073642 #ffffff
-    inactive_workspace #0c1014 #0c1014 #aea79f
-    urgent_workspace #77216f #77216f #ffffff
-  }
+   swaybar_command waybar
+#  position top
+#  status_command i3blocks
+#  font pango:Liberation 10, FontAwesome 12
+#  strip_workspace_numbers yes
+#
+#  colors {
+#    separator #586e75
+#    background #0c1014
+#    statusline #aea79f
+#    focused_workspace #091f2e #091f2e #ffffff
+#    active_workspace #073642 #073642 #ffffff
+#    inactive_workspace #0c1014 #0c1014 #aea79f
+#    urgent_workspace #77216f #77216f #ffffff
+#  }
 }
 
 # class                 border  backgr. text    indicator child_border
@@ -251,7 +252,7 @@ output DP-2 pos 3840 0 res 1920x1200
 #output eDP-1 bg ~/Wallpapers/xp-sunrise.png stretch
 #output DP-1 bg ~/Wallpapers/xp-sunrise.png stretch
 #output DP-2 bg ~/Wallpapers/xp-sunrise.png stretch
-output * bg ~/Pictures/Wallpapers/groot-i-am-root.jpg center
+output * bg ~/Pictures/Wallpapers/calvin-hobbes-stars.jpg fill
 bindsym $mod+Shift+m exec --no-startup-id "sway output output DP-1 pos 2880 0 res 1920x1080 && sway ouput DP-2 res 1920x1080"
 
 ##############################
diff --git a/.config/waybar/config b/.config/waybar/config
new file mode 100644
index 0000000..de0ef46
--- /dev/null
+++ b/.config/waybar/config
@@ -0,0 +1,147 @@
+{
+    "layer": "top", // Waybar at top layer
+    // "position": "bottom", // Waybar position (top|bottom|left|right)
+    "height": 30, // Waybar height (to be removed for auto height)
+    // "width": 1280, // Waybar width
+    // Choose the order of the modules
+    "modules-left": ["sway/workspaces", "sway/mode", "custom/media"],
+    "modules-center": ["sway/window"],
+    "modules-right": ["idle_inhibitor", "pulseaudio", "network", "cpu", "memory", "temperature", "backlight", "battery", "battery#bat2", "clock", "tray"],
+    // Modules configuration
+    // "sway/workspaces": {
+    //     "disable-scroll": true,
+    //     "all-outputs": true,
+    //     "format": "{name}: {icon}",
+    //     "format-icons": {
+    //         "1": "",
+    //         "2": "",
+    //         "3": "",
+    //         "4": "",
+    //         "5": "",
+    //         "urgent": "",
+    //         "focused": "",
+    //         "default": ""
+    //     }
+    // },
+    "sway/mode": {
+        "format": "<span style=\"italic\">{}</span>"
+    },
+    "mpd": {
+        "format": "{stateIcon} {consumeIcon}{randomIcon}{repeatIcon}{singleIcon}{artist} - {album} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S}) ",
+        "format-disconnected": "Disconnected ",
+        "format-stopped": "{consumeIcon}{randomIcon}{repeatIcon}{singleIcon}Stopped ",
+        "unknown-tag": "N/A",
+        "interval": 2,
+        "consume-icons": {
+            "on": " "
+        },
+        "random-icons": {
+            "off": "<span color=\"#f53c3c\"></span> ",
+            "on": " "
+        },
+        "repeat-icons": {
+            "on": " "
+        },
+        "single-icons": {
+            "on": "1 "
+        },
+        "state-icons": {
+            "paused": "",
+            "playing": ""
+        },
+        "tooltip-format": "MPD (connected)",
+        "tooltip-format-disconnected": "MPD (disconnected)"
+    },
+    "idle_inhibitor": {
+        "format": "{icon}",
+        "format-icons": {
+            "activated": "",
+            "deactivated": ""
+        }
+    },
+    "tray": {
+        // "icon-size": 21,
+        "spacing": 10
+    },
+    "clock": {
+        "format": "{:%Y-%m-%d | %H:%M}",
+        "tooltip-format": "{:%Y-%m-%d | %H:%M}",
+        "format-alt": "{:%Y-%m-%d}"
+    },
+    "cpu": {
+        "format": "{usage}% ",
+        "tooltip": false
+    },
+    "memory": {
+        "format": "{}% "
+    },
+    "temperature": {
+        // "thermal-zone": 2,
+        // "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input",
+        "critical-threshold": 80,
+        // "format-critical": "{temperatureC}°C {icon}",
+        "format": "{temperatureC}°C {icon}",
+        "format-icons": ["", "", ""]
+    },
+    "backlight": {
+        // "device": "acpi_video1",
+        "format": "{percent}% {icon}",
+        "format-icons": ["", ""]
+    },
+    "battery": {
+        "states": {
+            // "good": 95,
+            "warning": 30,
+            "critical": 15
+        },
+        "format": "{capacity}% {icon}",
+        "format-charging": "{capacity}% ",
+        "format-plugged": "{capacity}% ",
+        "format-alt": "{time} {icon}",
+        // "format-good": "", // An empty format will hide the module
+        // "format-full": "",
+        "format-icons": ["", "", "", "", ""]
+    },
+    "battery#bat2": {
+        "bat": "BAT2"
+    },
+    "network": {
+        // "interface": "wlp2*", // (Optional) To force the use of this interface
+        "format-wifi": "{essid} ({signalStrength}%) ",
+        "format-ethernet": "{ifname}: {ipaddr}/{cidr} ",
+        "format-linked": "{ifname} (No IP) ",
+        "format-disconnected": "Disconnected ⚠",
+        "format-alt": "{ifname}: {ipaddr}/{cidr}"
+    },
+    "pulseaudio": {
+        // "scroll-step": 1, // %, can be a float
+        "format": "{volume}% {icon} {format_source}",
+        "format-bluetooth": "{volume}% {icon} {format_source}",
+        "format-bluetooth-muted": " {icon} {format_source}",
+        "format-muted": " {format_source}",
+        "format-source": "{volume}% ",
+        "format-source-muted": "",
+        "format-icons": {
+            "headphones": "",
+            "handsfree": "",
+            "headset": "",
+            "phone": "",
+            "portable": "",
+            "car": "",
+            "default": ["", "", ""]
+        },
+        "on-click": "pavucontrol"
+    },
+    "custom/media": {
+        "format": "{icon} {}",
+        "return-type": "json",
+        "max-length": 40,
+        "format-icons": {
+            "spotify": "",
+            "default": "🎜"
+        },
+        "escape": true,
+        "exec": "$HOME/.config/waybar/mediaplayer.py 2> /dev/null" // Script in resources folder
+        // "exec": "$HOME/.config/waybar/mediaplayer.py --player spotify 2> /dev/null" // Filter player based on name
+    }
+}
diff --git a/.config/waybar/style.css b/.config/waybar/style.css
new file mode 100644
index 0000000..89190ee
--- /dev/null
+++ b/.config/waybar/style.css
@@ -0,0 +1,203 @@
+* {
+    border: none;
+    border-radius: 0;
+    /* `otf-font-awesome` is required to be installed for icons */
+    font-family: Roboto, Helvetica, Arial, sans-serif;
+    font-size: 13px;
+    min-height: 0;
+}
+
+window#waybar {
+    background-color: transparent;
+    border-bottom: 3px solid rgba(100, 114, 125, 0.2);
+    color: #ffffff;
+    transition-property: background-color;
+    transition-duration: .5s;
+}
+
+window#waybar.hidden {
+    opacity: 0.2;
+}
+
+/*
+window#waybar.empty {
+    background-color: transparent;
+}
+window#waybar.solo {
+    background-color: #FFFFFF;
+}
+*/
+
+window#waybar.termite {
+    background-color: #3F3F3F;
+}
+
+window#waybar.chromium {
+    background-color: #000000;
+    border: none;
+}
+
+#workspaces button {
+    padding: 0 5px;
+    background-color: transparent;
+    color: #ffffff;
+    border-bottom: 3px solid transparent;
+}
+
+/* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */
+#workspaces button:hover {
+    background: rgba(0, 0, 0, 0.2);
+    box-shadow: inherit;
+    border-bottom: 3px solid rgba(255, 255, 255, 0.4);
+}
+
+#workspaces button.focused {
+    background-color: rgba(212, 25, 25, 0.7);
+    border-bottom: 3px solid rgba(255, 255, 255, 0.2);
+}
+
+#workspaces button.urgent {
+    background-color: #eb4d4b;
+}
+
+#mode {
+    background-color: #64727D;
+    border-bottom: 3px solid #ffffff;
+}
+
+#clock,
+#battery,
+#cpu,
+#memory,
+#temperature,
+#backlight,
+#network,
+#pulseaudio,
+#custom-media,
+#tray,
+#mode,
+#idle_inhibitor,
+#mpd {
+    padding: 0 10px;
+    margin: 0 4px;
+    color: #ffffff;
+}
+
+#clock {
+    background-color: #64727D;
+}
+
+#battery {
+    background-color: #ffffff;
+    color: #000000;
+}
+
+#battery.charging {
+    color: #ffffff;
+    background-color: #26A65B;
+}
+
+@keyframes blink {
+    to {
+        background-color: #ffffff;
+        color: #000000;
+    }
+}
+
+#battery.critical:not(.charging) {
+    background-color: #f53c3c;
+    color: #ffffff;
+    animation-name: blink;
+    animation-duration: 0.5s;
+    animation-timing-function: linear;
+    animation-iteration-count: infinite;
+    animation-direction: alternate;
+}
+
+label:focus {
+    background-color: #000000;
+}
+
+#cpu {
+    background-color: #2ecc71;
+    color: #000000;
+}
+
+#memory {
+    background-color: #9b59b6;
+}
+
+#backlight {
+    background-color: #90b1b1;
+}
+
+#network {
+    /*background-color: #2980b9;*/
+    background-color: rgba(41, 128, 185, 0.7);
+}
+
+#network.disconnected {
+    background-color: #f53c3c;
+}
+
+#pulseaudio {
+    background-color: #f1c40f;
+    color: #000000;
+}
+
+#pulseaudio.muted {
+    background-color: #90b1b1;
+    color: #2a5c45;
+}
+
+#custom-media {
+    background-color: #66cc99;
+    color: #2a5c45;
+    min-width: 100px;
+}
+
+#custom-media.custom-spotify {
+    background-color: #66cc99;
+}
+
+#custom-media.custom-vlc {
+    background-color: #ffa000;
+}
+
+#temperature {
+    background-color: #f0932b;
+}
+
+#temperature.critical {
+    background-color: #eb4d4b;
+}
+
+#tray {
+    background-color: #2980b9;
+}
+
+#idle_inhibitor {
+    background-color: #2d3436;
+}
+
+#idle_inhibitor.activated {
+    background-color: #ecf0f1;
+    color: #2d3436;
+}
+
+#mpd {
+    background-color: #66cc99;
+    color: #2a5c45;
+}
+
+#mpd.disconnected {
+    background-color: #f53c3c;
+}
+
+#mpd.stopped {
+    background-color: #90b1b1;
+}
+
+#mpd.paused {
+    background-color: #51a37a;
+}
diff --git a/.i3blocks.conf b/.i3blocks.conf
index 2899ce5..b2a6a78 100644
--- a/.i3blocks.conf
+++ b/.i3blocks.conf
@@ -10,7 +10,7 @@ command=/usr/lib/i3blocks/$BLOCK_NAME
 
 [ssid]
 #command=echo " $(iw dev wlp4s0 link | grep SSID | cut -d " " -f 2-)"
-command=/usr/lib/i3blocks/iface
+command=/usr/lib/i3blocks/iface/iface
 color=#00FF00
 separator=false
 interval=10
@@ -45,10 +45,12 @@ interval=5
 
 [memory]
 label=
-command=free -m | awk 'NR==2{printf "%.1fG", $3/1024 }'
+#command=free -m | awk 'NR==2{printf "%.1fG", $3/1024 }'
+command=/usr/lib/i3blocks/memory/memory | awk 'RN==1{print $1}'
 interval=30
 
 [temperature]
+command=/usr/lib/i3blocks/temperature/temperature
 label=
 interval=30