 (define-key evil-normal-state-map "n" 'scroll-up)
 (define-key evil-normal-state-map "N" 'scroll-down)
 (global-set-key (kbd "<f7>") 'flyspell-mode) ;Activates the spell-checker
+=======
+:ensure t)
+
+(use-package flyspell-correct
+  :ensure t
+  :config
+  (add-hook 'sgml-mode-hook 'flyspell-prog-mode)
+  (add-hook 'js-mode-hook 'flyspell-prog-mode)
+  )
+;;----------------------------------ASPEL-DICTIONARY-------------
+
+(add-hook 'prog-mode-hook '(lambda () (interactive) (column-marker-1 80)))
+(add-hook 'web-mode-hook '(lambda () (interactive) (column-marker-1 80)))
+(add-hook 'term-mode-hook (lambda() (setq yas-dont-activate t)))
+
+>>>>>>> f685aaa... Moved 98% of the hooks and key-bindings to use-package
 (global-set-key (kbd "M-z") 'shell-command)
 (global-set-key (kbd "C-x 2") 'my-window-split-v)
 (global-set-key (kbd "C-x 3") 'my-window-split-h)
 (global-set-key (kbd "C-x d") 'dired-jump)
 (global-set-key (kbd "C-x t") 'ansi-term)
 (global-set-key (kbd "S-SPC") 'recompile)
-(define-key evil-normal-state-map (kbd "C-h") 'evil-window-left)
-(define-key evil-normal-state-map (kbd "C-j") 'evil-window-down)
-(define-key evil-normal-state-map (kbd "C-k") 'evil-window-up)
-(define-key evil-normal-state-map (kbd "C-l") 'evil-window-right)
-(define-key evil-normal-state-map (kbd "z") 'org-open-at-point)
-(define-key evil-normal-state-map (kbd "Z") 'org-insert-link)
-(define-key evil-visual-state-map (kbd "L") 'end-of-line)
-(define-key evil-visual-state-map (kbd "H") 'beginning-of-line)
-(global-set-key (kbd "C-x C-m") 'move-file)
-
-;;This section uses the key-chord minor mode
-(setq key-chord-two-keys-delay  0.5) ;0.5 seconds delay time
-(key-chord-define evil-insert-state-map "jj" 'evil-normal-state)
-(key-chord-define evil-normal-state-map "rr" 'revert-buffer-no-confirm)
-(key-chord-define evil-normal-state-map "ff" 'ispell-word);Corrects singleWord
-(key-chord-define evil-normal-state-map "GG" 'org-agenda);Org-agenda
-(key-chord-mode 1)
-;; -------------------------------KeY-Maps--------------
 
 ;;  ) ;; !IMPORTANT for closing the file name handler, see begining of file
 (provide 'init.el)

  :config
  (setq-default web-mode-markup-indent-offset tab-width)
  (setq-default web-mode-php-indent-offset tab-width)
  )
;;------------------------------------------------

;;----------------------------------EMMET MODE--------------------------
(use-package emmet-mode
  :ensure t
  )
;;----------------------------------EMMET MODE--------------------------


(use-package org-bullets
  :ensure t
  :config
  <<<<<<< HEAD
  (add-hook 'org-mode-hook (lambda () (org-bullets-mode 1)))
  ;; (setq org-ellipsis "↷");Change the elipsies org mode to this arrow #Neat
  =======
  (setq org-ellipsis "↷");Change the elipsies org mode to this arrow #Neat
  (add-hook 'org-mode-hook (lambda () (org-bullets-mode 1)))
  >>>>>>> f685aaa... Moved 98% of the hooks and key-bindings to use-package
  )

;;------------------------ORG-mode-----------------------------------------
