diff --git a/ansible/roles/plainmacs/files/plainmacs b/ansible/roles/plainmacs/files/plainmacs
index c8609a7..d6d9d49 100755
--- a/ansible/roles/plainmacs/files/plainmacs
+++ b/ansible/roles/plainmacs/files/plainmacs
@@ -1,22 +1,27 @@
 #!/usr/bin/env bash
 #
 
-exec emacs -q --eval "(progn
+INIT_SCRIPT=$(cat <<EOF
+(progn
      (setq make-backup-files nil auto-save-default nil create-lockfiles nil)
      (load-theme 'tango-dark t)
-     (set-face-attribute 'default nil :background \"black\")
+     (set-face-attribute 'default nil :background "black")
      ;; Bright yellow highlighting for selected region
-     (set-face-attribute 'region nil :background \"#ffff50\" :foreground \"black\")
+     (set-face-attribute 'region nil :background "#ffff50" :foreground "black")
      ;; Bright green cursor to distinguish from yellow region
-     (set-cursor-color \"#ccff66\")
+     (set-cursor-color "#ccff66")
      ;; Hightlight the current line
-     (set-face-attribute 'line-number-current-line nil :foreground \"white\")
+     (set-face-attribute 'line-number-current-line nil :foreground "white")
      ;; Set default font
-     (set-face-attribute 'default nil :height 100 :width 'regular :weight 'regular :family \"Cascadia Mono\")
+     (set-face-attribute 'default nil :height 100 :width 'regular :weight 'regular :family "Cascadia Mono")
      ;; Set fallback font for unicode glyphs
-     (set-fontset-font \"fontset-default\" nil (font-spec :name \"Noto Color Emoji\"))
+     (set-fontset-font "fontset-default" nil (font-spec :name "Noto Color Emoji"))
      (menu-bar-mode -1)
      (when (fboundp 'tool-bar-mode)
            (tool-bar-mode -1))
      (when (  fboundp 'scroll-bar-mode)
-           (scroll-bar-mode -1)))" "${@}"
+           (scroll-bar-mode -1)))
+EOF
+)
+
+exec emacs -q --eval "$INIT_SCRIPT" "${@}"
diff --git a/ansible/roles/plainmacs/files/zshrc_plainmacs b/ansible/roles/plainmacs/files/zshrc_plainmacs
new file mode 100644
index 0000000..2b79c86
--- /dev/null
+++ b/ansible/roles/plainmacs/files/zshrc_plainmacs
@@ -0,0 +1 @@
+export EDITOR='/usr/local/bin/plainmacs'
diff --git a/ansible/roles/plainmacs/tasks/peruser.yaml b/ansible/roles/plainmacs/tasks/peruser.yaml
index 111e886..9846c52 100644
--- a/ansible/roles/plainmacs/tasks/peruser.yaml
+++ b/ansible/roles/plainmacs/tasks/peruser.yaml
@@ -1,26 +1,15 @@
 - include_role:
     name: per_user
 
-# - name: Create directories
-#   file:
-#     name: "{{ account_homedir.stdout }}/{{ item }}"
-#     state: directory
-#     mode: 0700
-#     owner: "{{ account_name.stdout }}"
-#     group: "{{ group_name.stdout }}"
-#   loop:
-#     - ".config/foo"
-
-# - name: Copy files
-#   copy:
-#     src: "files/{{ item.src }}"
-#     dest: "{{ account_homedir.stdout }}/{{ item.dest }}"
-#     mode: 0600
-#     owner: "{{ account_name.stdout }}"
-#     group: "{{ group_name.stdout }}"
-#   loop:
-#     - src: foo.conf
-#       dest: .config/foo/foo.conf
+- name: Configure zshrc additional imports
+  copy:
+    src: "files/zshrc_{{ item }}"
+    dest: "{{ account_homedir.stdout }}/.config/ansible_deploy/zshrc/{{ item }}.zsh"
+    mode: 0600
+    owner: "{{ account_name.stdout }}"
+    group: "{{ group_name.stdout }}"
+  loop:
+    - plainmacs
 
 - import_tasks: tasks/peruser_freebsd.yaml
   when: 'os_flavor == "freebsd"'