diff --git a/.emacs.d/defaultcontent/defaultcontent.el b/emacs.d/defaultcontent/defaultcontent.el
similarity index 100%
rename from .emacs.d/defaultcontent/defaultcontent.el
rename to emacs.d/defaultcontent/defaultcontent.el
diff --git a/.emacs.d/defaultcontent/templates/c-insert.c b/emacs.d/defaultcontent/templates/c-insert.c
similarity index 100%
rename from .emacs.d/defaultcontent/templates/c-insert.c
rename to emacs.d/defaultcontent/templates/c-insert.c
diff --git a/.emacs.d/defaultcontent/templates/pl-insert.pl b/emacs.d/defaultcontent/templates/pl-insert.pl
similarity index 100%
rename from .emacs.d/defaultcontent/templates/pl-insert.pl
rename to emacs.d/defaultcontent/templates/pl-insert.pl
diff --git a/.emacs.d/defaultcontent/templates/pm-insert.pm b/emacs.d/defaultcontent/templates/pm-insert.pm
similarity index 100%
rename from .emacs.d/defaultcontent/templates/pm-insert.pm
rename to emacs.d/defaultcontent/templates/pm-insert.pm
diff --git a/.emacs.d/defaultcontent/templates/rkt-insert.rkt b/emacs.d/defaultcontent/templates/rkt-insert.rkt
similarity index 100%
rename from .emacs.d/defaultcontent/templates/rkt-insert.rkt
rename to emacs.d/defaultcontent/templates/rkt-insert.rkt
diff --git a/.emacs.d/init.el b/emacs.d/init.el
similarity index 70%
rename from .emacs.d/init.el
rename to emacs.d/init.el
index cff2374..d72b067 100644
--- a/.emacs.d/init.el
+++ b/emacs.d/init.el
@@ -14,7 +14,6 @@
     (powershell use-package flx flx-ido ac-c-headers ac-html ac-html-bootstrap auto-complete-exuberant-ctags brutal-theme python rainbow-delimiters racket-mode swift-helpful swift-mode swift-playground-mode swift3-mode project-shells projectile-codesearch projectile-rails projectile-variable purple-haze-theme org-journal org-journal-list org-kindle org-multi-wiki org-projectile org-wc 0blayout ego org-analyzer org-board org-d20 org-ac org-beautify-theme org-brain org-clock-today org-gcal org-static-blog org-sync org-sync-snippets org-timeline org-trello org powerline-evil yaml-mode yasnippet-classic-snippets yasnippet-snippets snippet smex qt-pro-mode qml-mode paradox osx-trash osx-plist osx-org-clock-menubar osx-lib osx-dictionary osx-clipboard osx-browse nixpkgs-fmt nix-mode neotree magit haskell-mode flycheck evil-surround evil-smartparens evil-org evil-leader elscreen elpa-mirror elixir-yasnippets elixir-mode editorconfig-custom-majormode diminish-buffer diminish auto-complete-distel auto-complete-c-headers arduino-mode airline-themes ac-clang abyss-theme)))
  '(paradox-automatically-star nil))
 
-
 (setq inhibit-splash-screen t)
 
 (add-to-list 'load-path "~/.emacs.d/loadins")
@@ -31,26 +30,10 @@
 (load "perl-hooks.el")
 (load "hooks.el")
 (load "projectile.el")
+(load "text-vars.el")
+(load "themeing.el")
 
-(setq text-width       4
-      standard-indent  4
-      indent-tabs-mode t
-      c-basic-style    "k&r"
-      c-basic-offset   4
-      )
-
-(load-theme 'abyss)
-(powerline-default-theme)
-(load-theme 'airline-molokai)
 (elscreen-start)
 (evil-mode 1)
 (editorconfig-mode 1)
 (projectile-mode +1)
-(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.
- '(default ((t (:inherit nil :stipple nil :background "#050000" :foreground "#bbe0f0" :inverse-video nil :box nil :strike-through nil :overline nil :underline nil :slant normal :weight normal :height 181 :width normal :foundry "nil" :family "Source Code Pro"))))
- '(bold ((t (:weight bold))))
- '(variable-pitch ((t (:inherit nil :stipple nil :background "#050000" :foreground "#bbe0f0" :inverse-video nil :box nil :strike-through nil :overline nil :underline nil :slant normal :weight normal :height 181 :width normal :foundry "nil" :family "Source Sans Pro")))))
diff --git a/.emacs.d/loadins/autoinsert-options.el b/emacs.d/loadins/autoinsert-options.el
similarity index 100%
rename from .emacs.d/loadins/autoinsert-options.el
rename to emacs.d/loadins/autoinsert-options.el
diff --git a/.emacs.d/loadins/backups.el b/emacs.d/loadins/backups.el
similarity index 100%
rename from .emacs.d/loadins/backups.el
rename to emacs.d/loadins/backups.el
diff --git a/.emacs.d/loadins/darwin.el b/emacs.d/loadins/darwin.el
similarity index 100%
rename from .emacs.d/loadins/darwin.el
rename to emacs.d/loadins/darwin.el
diff --git a/.emacs.d/loadins/evil-bindings.el b/emacs.d/loadins/evil-bindings.el
similarity index 100%
rename from .emacs.d/loadins/evil-bindings.el
rename to emacs.d/loadins/evil-bindings.el
diff --git a/.emacs.d/loadins/graphical.el b/emacs.d/loadins/graphical.el
similarity index 100%
rename from .emacs.d/loadins/graphical.el
rename to emacs.d/loadins/graphical.el
diff --git a/.emacs.d/loadins/haskell-hooks.el b/emacs.d/loadins/haskell-hooks.el
similarity index 100%
rename from .emacs.d/loadins/haskell-hooks.el
rename to emacs.d/loadins/haskell-hooks.el
diff --git a/.emacs.d/loadins/hooks.el b/emacs.d/loadins/hooks.el
similarity index 100%
rename from .emacs.d/loadins/hooks.el
rename to emacs.d/loadins/hooks.el
diff --git a/.emacs.d/loadins/org-vars.el b/emacs.d/loadins/org-vars.el
similarity index 100%
rename from .emacs.d/loadins/org-vars.el
rename to emacs.d/loadins/org-vars.el
diff --git a/.emacs.d/loadins/packages.el b/emacs.d/loadins/packages.el
similarity index 100%
rename from .emacs.d/loadins/packages.el
rename to emacs.d/loadins/packages.el
diff --git a/.emacs.d/loadins/perl-hooks.el b/emacs.d/loadins/perl-hooks.el
similarity index 100%
rename from .emacs.d/loadins/perl-hooks.el
rename to emacs.d/loadins/perl-hooks.el
diff --git a/.emacs.d/loadins/projectile.el b/emacs.d/loadins/projectile.el
similarity index 100%
rename from .emacs.d/loadins/projectile.el
rename to emacs.d/loadins/projectile.el
diff --git a/emacs.d/loadins/text-vars.el b/emacs.d/loadins/text-vars.el
new file mode 100644
index 0000000..c326152
--- /dev/null
+++ b/emacs.d/loadins/text-vars.el
@@ -0,0 +1,6 @@
+(setq text-width       4
+      standard-indent  4
+      indent-tabs-mode t
+      c-basic-style    "k&r"
+      c-basic-offset   4
+      )
diff --git a/emacs.d/loadins/themeing.el b/emacs.d/loadins/themeing.el
new file mode 100644
index 0000000..40f6fb9
--- /dev/null
+++ b/emacs.d/loadins/themeing.el
@@ -0,0 +1,11 @@
+(load-theme 'abyss)
+(powerline-default-theme)
+(load-theme 'airline-molokai)
+(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.
+ '(default ((t (:inherit nil :stipple nil :background "#050000" :foreground "#bbe0f0" :inverse-video nil :box nil :strike-through nil :overline nil :underline nil :slant normal :weight normal :height 181 :width normal :foundry "nil" :family "Source Code Pro"))))
+ '(bold ((t (:weight bold))))
+ '(variable-pitch ((t (:inherit nil :stipple nil :background "#050000" :foreground "#bbe0f0" :inverse-video nil :box nil :strike-through nil :overline nil :underline nil :slant normal :weight normal :height 181 :width normal :foundry "nil" :family "Source Sans Pro")))))
diff --git a/install-packages.el b/install-packages.el
new file mode 100644
index 0000000..ce659a6
--- /dev/null
+++ b/install-packages.el
@@ -0,0 +1,44 @@
+;;; install-packages.el
+
+;; Author: Rachel Fae Fox <fox@foxiepa.ws>
+;; URL: https://git.foxiepa.ws/foxiepaws/dotfiles/
+
+(add-to-list 'load-path (expand-file-name "~/.emacs.d/defaultcontent/"))
+(setq gnutls-algorithm-priority "NORMAL:-VERS-TLS1.3")
+(require 'package)
+(add-to-list 'package-archives
+             '("melpa" . "https://melpa.org/packages/") t)
+(package-initialize)
+
+(defvar eyecandy '(smex abyss-theme airline-themes powerline powerline-evil
+			rainbow-delimiters purple-haze-theme org-beautify-theme))
+(defvar osx '(osx-plist osx-dictionary osx-clipboard osx-browse swift-mode
+			swift-playground-mode swift3-mode swift-helpful osx-lib osx-trash))
+(defvar orgstuff '(org org-journal org-journal-list org-kindle org-multi-wiki org-projectile org-wc ego
+		       org-analyzer org-board org-d20 org-ac 
+		       org-brain org-clock-today org-gcal org-static-blog org-sync
+		       org-sync-snippets org-timeline org-trello))
+(defvar langs '(python racket-mode yaml-mode nixpkgs-fmt nix-mode haskell-mode elixir-mode
+		       arduino-mode qml-mode qt-pro-mode))
+(defvar evil '(evil evil-leader evil-org evil-smartparens evil-surround evil-collection))
+(defvar extras '(magit elscreen projectile flx flx-ido diminish diminish-buffer neotree
+		       paradox use-package editorconfig editorconfig-custom-majormode))
+(defvar progtools '(flycheck ac-c-headers ac-html ac-html-bootstrap elixir-yasnippets ac-clang
+			     auto-complete-distel auto-complete-c-headers auto-complete-exuberant-ctags
+			     yasnippet-classic-snippets yasnippet-snippets snippet))
+(defvar projectmanagement '(projectile projectile-rails projectile-codesearch projectile-variable project-shells))
+
+(let ((my-packages (append eyecandy osx orgstuff langs evil extras progtools projectmanagement)))
+
+(defun my-packages-installed-p ()
+  (cl-loop for p in my-packages
+           when (not (package-installed-p p)) do (cl-return nil)
+           finally (cl-return t)))
+
+(unless (my-packages-installed-p)
+  ;; check for new packages (package versions)
+  (package-refresh-contents)
+  ;; install the missing packages
+  (dolist (p my-packages)
+    (when (not (package-installed-p p))
+      (package-install p)))))
diff --git a/setup.sh b/setup.sh
new file mode 100644
index 0000000..e3fd780
--- /dev/null
+++ b/setup.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env sh
+
+ln -s zlogin ~/.zlogin
+ln -s zshrc ~/.zshrc
+ln -s emacs.d ~/.emacs.d
+ln -s vimrc .vimrc 
+mkdir -p ~/.bin
+emacs --script install-packages.el
diff --git a/zlogin b/zlogin
new file mode 100644
index 0000000..1d8608d
--- /dev/null
+++ b/zlogin
@@ -0,0 +1,17 @@
+EDITOR=emacs
+PATH="$HOME/.bin:$PATH"
+PAGER=most
+export EDITOR PATH PAGER
+
+# Load additions
+case $OSTYPE in
+    darwin*)
+	[-f ~/.dotfiles/zlogin_mac ] && . ~/.dotfiles/zlogin_mac
+	;;
+    freebsd*)
+	[-f ~/.dotfiles/zlogin_bsd ] && . ~/.dotfiles/zlogin_bsd
+	;;
+    linux-gnu)
+	[-f ~/.dotfiles/zlogin_linux ] && . ~/.dotfiles/zlogin_linux
+	;;
+esac
diff --git a/zshrc b/zshrc
new file mode 100644
index 0000000..232c46c
--- /dev/null
+++ b/zshrc
@@ -0,0 +1,25 @@
+HISTFILE=~/.histfile
+HISTSIZE=1000
+SAVEHIST=1000
+bindkey -e
+zstyle :compinstall filename "$HOME/.zshrc"
+autoload -Uz compinit
+compinit
+autoload -Uz promptinit
+promptinit
+prompt clint
+
+export PATH=$HOME/.bin:$PATH
+
+# Load additions
+case $OSTYPE in
+    darwin*)
+	. ~/.dotfiles/zshrc_mac
+	;;
+    freebsd*)
+	. ~/.dotfiles/zshrc_bsd
+	;;
+    linux-gnu)
+	. ~/.dotfiles/zshrc_linux
+	;;
+esac