diff --git a/config/key-bindings.el b/config/key-bindings.el
index d0f2e97..91cbcb3 100644
--- a/config/key-bindings.el
+++ b/config/key-bindings.el
@@ -11,6 +11,8 @@
 (global-set-key (kbd "s-<left>") 'beginning-of-line)
 (global-set-key (kbd "s-<up>") 'scroll-down) ; WTF is this reverse, I dunno
 (global-set-key (kbd "s-<down>") 'scroll-up)
+(global-set-key (kbd "<f8>") 'purpose-big-screen)
+(global-set-key (kbd "<f7>") 'purpose-small-screen)
 
 (require 'evil-leader)
 ;;;;;;;;; EVIL Leader ;;;;;;;;;;;;;;;;;;;;;;;;
diff --git a/config/packages.el b/config/packages.el
index 04e837c..f909aa0 100644
--- a/config/packages.el
+++ b/config/packages.el
@@ -193,11 +193,8 @@
 (unless (package-installed-p 'haskell-mode)
   (package-install 'haskell-mode))
 
-(unless (package-installed-p 'scion)
-  (package-install 'scion))
-
-(unless (package-installed-p 'company-ghci)
-  (package-install 'company-ghci))
+(unless (package-installed-p 'company-ghc)
+  (package-install 'company-ghc))
 
 ;; Scala
 (unless (package-installed-p 'scala-mode)
@@ -216,6 +213,9 @@
 (unless (package-installed-p 'toml-mode)
   (package-install 'toml-mode))
 
+(unless (package-installed-p 'flycheck-rust)
+  (package-install 'flycheck-rust))
+
 ;; Python
 (unless (package-installed-p 'elpy)
   (package-install 'elpy))
diff --git a/config/windows.el b/config/windows.el
index 436a926..d8911a7 100644
--- a/config/windows.el
+++ b/config/windows.el
@@ -34,12 +34,14 @@
 (add-to-list 'purpose-user-mode-purposes '(elixir-mode . code))
 (add-to-list 'purpose-user-mode-purposes '(rust-mode . code))
 (add-to-list 'purpose-user-mode-purposes '(haskell-mode . code))
+(add-to-list 'purpose-user-mode-purposes '(haskell-cabal-mode . code))
 (add-to-list 'purpose-user-mode-purposes '(web-mode . code))
 (add-to-list 'purpose-user-mode-purposes '(java-mode . code))
 (add-to-list 'purpose-user-mode-purposes '(python-mode . code))
 (add-to-list 'purpose-user-mode-purposes '(js-mode . code))
 (add-to-list 'purpose-user-mode-purposes '(emacs-lisp-mode . code))
 (add-to-list 'purpose-user-mode-purposes '(sql-mode . code))
+(add-to-list 'purpose-user-mode-purposes '(yaml-mode . code))
 
 ;; Other files that fall into 'code'
 (add-to-list 'purpose-user-mode-purposes '(xml-mode . code))
@@ -57,8 +59,14 @@
 (setq purpose-use-default-configuration nil)
 (purpose-compile-user-configuration)
 
-;; Load configuration by default
-(if (display-graphic-p)
-    (progn
-      (purpose-load-window-layout "coding_with_magit")))
+;; Functions for changing layout
+(defun purpose-big-screen ()
+  "Load coding_with_magit."
+  (interactive)
+  (purpose-load-window-layout "coding_with_magit"))
+
+(defun purpose-small-screen ()
+  "Load small_screen."
+  (interactive)
+  (purpose-load-window-layout "small_screen"))
 ;;; windows.el ends here
diff --git a/init.el b/init.el
index 9a9002a..f830f49 100644
--- a/init.el
+++ b/init.el
@@ -27,7 +27,7 @@
  ;; If there is more than one, they won't work right.
  '(package-selected-packages
    (quote
-    (company-ghci scion hlinum etags-select nvm tide yaml-mode window-purpose web-mode ujelly-theme toml-mode smart-mode-line scala-mode rvm ruby-end rspec-mode robe rainbow-mode rainbow-delimiters racer pyenv-mode noctilux-theme monokai-theme markdown-mode less-css-mode json-reformat jade-mode indent-guide helm-themes helm-projectile helm-ag haskell-mode haml-mode groovy-mode flymake-ruby flymake-cursor flycheck flatui-theme exec-path-from-shell evil-nerd-commenter evil-magit evil-leader elpy dumb-jump dockerfile-mode diff-hl dash-at-point company-tern company-racer company-jedi column-enforce-mode color-theme-approximate base16-theme atom-one-dark-theme alchemist aggressive-indent ag)))
+    (flycheck-rust company-ghc company-ghci scion hlinum etags-select nvm tide yaml-mode window-purpose web-mode ujelly-theme toml-mode smart-mode-line scala-mode rvm ruby-end rspec-mode robe rainbow-mode rainbow-delimiters racer pyenv-mode noctilux-theme monokai-theme markdown-mode less-css-mode json-reformat jade-mode indent-guide helm-themes helm-projectile helm-ag haskell-mode haml-mode groovy-mode flymake-ruby flymake-cursor flycheck flatui-theme exec-path-from-shell evil-nerd-commenter evil-magit evil-leader elpy dumb-jump dockerfile-mode diff-hl dash-at-point company-tern company-racer company-jedi column-enforce-mode color-theme-approximate base16-theme atom-one-dark-theme alchemist aggressive-indent ag)))
  '(safe-local-variable-values (quote ((encoding . utf-8)))))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
diff --git a/languages/haskell.el b/languages/haskell.el
index 4bb00c7..7704e46 100644
--- a/languages/haskell.el
+++ b/languages/haskell.el
@@ -15,7 +15,7 @@
   (flycheck-mode 1)
   (flymake-mode 1)
   (set (make-local-variable 'company-backends)
-       '((company-ghci company-capf company-etags company-dabbrev-code
+       '((company-ghc company-capf company-etags company-dabbrev-code
                         company-yasnippet company-files))))
 
 :;========== Scion mode ============================
@@ -24,7 +24,7 @@
 ;;   (scion-mode 1))
 
 ;;========== Hooks =================================
-(add-hook 'haskell-mode-hook 'edito-config-haskell)
+(add-hook 'haskell-mode-hook 'editor-config-haskell)
 (add-hook 'haskell-mode-hook 'completion-config-haskell)
 ;; (add-hook 'haskell-mode-hook 'scion-config-haskell)
 
diff --git a/languages/rust.el b/languages/rust.el
index 438a557..b939a3b 100644
--- a/languages/rust.el
+++ b/languages/rust.el
@@ -16,6 +16,7 @@
   (company-mode 1)
   (flycheck-mode 1)
   (flymake-mode 1)
+  (flycheck-rust-setup)
   (set (make-local-variable 'company-backends)
        '((company-racer company-capf company-dabbrev-code company-yasnippet
                         company-files))))