diff --git a/operating-systems/buer.scm b/operating-systems/buer.scm
index 7b6b2f1..c1ed84e 100644
--- a/operating-systems/buer.scm
+++ b/operating-systems/buer.scm
@@ -1,37 +1,58 @@
 #|Modules|#
-(use-modules
- #|GNU  |# (gnu)
- #|Guix |# (guix)
- #|Radix|# (radix artwork)
-           (radix packages admin)
-           (radix packages linux)
-           (radix packages text-editors)
-           (radix packages shells)
-           (radix services admin)
-           (radix services pm)
-           (radix system setuid)
-           (radix secrets)
-           (radix utils)
-           ((radix files substitute-keys) #:prefix public-key:)
-           ((radix files thinkfan)        #:prefix file:thinkfan-))
+(define-module (radix operating-systems buer)
+ #|GNU|#
+ #:use-module (gnu)
 
-(use-service-modules
- #|A|# admin avahi
- #|D|# dbus desktop
- #|M|# mcron
- #|N|# linux networking
- #|P|# pm
- #|S|# sound sysctl)
+ #|GNU packages|#
+ #|A|# #:use-module (gnu packages admin)
+       #:use-module (gnu packages android)
+ #|B|# #:use-module (gnu packages base)
+ #|C|# #:use-module (gnu packages certs)
+       #:use-module (gnu packages compression)
+ #|G|# #:use-module (gnu packages gawk)
+       #:use-module (gnu packages glib)
+       #:use-module (gnu packages guile)
+       #:use-module (gnu packages guile-xyz)
+ #|L|# #:use-module (gnu packages less)
+       #:use-module (gnu packages linux)
+ #|M|# #:use-module (gnu packages man)
+ #|T|# #:use-module (gnu packages texinfo)
+ #|V|# #:use-module (gnu packages vpn)
 
-(use-package-modules
- #|A|# admin android
- #|B|# base
- #|C|# certs compression
- #|G|# gawk glib guile guile-xyz
- #|L|# less linux
- #|M|# man
- #|T|# texinfo
- #|V|# vpn)
+ #|GNU services|#
+ #|A|# #:use-module (gnu services admin)
+       #:use-module (gnu services avahi)
+ #|D|# #:use-module (gnu services dbus)
+       #:use-module (gnu services desktop)
+ #|M|# #:use-module (gnu services mcron)
+ #|N|# #:use-module (gnu services linux)
+       #:use-module (gnu services networking)
+ #|P|# #:use-module (gnu services pm)
+ #|S|# #:use-module (gnu services sound)
+       #:use-module (gnu services sysctl)
+
+ #|Guix|#
+ #:use-module (guix)
+
+ #|Radix|#
+ #:use-module (radix)
+
+ #|Radix packages|#
+ #|A|# #:use-module (radix packages admin)
+ #|L|# #:use-module (radix packages linux)
+ #|T|# #:use-module (radix packages text-editors)
+ #|S|# #:use-module (radix packages shells)
+
+ #|Radix services|#
+ #|A|# #:use-module (radix services admin)
+ #|P|# #:use-module (radix services pm)
+
+ #|Radix system|#
+ #|S|# #:use-module (radix system setuid)
+
+ #|Radix files|#
+ #|S|# #:use-module ((radix files substitute-keys) #:prefix public-key:)
+ #|T|# #:use-module ((radix files thinkfan)        #:prefix file:thinkfan-))
 
 #|Operating system definition|#
 (operating-system