diff --git a/.emacs b/.emacs
index 4f63935..36fc2cc 100644
--- a/.emacs
+++ b/.emacs
@@ -44,7 +44,7 @@
 	'(org-agenda-files '("~/org/1.TODO.org"))
 	'(package-enable-at-startup nil)
 	'(package-selected-packages
-		 '(dockerfile-mode web-mode prettier json-mode py-isort blacken pyvenv yaml-mode lsp-pyright ng2-mode lsp-ltex lsp-treemacs treemacs-nerd-icons treemacs-projectile treemacs lsp-ui lsp-mode which-key flycheck vterm projectile yasnippet-snippets yasnippet aggressive-indent doom-themes company-go zenburn-theme langtool smart-tabs-mode typescript-mode protobuf-mode opencl-mode glsl-mode go-mode markdown-mode srefactor irony cmake-mode company magit use-package))
+		 '(xterm-color dockerfile-mode web-mode prettier json-mode py-isort blacken pyvenv yaml-mode lsp-pyright ng2-mode lsp-ltex lsp-treemacs treemacs-nerd-icons treemacs-projectile treemacs lsp-ui lsp-mode which-key flycheck vterm projectile yasnippet-snippets yasnippet aggressive-indent doom-themes company-go zenburn-theme langtool smart-tabs-mode typescript-mode protobuf-mode opencl-mode glsl-mode go-mode markdown-mode srefactor irony cmake-mode company magit use-package))
 	'(safe-local-variable-values
 		 '((vc-follow-symlinks . t)
 			  (TeX-master . t)
@@ -141,6 +141,7 @@
 			)
 		)
 	:init
+	(setq whitespace-line-column nil)
 	(global-whitespace-mode 1)
 	:bind (
 		      ("C-c d l" . 'atu/toggle-display-line-mode)
@@ -154,13 +155,20 @@
 	;; If there is more than one, they won't work right.
 	)
 
-;; (use-package ansi-color
-;;   :config
-;;   (defun atu/colorize-compilation-buffer ()
-;;     (when (eq major-mode 'compilation-mode)
-;;       (ansi-color-apply-on-region compilation-filter-start (point-max))))
-;;   :hook
-;;   (compilation-filter . atu/colorize-compilation-buffer))
+(use-package xterm-color
+	:config
+	(defun atu/colorize-compilation-buffer ()
+		(font-lock-mode -1)
+		;; Prevent font-locking from being re-enabled in this buffer
+		(make-local-variable 'font-lock-function)
+		(setq font-lock-function (lambda (_) nil))
+		(setq xterm-color-debug t)
+		(add-hook 'comint-preoutput-filter-functions 'xterm-color-filter nil t)
+		)
+	:hook
+	(compilation-filter . atu/colorize-compilation-buffer)
+	)
+
 
 (use-package smart-tabs-mode
 	:config
@@ -294,11 +302,17 @@
 (use-package which-key
 	:delight
 	:config
-	(which-key-mode))
+	(which-key-mode)
+	(which-key-setup-side-window-right-bottom)
+	)
 
 (use-package lsp-mode
 	:delight
 	:after (flycheck)
+	:init
+	;; set prefix for lsp-command-keymap (few alternatives - "C-l", "C-c l")
+	(setq lsp-keymap-prefix "C-c l")
+	:bind-keymap ("C-c l" . lsp-command-map)
 	:config
 	(yas-minor-mode)
 	(if (display-graphic-p)
@@ -315,15 +329,10 @@
 	:bind (
 		      ("C-c C-d" . lsp-ui-doc-toggle)
 		      )
-
-	:init
-	;; set prefix for lsp-command-keymap (few alternatives - "C-l", "C-c l")
-	(setq lsp-keymap-prefix "C-c l")
 	:hook (
-		      ;; replace XXX-mode with concrete major-mode(e. g. python-mode)
-		      ;; if you want which-key integration
 		      (c++-mode . lsp-deferred)
-		      (lsp-mode . lsp-enable-which-key-integration))
+		      (lsp-mode . lsp-enable-which-key-integration)
+		      )
 	:commands (lsp lsp-deferred))
 
 (use-package lsp-ui
@@ -566,10 +575,11 @@
 (use-package prettier
 	:delight "PR"
 	:config
-	(setq prettier-mode-sync-config-flag nil)
+	(setq prettier-mode-sync-config-flag t)
 	:hook
 	(web-mode . prettier-mode)
 	(typescript-mode . prettier-mode)
+	(js-mode . prettier-mode)
 	)