diff --git a/books/void_packages.yaml b/books/void_packages.yaml
index 7934f93..5204000 100644
--- a/books/void_packages.yaml
+++ b/books/void_packages.yaml
@@ -1,7 +1,9 @@
 - name: Install basic custom void packages
   hosts: interface
   become: true
-  tags: interface
+  tags:
+    - interface
+    - packages
   tasks:
     - name: Set up keyd for custom key events
       community.general.xbps:
@@ -12,10 +14,10 @@
 
     - name: Install many fonts
       community.general.xbps:
-        name: "{{ packages_fonts }}"
+        name: "{{ fonts }}"
         state: "{{ desired_package_state }}"
       notify: installed-fonts
-      when: packages_fonts
+      when: fonts
 
   handlers:
     - name: Activate keyd service
diff --git a/inventory.yaml b/inventory.yaml
index e81a041..14c7e18 100644
--- a/inventory.yaml
+++ b/inventory.yaml
@@ -23,13 +23,32 @@ target_system:
 
 interface:
   hosts:
-    void:
+    target_system:
   vars:
-    packages_fonts:
+    fonts:
       - nerd-fonts-otf
       - noto-fonts-ttf
       - noto-fonts-cjk
       - noto-fonts-emoji
+    packages_de:
+      - bemenu
+      - pinentry-bemenu
+      - clipman
+      - grim
+      - kanshi
+      - mako
+      - slurp
+      - waylock
+    packages_gui:
+      - gimp
+      - qutebrowser
+      - sioyek
+      - wdisplays
+
+terminal:
+  hosts:
+    target_system:
+  vars:
     packages_terminal:
       - abduco
       - atuin
@@ -47,7 +66,7 @@ interface:
       - entr
       - eza
       - fd
-      - flavours
+      - flavours # TODO: To be replaced with tinty
       - fwupd
       - gallery-dl
       - git-lfs
@@ -91,17 +110,3 @@ interface:
       - zoxide
       - zr # zsh plugin manager
       - zsh
-    packages_de:
-      - bemenu
-      - pinentry-bemenu
-      - clipman
-      - grim
-      - kanshi
-      - mako
-      - slurp
-      - waylock
-    packages_gui:
-      - gimp
-      - qutebrowser
-      - sioyek
-      - wdisplays