diff --git a/README.org b/README.org
index 75ad9fb8..bac6ff4c 100644
--- a/README.org
+++ b/README.org
@@ -22,7 +22,6 @@
   - [[#magit][Magit]]
   - [[#eshell][Eshell]]
   - [[#sly][Sly]]
-  - [[#company][Company]]
   - [[#pdf-tools][PDF-Tools]]
   - [[#epub][EPUB]]
   - [[#window-management][Window Management]]
@@ -296,10 +295,13 @@ This evil-collection package includes a lot of other evil based things.
     "hf" '(helpful-callable :which-key "describe-function")
     "hv" '(helpful-variable :which-key "describe-variable")
     "hk" '(helpful-key :which-key "describe-key")
+    "hb" '(general-describe-keybindings :which-key "describe-bindings")
     "hi" '(info :which-key "info manual")
     "ss" '(consult-line :which-key "consult search")
     "ww" '(other-window :which-key "other window")
     "wd" '(delete-window :which-key "other window")
+    ";" '(execute-extended-command :which-key "execute command")
+    ":" '(eval-expression :which-key "evaluate expression")
     )
   (general-def 'minibuffer-local-map
     "C-v" 'evil-paste-after)
@@ -508,6 +510,18 @@ Marginalia makes for some great decoration to our minibuffer completion items. W
   :after selectrum)
 #+end_src
 
+*** Company
+#+begin_src emacs-lisp
+(use-package company
+  :defer 1
+  :config (global-company-mode +1))
+#+end_src
+
+#+begin_src emacs-lisp
+(use-package company-dict
+  :defer t)
+#+end_src
+
 ** Help
 #+begin_src emacs-lisp
 (use-package helpful
@@ -533,13 +547,29 @@ I use fennel to build my awesomewm config. So, we'll need that downloaded.
 #+end_src
 
 *** Yaml
+
 I do a lot of docker management so having yaml is necessary
 #+begin_src emacs-lisp
 (use-package yaml-mode
   :mode ("\\.yml\\'" . yaml-mode))
 #+end_src
 
+Docker itself
+#+begin_src emacs-lisp
+(use-package docker
+  :defer t)
+#+end_src
+
+Let's make sure docker is capable of using tramp.
+#+begin_src emacs-lisp
+(use-package docker-tramp
+  :after docker)
+#+end_src
+
+Still need  dockerfile-mode in order to be able to edit dockerfiles.
+
 *** Fish
+Fish is my preferred shell and made some scripts in it so I keep this to be able to edit those scripts.
 #+begin_src emacs-lisp
 (use-package fish-mode
   :mode ("\\.fish\\'" . fish-mode))
@@ -1356,13 +1386,6 @@ Using sly makes a lot better common-lisp interaction within emacs.
   :mode ("\\.lisp\\'" . sly-mode))
 #+end_src
 
-** Company
-#+begin_src emacs-lisp
-(use-package company
-  :defer 1
-  :config (global-company-mode +1))
-#+end_src
-
 ** PDF-Tools
 Let's use pdf-tools for a lot better interaction with pdfs.
 #+begin_src emacs-lisp
diff --git a/init.el b/init.el
index 1e2e10ff..bc7fec91 100644
--- a/init.el
+++ b/init.el
@@ -192,10 +192,13 @@
     "hf" '(helpful-callable :which-key "describe-function")
     "hv" '(helpful-variable :which-key "describe-variable")
     "hk" '(helpful-key :which-key "describe-key")
+    "hb" '(general-describe-keybindings :which-key "describe-bindings")
     "hi" '(info :which-key "info manual")
     "ss" '(consult-line :which-key "consult search")
     "ww" '(other-window :which-key "other window")
     "wd" '(delete-window :which-key "other window")
+    ";" '(execute-extended-command :which-key "execute command")
+    ":" '(eval-expression :which-key "evaluate expression")
     )
   (general-def 'minibuffer-local-map
     "C-v" 'evil-paste-after)
@@ -306,6 +309,13 @@ vertically."
   (setq marginalia-annotators '(marginalia-annotators-heavy marginalia-annotators-light nil))
   :after selectrum)
 
+(use-package company
+  :defer 1
+  :config (global-company-mode +1))
+
+(use-package company-dict
+  :defer t)
+
 (use-package helpful
   :commands (helpful-callable helpful-variable helpful-command helpful-key))
 
@@ -321,6 +331,12 @@ vertically."
 (use-package yaml-mode
   :mode ("\\.yml\\'" . yaml-mode))
 
+(use-package docker
+  :defer t)
+
+(use-package docker-tramp
+  :after docker)
+
 (use-package fish-mode
   :mode ("\\.fish\\'" . fish-mode))
 
@@ -1043,10 +1059,6 @@ If on a:
 (use-package sly
   :mode ("\\.lisp\\'" . sly-mode))
 
-(use-package company
-  :defer 1
-  :config (global-company-mode +1))
-
 (use-package pdf-tools
   :straight (:host github
 		 :repo "flatwhatson/pdf-tools"