diff --git a/.emacs b/.emacs
index 6a6ed32..a67fe3a 100755
--- a/.emacs
+++ b/.emacs
@@ -22,15 +22,41 @@
 (column-number-mode 1)
 (show-paren-mode 1)
 (electric-pair-mode 1)
-(setq-default indent-tabs-mode t)
-(setq-default tab-width 4)
-(setq c-set-style "k&r")
-(setq c-basic-offset 4)
 (global-display-line-numbers-mode 1)
 (setq display-line-numbers-type 'relative)
 (set-face-attribute 'default nil :height 200)
 (global-set-key (kbd "<escape>") 'keyboard-escape-quit)
-(rc/require-theme 'gruber-darker)
+
+(unless (package-installed-p 'gruvbox-theme)
+  (package-install 'gruvbox-theme))
+
+ (load-theme 'gruvbox-dark-soft t)
+
+(unless (package-installed-p 'lsp-mode)
+  (package-install 'lsp-mode))
+
+(use-package lsp-mode
+  :init
+  :hook (;; replace XXX-mode with concrete major-mode(e. g. python-mode)
+         (c-mode . lsp))
+  :commands lsp)
+
+;; company
+(unless (package-installed-p 'company)
+	(package-install 'company))
+
+(use-package company
+  :after lsp-mode
+  :hook (prog-mode . company-mode)
+  :bind (:map company-active-map
+         ("<tab>" . company-complete-selection))
+        (:map lsp-mode-map
+         ("<tab>" . company-indent-or-complete-common))
+  :custom
+  (company-minimum-prefix-length 1)
+  (company-idle-delay 0.0))
+
+(setq neo-theme (if (display-graphic-p) 'icons))
 
 ;; neotree
 (unless (package-installed-p 'neotree)
@@ -48,20 +74,6 @@
 (global-set-key (kbd "C-c C-c") 'simpleclip-copy)
 (global-set-key (kbd "C-c C-v") 'simpleclip-paste)
 
-;; Magit
-(unless (package-installed-p 'magit)
-  	(package-install 'magit))
-
-;; go-mode 
-(unless (package-installed-p 'go-mode)
-  	(package-install 'go-mode))
-
-;; Rust mode
-(unless (package-installed-p 'rust-mode)
-  (package-refresh-contents)
-  (package-install 'rust-mode))
-
-
 ;; Download Evil
 (unless (package-installed-p 'evil)
   (package-install 'evil))
@@ -69,13 +81,21 @@
 ;; Enable Evil
 (require 'evil)
 (evil-mode 1)
+
+;;    
+;; Epitech configuration
+;;
+(add-to-list 'load-path "~/.emacs.d/lisp")
+(load "site-start.d/epitech-init.el")
+
+(setq-default indent-tabs-mode nil)
 (custom-set-variables
  ;; custom-set-variables was added by Custom.
  ;; 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.
  '(package-selected-packages
-   '(evil rust-mode go-mode smex simpleclip paredit org-cliplink neotree multiple-cursors magit ido-completing-read+ helm haskell-mode gruber-darker-theme dash-functional all-the-icons)))
+   '(company simpleclip rust-mode org-cliplink neotree magit gruber-darker-theme go-mode evil dash-functional all-the-icons)))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.
diff --git a/.emacs.rc/misc-rc.el b/.emacs.rc/misc-rc.el
index 5720c93..84ad5db 100755
--- a/.emacs.rc/misc-rc.el
+++ b/.emacs.rc/misc-rc.el
@@ -5,10 +5,7 @@
 
 (setq-default inhibit-splash-screen t
               make-backup-files nil
-              tab-width 4
-              indent-tabs-mode nil
               compilation-scroll-output t
-              default-input-method "russian-computer"
               visible-bell (equal system-type 'windows-nt))
 
 (defun rc/colorize-compilation-buffer ()
diff --git a/.emacs_bak b/.emacs_bak
new file mode 100755
index 0000000..5da3485
--- /dev/null
+++ b/.emacs_bak
@@ -0,0 +1,66 @@
+(require 'package)
+(add-to-list 'package-archives '("gnu"   . "https://elpa.gnu.org/packages/"))
+(add-to-list 'package-archives '("melpa" . "https://melpa.org/packages/"))
+(package-initialize)
+
+(unless (package-installed-p 'use-package)
+  (package-refresh-contents)
+  (package-install 'use-package))
+(eval-and-compile
+  (setq use-package-always-ensure t
+        use-package-expand-minimally t))
+
+(load "~/.emacs.rc/rc.el")
+(load "~/.emacs.rc/misc-rc.el")
+(load "~/.emacs.rc/org-mode-rc.el")
+(load "~/.emacs.rc/autocommit-rc.el")
+
+;; Look
+(tool-bar-mode 0)
+(menu-bar-mode 0)
+(scroll-bar-mode 0)
+(column-number-mode 1)
+(show-paren-mode 1)
+(electric-pair-mode 1)
+(global-display-line-numbers-mode 1)
+(global-font-lock-mode 0)
+(setq display-line-numbers-type 'relative)
+(set-face-attribute 'default nil :height 200)
+(global-set-key (kbd "<escape>") 'keyboard-escape-quit)
+
+(unless (package-installed-p 'gruvbox-theme)
+  (package-install 'gruvbox-theme))
+
+(load-theme 'gruvbox-dark-soft t)
+
+;; neotree
+(unless (package-installed-p 'neotree)
+	(package-install 'neotree)
+	(package-install 'all-the-icons))
+
+(setq neo-theme (if (display-graphic-p) 'icons))
+(setq neo-smart-open t)
+(global-set-key [f8] 'neotree-toggle)
+
+;; Simpleclip
+(unless (package-installed-p 'simpleclip)
+  	(package-install 'simpleclip))
+
+(global-set-key (kbd "C-c C-c") 'simpleclip-copy)
+(global-set-key (kbd "C-c C-v") 'simpleclip-paste)
+
+;; Download Evil
+(unless (package-installed-p 'evil)
+  (package-install 'evil))
+
+;; Enable Evil
+(require 'evil)
+(evil-mode 1)
+
+;;    
+;; Epitech configuration
+;;
+(add-to-list 'load-path "~/.emacs.d/lisp")
+(load "site-start.d/epitech-init.el")
+
+(setq-default indent-tabs-mode nil)
diff --git a/i3/config b/i3/config
index cf9ae1b..018b83d 100755
--- a/i3/config
+++ b/i3/config
@@ -11,6 +11,7 @@
 
 set $mod Mod4
 
+exec xinput set-prop "Elan Touchpad" "libinput Tapping Enabled" 1
 exec_always feh --bg-scale ~/dotfiles/bg.png
 
 # Font for window titles. Will also be used by the bar unless a different font
@@ -179,10 +180,10 @@ bindsym $mod+Shift+p exec "~/.screenlayout/portable-setup.sh"
 bindsym $mod+Shift+w exec "~/bin/map-wacom"
 bindsym $mod+b exec "boomer"
 bindsym $mod+Shift+n exec "i3lock --image ~/dotfiles/bg.png"
+bindsym $mod+Shift+b exec "quentin_saver"
 bindsym --release $mod+Shift+l exec "slock"
 
 focus_follows_mouse no
 
 hide_edge_borders both
 
-exec xinput set-prop "Elan Touchpad" "libinput Tapping Enabled" 1