diff --git a/emacs/custom.el b/emacs/custom.el
index 5191d1e..8ae166b 100644
--- a/emacs/custom.el
+++ b/emacs/custom.el
@@ -3,15 +3,21 @@
  ;; If you edit it by hand, you could mess it up, so be careful.
  ;; Your init file should contain only one such instance.
  ;; If there is more than one, they won't work right.
+ '(corfu-auto t)
+ '(corfu-auto-prefix 0)
+ '(corfu-quit-no-match t)
  '(custom-safe-themes
-   '("6e23a74a8c3e71515aafaa2c39d337c9b032ab8bd98530819c862b223ff3638f" default))
+   '("4d804636293f1bcbfe59a604c5c47c0fe70178b356f276bce4d811103581d486" "ca05b6a113105209e43e8eaacc48211bff332fd462fdaba8c7edf6c9dd0129c5" "4f0fe018c5858b13538a7444ab308dc675aeb88d6cf34af9e326ec961b9544ea" "07148a33fc78f92eb6c18af7f8dfd34c6221e2876081dd00c15678870c3a9b9b" "9dadb32bd9f56fb80806ec40f7aaa418b7480b15739667a69cc5c2269f881b61" "be7c4e5bd2623a33e916f900f61ac7db6cdbf045478ba96cc7e803f18c71c0f5" "fbe746fdffa799304793a02e35bfe00c87a04220c69800f22b90b5001a2d2236" "6acc8ff77b41fe224e3f7be4b6722a8f67c573e13a9bc5053c70606851edb85c" "6e23a74a8c3e71515aafaa2c39d337c9b032ab8bd98530819c862b223ff3638f" default))
  '(deft-extensions '("kotl" "txt" "text" "md" "markdown" "org"))
  '(emcn-host "famthun.nl")
  '(package-selected-packages
-   '(yasnippet protobuf-mode lsp-ui lsp-mode exwm ement plz ts quelpa deft hyperbole phps-mode telega gnus-desktop-notify xclip ix esh-autosuggest company-shell docker-compose-mode docker muse writeroom-mode vscode-icon mastodon smtpmail-multi vterm pyvenv pyenv-mode python-mode markdown-mode+ websocket sql-indent company-lsp flymake-go noflet ido-vertical-mode counsel swiper typescript-mode flymake-shellcheck omnisharp plantuml-mode all-the-icons-dired all-the-icons dired-sidebar company-irony-c-headers irony-eldoc company-irony irony go-eldoc company-go go-mode webpaste emojify csv csv-mode js2-mode company-tern php-mode xmlgen request-deferred auto-package-update web-mode company magit powerline nginx-mode cpanfile-mode dotenv-mode mustache-mode htmlize dockerfile-mode indent-tools markdown-mode yaml-mode))
+   '(company kind-icon corfu yasnippet protobuf-mode lsp-ui lsp-mode exwm ement plz ts quelpa deft hyperbole phps-mode telega gnus-desktop-notify xclip ix docker-compose-mode docker muse writeroom-mode vscode-icon mastodon smtpmail-multi vterm pyvenv pyenv-mode python-mode markdown-mode+ websocket sql-indent company-lsp flymake-go noflet ido-vertical-mode counsel swiper typescript-mode flymake-shellcheck omnisharp plantuml-mode all-the-icons-dired all-the-icons dired-sidebar irony-eldoc irony go-eldoc go-mode webpaste emojify csv csv-mode js2-mode company-tern php-mode xmlgen request-deferred auto-package-update web-mode magit powerline nginx-mode cpanfile-mode dotenv-mode mustache-mode htmlize dockerfile-mode indent-tools markdown-mode yaml-mode))
  '(php-lineup-cascaded-calls t)
  '(php-mode-coding-style 'symfony2)
  '(php-mode-lineup-cascaded-calls t)
+ '(phpinspect-projects
+   '(("/home/hugo/projects/fietsenopmaat/wordpress/wp-content/themes/tst-sti/"
+      (include-dirs "/home/hugo/projects/fietsenopmaat/wordpress/wp-includes/"))))
  '(safe-local-variable-values '((sgml-basic-offset . 1)))
  '(sgml-basic-offset 2)
  '(tab-bar-border 4 t)
diff --git a/emacs/init.el b/emacs/init.el
index efa39c3..7c39f0b 100644
--- a/emacs/init.el
+++ b/emacs/init.el
@@ -71,7 +71,8 @@
 
 (tool-bar-mode -1)
 
-(add-hook 'after-init-hook 'global-company-mode)
+;; (add-hook 'after-init-hook 'global-company-mode)
+(add-hook 'after-init-hook 'global-corfu-mode)
 (xclip-mode 1)
 (setq-default fill-column 80)
 
@@ -239,12 +240,12 @@
   (expand-add-abbrevs php-mode-abbrev-table hugot-php-mode-expand-list)
   (abbrev-mode 1)
 
-  (set (make-local-variable 'company-minimum-prefix-length) 0)
-  (set (make-local-variable 'company-tooltip-align-annotations) t)
+  ;; (set (make-local-variable 'company-minimum-prefix-length) 0)
+  ;; (set (make-local-variable 'company-tooltip-align-annotations) t)
 
-  (set (make-local-variable 'company-idle-delay) 0.1)
+  ;; (set (make-local-variable 'company-idle-delay) 0.1)
 
-  (set (make-local-variable 'company-backends) '(phpinspect-company-backend))
+  ;; (set (make-local-variable 'company-backends) '(phpinspect-company-backend))
 
   ;; Handy namespace stuff
   (define-key php-mode-map (kbd "C-c u") 'phpinspect-fix-uses-interactive)
@@ -255,7 +256,8 @@
   (phpinspect-mode))
 
 (when (require 'phpinspect nil t)
-  (add-hook 'php-mode-hook #'hugot-php-personal-hook))
+  (add-hook 'php-mode-hook #'hugot-php-personal-hook)
+  (add-hook 'web-mode-hook #'hugot-php-personal-hook))
 
 ;; END PHP
 
@@ -263,41 +265,51 @@
 ;;;;; CSS ;;;;;
 ;;;;;;;;;;;;;;;
 
-(defun hugot-css-mode-hook ()
-  "Custom actions to execute when initializing css-mode"
-  (setq-local company-minimum-prefix-length 1)
-  (setq-local company-idle-delay 0))
-(add-hook 'css-mode-hook 'hugot-css-mode-hook)
+;; (defun hugot-css-mode-hook ()
+;;   "Custom actions to execute when initializing css-mode"
+;;   (setq-local company-minimum-prefix-length 1)
+;;   (setq-local company-idle-delay 0))
+;; (add-hook 'css-mode-hook 'hugot-css-mode-hook)
 
 ;; END CSS
 
 ;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;;; COMPANY MODE ;;;;;
 ;;;;;;;;;;;;;;;;;;;;;;;;
-(with-eval-after-load 'company
-  (dolist (map (list company-active-map company-search-map))
-    (define-key map (kbd "C-n") nil)
-    (define-key map (kbd "C-p") nil)
-    (define-key map (kbd "M-n") #'company-select-next)
-    (define-key map (kbd "M-p") #'company-select-previous))
-
-  (setq company-auto-complete t)
-  (setq company-idle-delay 1)
-  (setq company-auto-complete 'company-explicit-action-p)
-
-  (global-set-key (kbd "M-p") 'company-select-previous)
-  (global-set-key (kbd "M-n") 'company-select-next)
-  (add-to-list 'company-backends 'company-shell t)
-  (add-to-list 'company-backends 'company-dabbrev-code t)
-  (add-to-list 'company-backends 'company-capf))
-
-(defun hugot-make-capf-dominant-company-backend ()
-  (interactive)
-  (setq company-backends
-        `(company-capf
-          ,@(seq-filter (lambda (elt)
-                         (not (eq 'company-capf elt)))
-                       company-backends))))
+;; (with-eval-after-load 'company
+;;   (dolist (map (list company-active-map company-search-map))
+;;     (define-key map (kbd "C-n") nil)
+;;     (define-key map (kbd "C-p") nil)
+;;     (define-key map (kbd "M-n") #'company-select-next)
+;;     (define-key map (kbd "M-p") #'company-select-previous)))
+
+(with-eval-after-load 'corfu
+  (require 'kind-icon)
+  (setq kind-icon-use-icons t)
+  (setq kind-icon-default-face 'corfu-default)
+  (add-to-list 'corfu-margin-formatters #'kind-icon-margin-formatter))
+
+
+;; (define-key map (kbd "M-p") #'))
+
+
+;;   (setq company-auto-complete t)
+;;   (setq company-idle-delay 1)
+;;   (setq company-auto-complete 'company-explicit-action-p)
+
+;;   (global-set-key (kbd "M-p") 'company-select-previous)
+;;   (global-set-key (kbd "M-n") 'company-select-next)
+;;   (add-to-list 'company-backends 'company-shell t)
+;;   (add-to-list 'company-backends 'company-dabbrev-code t)
+;;   (add-to-list 'company-backends 'company-capf))
+
+;; (defun hugot-make-capf-dominant-company-backend ()
+;;   (interactive)
+;;   (setq company-backends
+;;         `(company-capf
+;;           ,@(seq-filter (lambda (elt)
+;;                          (not (eq 'company-capf elt)))
+;;                        company-backends))))
 
 
 
@@ -307,7 +319,7 @@
 ;;;;; GO ;;;;;
 ;;;;;;;;;;;;;;
 (require 'go-mode)
-(require 'company-go)
+;;(require 'company-go)
 (require 'go-eldoc)
 (require 'flycheck)
 
@@ -349,8 +361,8 @@
 
   (local-set-key (kbd "C-c g") 'hugot-go-run)
 
-  (setq gofmt-command "goimports")
-  (hugot-make-capf-dominant-company-backend))
+  (setq gofmt-command "goimports"))
+  ;(hugot-make-capf-dominant-company-backend))
 
 (add-hook 'go-mode-hook 'hugot-go-mode-hook)
 
@@ -559,6 +571,8 @@ Enables ido for M-x and describe-function/describe-variable."
                       cr-args `(,prompt ,(funcall coll "" pred t) ,pred ,@args)))))))
     (apply cr-function cr-args)))
 
+;;(setq completing-read-function #'completing-read-default)
+
 (setq completing-read-function #'hugot-completing-read)
 
 ;; Use IDO for M-x
@@ -669,3 +683,4 @@ See `yank' for documentation of ARG."
     (message "~/.ssh/id_rsa.pub contents added to kill-ring")))
 
 ;; END COMMANDS
+(put 'list-threads 'disabled nil)
diff --git a/main.go b/main.go
index 4fe1fa1..2bd0526 100644
--- a/main.go
+++ b/main.go
@@ -233,6 +233,8 @@ func Run(privileged bool, detach bool, mounts []string, command []string) error
 			"-v", home+":"+home,
 			"-e", "SSH_AGENT_LAUNCHER="+os.Getenv("SSH_AGENT_LAUNCHER"),
 			"-e", "SSH_AUTH_SOCK="+os.Getenv("SSH_AUTH_SOCK"),
+			"-e", "XDG_CURRENT_DESKTOP="+os.Getenv("XDG_CURRENT_DESKTOP"),
+			"-e", "DESKTOP_SESSION="+os.Getenv("DESKTOP_SESSION"),
 			"-e", "PULSE_SERVER=unix:/run/user/"+curUser.Uid+"/pulse/native",
 			"-e", "DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/"+curUser.Uid+"/bus",
 			"-v", "/tmp/.X11-unix:/tmp/.X11-unix",