diff --git a/roles/debian_base/tasks/main.yml b/roles/debian_base/tasks/main.yml
deleted file mode 100755
index a40c320..0000000
--- a/roles/debian_base/tasks/main.yml
+++ /dev/null
@@ -1,41 +0,0 @@
----
-- name: Create groups
-  group:
-    name: "{{ item }}"
-    state: present
-  loop: "{{ init_groups }}"
-
-- name: Ensure Users are Configured Correctly
-  user:
-    name: "{{ item.value.name }}"
-    group: "{{ item.value.group }}"
-    groups: "{{ item.value.groups }}"
-    state: "{{ item.value.state }}"
-    create_home: "{{ item.value.create_home }}"
-    shell: "{{ item.value.shell }}"
-  loop: "{{ init_users | dict2items }}"
-
-- name: Create or ensure presence of custom home directories
-  file:
-    path: /home/opal/{{ item }}
-    state: directory
-    mode: '0755'
-    owner: opal
-    group: opal
-  loop: "{{ create_directories }}"
-
-- name: Remove default home directories if present
-  file:
-    path: /home/opal/{{ item }}
-    state: absent
-  loop: "{{ remove_directories }}"
-
-# SSH Initial Setup
-- name: Create/Ensure ~/.ssh directories
-  file:
-    path: "/home/{{ item.value.name }}/.ssh"
-    state: directory
-    mode: 0700
-    owner: "{{ item.value.name }}"
-    group: "{{ item.value.group }}"
-  loop: "{{ init_users | dict2items }}"
diff --git a/roles/debian_base/vars/main.yml b/roles/debian_base/vars/main.yml
deleted file mode 100755
index a9a605d..0000000
--- a/roles/debian_base/vars/main.yml
+++ /dev/null
@@ -1,33 +0,0 @@
----
-init_groups:
-  - wheel
-
-remove_directories:
-  - Templates
-  - Videos
-  - Documents
-  - Music
-  - Downloads
-  - Pictures
-  - Public
-  - Desktop
-
-create_directories:
-  - documents
-  - music
-  - downloads
-  - pictures
-  - scripts
-  - projects
-  - src
-  - .config
-
-init_users:
-  opal:
-    name: opal
-    group: opal
-    groups: 
-      - wheel
-    state: present
-    shell: /bin/bash
-    create_home: true
diff --git a/roles/debian_git/tasks/main.yml b/roles/debian_git/tasks/main.yml
deleted file mode 100755
index ad6bc08..0000000
--- a/roles/debian_git/tasks/main.yml
+++ /dev/null
@@ -1,34 +0,0 @@
----
-- name: doom emacs repo
-  become: yes
-  become_user: opal
-  git:
-    repo: "{{ doom_emacs_repo }}"
-    dest: "{{ doom_emacs_dest }}"
-    update: no
-
-- name: Create local font dir
-  file:
-    path: /home/opal/.local/share/fonts
-    state: directory
-    mode: '0755'
-    owner: opal
-    group: opal
-
-- name: et-book font repo
-  become: yes
-  become_user: opal
-  git:
-    repo: "{{ etbook_repo }}"
-    dest: "{{ etbook_dest }}"
-    update: no
-
-- name: Move ET-Book directory to fonts directory
-  copy:
-    src: "{{ etbook_dir }}"
-    dest: "{{ fonts_dir }}"
-
-- name: Move ET-Book Ligatures directory to fonts directory
-  copy:
-    src: "{{ etbook_lig_dir }}"
-    dest: "{{ fonts_dir }}"
diff --git a/roles/debian_git/vars/main.yml b/roles/debian_git/vars/main.yml
deleted file mode 100755
index b1dc19a..0000000
--- a/roles/debian_git/vars/main.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-doom_emacs_repo: https://github.com/doomemacs/doomemacs
-doom_emacs_dest: ~/.config/emacs
-
-etbook_repo: https://github.com/edwardtufte/et-book
-etbook_dest: ~/src/
-etbook_dir: ~/src/et-book/et-book
-etbook_lig_dir: ~/src/et-book/et-book-ligatures-enabled
-fonts_dir: ~/.local/share/fonts
diff --git a/roles/debian_pkg/tasks/main.yml b/roles/debian_pkg/tasks/main.yml
deleted file mode 100755
index d1cb5fa..0000000
--- a/roles/debian_pkg/tasks/main.yml
+++ /dev/null
@@ -1,42 +0,0 @@
----
-- name: Upgrade all packages
-  dnf5:
-    name: "*"
-    state: latest
-
-- name: Install window manager packages
-  package:
-    name: "{{ item }}"
-    state: present
-  loop: "{{ wm_packages }}"
-
-- name: Install UI/Font packages
-  dnf5:
-    name: "{{ item }}"
-    state: present
-  loop: "{{ ui_packages }}"
-
-- name: Install general packages
-  package:
-    name: "{{ item }}"
-    state: present
-  loop: "{{ general_packages }}"
-
-- name: Install Doom Emacs dependency packages
-  dnf5:
-    name: "{{ item }}"
-    state: present
-  loop: "{{ doom_dep_packages }}"
-
-- name: Add Flathub repository
-  flatpak_remote:
-    name: flathub
-    state: present
-    flatpakrepo_url: "https://flathub.org/repo/flathub.flatpakrepo"
-
-- name: Install Flatpak packages
-  flatpak:
-    name: "{{ item }}"
-    state: present
-  loop: "{{ flatpak_packages }}"
-
diff --git a/roles/debian_pkg/vars/main.yml b/roles/debian_pkg/vars/main.yml
deleted file mode 100755
index cc0a710..0000000
--- a/roles/debian_pkg/vars/main.yml
+++ /dev/null
@@ -1,76 +0,0 @@
----
-wm_packages:
-  - sway
-  - swayidle
-  - swaylock
-  - alacritty
-  - waybar
-  - dunst
-  - pipewire
-  - polkit-kde-agent-1
-  - grim
-  - grimshot
-  - brightnessctl
-  - wlsunset
-  - wlogout
-  - xwayland
-  - wdisplays
-  - bemenu
-  - wtype
-
-ui_packages:
-  - papirus-icon-theme
-  - arc-kde
-  - breeze-cursor-theme
-  - qt5ct
-  - qt6ct
-  #- fontawesome-fonts-all
-  #- google-noto-sans-cjk-fonts
-  #- google-noto-color-emoji-fonts
-  #- google-noto-emoji-fonts
-  - fonts-terminus
-
-general_packages:
-  - emacs
-  - syncthing
-  - gopass
-  - cups
-  - keychain
-  - tldr
-  - eza
-  - gnupg2
-  - trash-cli
-  - htop
-  - mpv
-  - udiskie
-  - pavucontrol
-  - flatpak
-  - blueman
-  - beets
-  - unrar-free
-  - unzip
-  - lximage-qt
-  - screen
-  - playerctl # for waybar music notification
-  - simple-scan
-  - wireguard-tools
-  - dnf-automatic
-  - translate-shell
-
-flatpak_packages:
-  - net.ankiweb.Anki
-  - org.torproject.torbrowser-launcher
-
-doom_dep_packages:
-  - ripgrep
-  - libtool     # Needed to compile vterm in Doom Emacs
-  - cmake       # Needed to compile vterm in Doom Emacs
-  - discount    # Markdown Compiler
-  - ShellCheck  # Shell linter for Doom Emacs
-  - python3-pyflakes
-  - python3-isort
-  - micropipenv
-  - python3-nose2
-  - python3-nose
-  - python3-pytest
-  - python3-lsp-black
diff --git a/roles/fedora_git/tasks/main.yml b/roles/fedora_git/tasks/main.yml
index ce2f25b..b146d80 100755
--- a/roles/fedora_git/tasks/main.yml
+++ b/roles/fedora_git/tasks/main.yml
@@ -14,7 +14,6 @@
     repo: "{{ etbook_repo }}"
     dest: "{{ etbook_dest }}"
     update: no
-    version: master
 
 - name: Move ET-Book directory to fonts directory
   copy:
diff --git a/roles/fedora_git/vars/main.yml b/roles/fedora_git/vars/main.yml
index b1dc19a..bf79d00 100755
--- a/roles/fedora_git/vars/main.yml
+++ b/roles/fedora_git/vars/main.yml
@@ -3,7 +3,10 @@ doom_emacs_repo: https://github.com/doomemacs/doomemacs
 doom_emacs_dest: ~/.config/emacs
 
 etbook_repo: https://github.com/edwardtufte/et-book
-etbook_dest: ~/src/
+etbook_dest: ~/src/et-book
 etbook_dir: ~/src/et-book/et-book
 etbook_lig_dir: ~/src/et-book/et-book-ligatures-enabled
 fonts_dir: ~/.local/share/fonts
+
+
+
diff --git a/roles/fedora_pkg/tasks/main.yml b/roles/fedora_pkg/tasks/main.yml
index d1cb5fa..15999bd 100755
--- a/roles/fedora_pkg/tasks/main.yml
+++ b/roles/fedora_pkg/tasks/main.yml
@@ -4,6 +4,12 @@
     name: "*"
     state: latest
 
+- name: Enable guix repo for extra guile packages
+  copr:
+    host: copr.fedorainfracloud.org
+    state: enabled
+    name: lantw44/guix
+
 - name: Install window manager packages
   package:
     name: "{{ item }}"
@@ -39,4 +45,3 @@
     name: "{{ item }}"
     state: present
   loop: "{{ flatpak_packages }}"
-
diff --git a/roles/fedora_pkg/vars/main.yml b/roles/fedora_pkg/vars/main.yml
index b71eaee..633633c 100755
--- a/roles/fedora_pkg/vars/main.yml
+++ b/roles/fedora_pkg/vars/main.yml
@@ -57,6 +57,7 @@ general_packages:
   - wireguard-tools
   - dnf-automatic
   - translate-shell
+  - guile-json
 
 flatpak_packages:
   - net.ankiweb.Anki