diff --git a/system/base.sls b/system/base.sls
index 8a4df46..fb42062 100644
--- a/system/base.sls
+++ b/system/base.sls
@@ -6,6 +6,7 @@ system_base_pkgs:
       - openjdk17-jre-headless
       - jq
       - vim
+      - git
 
 system_base_bin_dir:
   file.directory:
diff --git a/system/init.sls b/system/init.sls
index d334958..b0613a1 100644
--- a/system/init.sls
+++ b/system/init.sls
@@ -7,4 +7,3 @@ include:
   - .user
   - .shell
   - .salt
-  - .localization
diff --git a/system/localization.sls b/system/localization.sls
deleted file mode 100644
index 7422b9b..0000000
--- a/system/localization.sls
+++ /dev/null
@@ -1,35 +0,0 @@
-# Localization
-
-# keyboard layout
-system_localization_keyboard_layout:
-  keyboard.system:
-    - name: de_CH-latin1
-
-system_localization_vconsole_conf:
-  file.managed:
-    - name: /etc/vconsole.conf
-    - user: root
-    - group: root
-    - mode: '0644'
-    - contents: KEYMAP=de_CH-latin1
-
-# Locale
-system_localization_locale_en_us_utf:
-  locale.present:
-    - name: en_US.UTF-8 UTF-8
-
-system_localization_locale_en_us_iso:
-  locale.present:
-    - name: en_US ISO-8859-1
-
-system_localization_locale_de_ch_utf:
-  locale.present:
-    - name: de_CH.UTF-8 UTF-8
-
-system_localization_locale_default:
-  file.managed:
-    - name: /etc/locale.conf
-    - user: root
-    - group: root
-    - mode: '0644'
-    - contents: 'LANG=en_US.UTF-8'
diff --git a/util/noveriablcgen.sls b/util/noveriablcgen.sls
index 2d0c0c5..b02d644 100644
--- a/util/noveriablcgen.sls
+++ b/util/noveriablcgen.sls
@@ -6,7 +6,7 @@ include:
 util_noveriablcgen_git:
   git.latest:
     - name: https://gitlab.com/noveria/tools/noveriablcgen.git
-    - target: {{ noveria.app_dir }}
+    - target: {{ noveria.app_dir }}/noveriablcgen
     - user: root
     - require:
       - system_base_apps_dir
@@ -25,7 +25,7 @@ util_noveriablcgen_link:
 util_noveriablcgen_config:
   file.managed:
     - name: {{ noveria.app_dir }}/noveriablcgen/noveriablcgen.json
-    - target: salt://{{ tpldir }}/files/noveriablcgen_config.json.jinja
+    - source: salt://{{ tpldir }}/files/noveriablcgen_config.json.jinja
     - template: jinja
     - context:
         BTRFS_ROOT: "/btrfs"