    dotspacemacs-smart-closing-parenthesis nil
    dotspacemacs-highlight-delimiters 'all
    dotspacemacs-persistent-server nil
-   dotspacemacs-search-tools '("ag" "pt" "ack" "grep")
+   dotspacemacs-search-tools '("rg" "ag" "pt" "ack" "grep")
    dotspacemacs-default-package-repository nil
+   dotspacemacs-frame-title-format "%t %b"
+   dotspacemacs-icon-title-format nil
+   dotspacemacs-whitespace-cleanup nil
+   dotspacemacs-zone-out-when-idle nil
+   dotspacemacs-pretty-docs nil
    ))
 
 (defun dotspacemacs/user-init ()
-  (setq-default evil-search-module 'evil-search)
   )
 
 (defun dotspacemacs/user-config ()
   (setq create-lockfiles nil)
+  (setq evil-magit-want-horizontal-movement t)
   (setq evilmi-always-simple-jump t)
   (setq powerline-default-separator 'arrow-fade)
+  (setq evil-search-module 'evil-search)
   (define-key evil-motion-state-map (kbd "C-w C-h") 'evil-window-left)
   (define-key evil-motion-state-map (kbd "C-w C-l") 'evil-window-right)
   (define-key evil-motion-state-map (kbd "C-w C-j") 'evil-window-down)
   (define-key evil-motion-state-map (kbd "C-w C-k") 'evil-window-up)
   (define-key evil-normal-state-map (kbd "C-l")
     'spacemacs/evil-search-clear-highlight)
-  (define-key evil-normal-state-map (kbd "C-p") 'helm-projectile-find-file)
-  (define-key helm-map (kbd "C-w") 'backward-kill-word)
+  (define-key evil-normal-state-map (kbd "C-p") 'counsel-projectile-find-file)
   (add-to-list 'auto-mode-alist '("\\.uml\\'" . plantuml-mode))
   )
 
 ;; -------------------------------------------------------------------
+
 ;; Do not write anything past this comment. This is where Emacs will
 ;; auto-generate custom variable definitions.
+(custom-set-faces
+ ;; custom-set-faces 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.
+ )
+(defun dotspacemacs/emacs-custom-settings ()
+  "Emacs custom settings.
+This is an auto-generated function, do not modify its content directly, use
+Emacs customize menu instead.
+This function is called at the very end of Spacemacs initialization."
 (custom-set-variables
  ;; custom-set-variables was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.

   dotspacemacs-configuration-layer-path '()
   dotspacemacs-configuration-layers
   '(
     helm

     ;; auto-completion
     ;; better-defaults
     emacs-lisp
     git
     (ibuffer :variables

   dotspacemacs-visual-line-move-text nil
   dotspacemacs-ex-substitute-global nil
   dotspacemacs-default-layout-name "Default"
   dotspacemacs-display-default-layout t
   dotspacemacs-auto-resume-layouts t
   dotspacemacs-large-file-size 1
   dotspacemacs-auto-save-file-location 'cache
   dotspacemacs-max-rollback-slots 5
