diff --git a/oni/home/services/compton.scm b/oni/home/services/compton.scm
index a1aedf6..1097ec6 100644
--- a/oni/home/services/compton.scm
+++ b/oni/home/services/compton.scm
@@ -82,7 +82,7 @@
        (home-picom-configuration-config config))))
 
 (define (home-picom-files-service config)
-  `(("config/picom/picom.conf"
+  `(("picom/picom.conf"
      ,(home-picom-config-file config))))
 
 (define (home-picom-profile-service config)
@@ -116,7 +116,7 @@
   (service-type (name 'home-picom)
                 (extensions
                  (list (service-extension
-                        home-files-service-type
+                        home-xdg-configuration-files-service-type
                         home-picom-files-service)
                        (service-extension
                         home-profile-service-type
diff --git a/oni/home/services/kitty.scm b/oni/home/services/kitty.scm
index cb44be3..78056da 100644
--- a/oni/home/services/kitty.scm
+++ b/oni/home/services/kitty.scm
@@ -31,7 +31,7 @@
   (string-join (map serialize-kitty-setting (home-kitty-configuration-configuration config)) "\n" 'suffix))
 
 (define (kitty-home-files config)
-  `(("config/kitty/kitty.conf"
+  `(("kitty/kitty.conf"
      ,(mixed-text-file
        "kitty.conf"
        (serialize-kitty-config config)))))
@@ -44,7 +44,7 @@
    (name 'home-kitty)
    (extensions
     (list (service-extension
-           home-files-service-type
+           home-xdg-configuration-files-service-type
            kitty-home-files)
           (service-extension
            home-profile-service-type
diff --git a/oni/home/services/xdisorg.scm b/oni/home/services/xdisorg.scm
index 1f3bdf7..a207e20 100644
--- a/oni/home/services/xdisorg.scm
+++ b/oni/home/services/xdisorg.scm
@@ -108,7 +108,7 @@
   (string-join (map format-rofi-theme theme) "\n"))
 
 (define (home-rofi-files-service conf)
-  `(("config/rofi/config.rasi"
+  `(("rofi/config.rasi"
      ,(apply mixed-text-file
         "config.rasi"
         (append
@@ -118,7 +118,7 @@
          ;; Apply theme
          (if (not (eq? (home-rofi-configuration-theme conf) '()))
              (list "\n@theme \"guix\"\n") '()))))
-    ("config/rofi/guix.rasi"
+    ("rofi/guix.rasi"
      ,(mixed-text-file
         "guix.rasi"
         (serialize-rofi-theme
@@ -149,7 +149,7 @@
   (service-type (name 'home-rofi)
                 (extensions
                  (list (service-extension
-                        home-files-service-type
+                        home-xdg-configuration-files-service-type
                         home-rofi-files-service)
                        (service-extension
                         home-profile-service-type