diff --git a/.config/emacs/config/dev.el b/.config/emacs/config/dev.el
index 08f0375..d6808c7 100644
--- a/.config/emacs/config/dev.el
+++ b/.config/emacs/config/dev.el
@@ -47,7 +47,7 @@
 (use-package lsp-ui
   :ensure t
   :bind
-  ("s-l i" . lsp-ui-doc-show)
+  ("C-c i" . lsp-ui-doc-show)
   :config
   (setq lsp-ui-doc-position 'at-point)
   (setq lsp-ui-doc-show-with-mouse nil)
@@ -57,4 +57,8 @@
   :ensure t)
 
 (use-package company
-  :ensure t)
+  :ensure t
+  :bind (:map company-active-map
+              ("RET" . nil)
+              ("<return>" . nil)
+              ("M-RET" . company-complete-selection)))
diff --git a/.gitignore.d/emacs b/.gitignore.d/emacs
index 64e4e2d..3f30cf4 100644
--- a/.gitignore.d/emacs
+++ b/.gitignore.d/emacs
@@ -1,22 +1,22 @@
 *
-!/.config/emacs/config/backups.el
-!/.config/emacs/config/base.el
-!/.config/emacs/config/calendar.el
-!/.config/emacs/config/c.el
-!/.config/emacs/config/dev.el
-!/.config/emacs/config/ediff.el
-!/.config/emacs/config/functions.el
-!/.config/emacs/config/git.el
-!/.config/emacs/config/gpg.el
-!/.config/emacs/config/man.el
-!/.config/emacs/config/multiple-cursors.el
-!/.config/emacs/config/org.el
-!/.config/emacs/config/pass.el
-!/.config/emacs/config/python.el
-!/.config/emacs/config/ripgrep.el
-!/.config/emacs/config/rust.el
-!/.config/emacs/config/tramp.el
-!/.config/emacs/config/yaml.el
-!/.config/emacs/init.el
+!/.emacs.d/config/backups.el
+!/.emacs.d/config/base.el
+!/.emacs.d/config/calendar.el
+!/.emacs.d/config/c.el
+!/.emacs.d/config/dev.el
+!/.emacs.d/config/ediff.el
+!/.emacs.d/config/functions.el
+!/.emacs.d/config/git.el
+!/.emacs.d/config/gpg.el
+!/.emacs.d/config/man.el
+!/.emacs.d/config/multiple-cursors.el
+!/.emacs.d/config/org.el
+!/.emacs.d/config/pass.el
+!/.emacs.d/config/python.el
+!/.emacs.d/config/ripgrep.el
+!/.emacs.d/config/rust.el
+!/.emacs.d/config/tramp.el
+!/.emacs.d/config/yaml.el
+!/.emacs.d/init.el
 !/.gitignore.d/emacs
 !/.local/bin/em