diff --git a/90-default.preset b/90-default.preset
index e2f5378..cc0bdfa 100644
--- a/90-default.preset
+++ b/90-default.preset
@@ -19,45 +19,57 @@ enable rsyslog.*
 enable syslog-ng.*
 enable sysklogd.*
 
+# Network facing
+enable firewalld.service
+enable iptables.service
+enable ip6tables.service
+enable isdn.service
+enable libvirtd.service
+enable xinetd.service
+enable ladvd.service
+
+# Probably something to statically enable
+enable firstboot-graphical.service
+
+# Storage
+enable multipathd.service
+enable libstoragemgmt.service
+enable lvm2-monitor.*
+enable lvm2-lvmetad.*
+enable dm-event.*
+
+# https://bugzilla.redhat.com/show_bug.cgi?id=855372
+enable mdmonitor.service
+enable mdmonitor-takeover.service
+
+# Hardware
+enable gpm.service
+enable gpsd.service
+enable irqbalance.service
+enable lm_sensors.service
+enable mcelog.service
+enable acpid.service
+enable smartd.service
+enable pcscd.*
+
+# https://bugzilla.redhat.com/show_bug.cgi?id=850814
+enable arp-ethers.service
+
 # Other stuff
 enable abrtd.service
 enable abrt-ccpp.service
 enable abrt-oops.service
 enable abrt-xorg.service
 enable abrt-vmcore.service
-enable acpid.service
-enable firewalld.service
-enable multipathd.service
-enable firstboot-graphical.service
-enable gpm.service
-enable gpsd.service
-enable iptables.service
-enable ip6tables.service
-enable irqbalance.service
-enable isdn.service
-enable ladvd.service
-enable libstoragemgmt.service
-enable libvirtd.service
-enable lm_sensors.service
 enable lttng-sessiond.service
-enable lvm2-monitor.*
-enable lvm2-lvmetad.*
-enable dm-event.*
-enable mcelog.service
-enable packagekit-offline-update.service
-enable pcscd.*
 enable ksm.service
 enable ksmtuned.service
 enable rootfs-resize.service
-enable smartd.service
 enable sysstat.service
 enable uuidd.service
 enable xendomains.service
-enable xendomains.service
 enable xenstored.service
 enable xenconsoled.service
-enable xinetd.service
-enable dirsrv-admin.service
 
 # Desktop stuff
 enable accounts-daemon.service
@@ -66,13 +78,7 @@ enable upower.service
 enable gdm.service
 enable udisks2.service
 enable polkit.service
-
-# https://bugzilla.redhat.com/show_bug.cgi?id=850814
-enable arp-ethers.service
-
-# https://bugzilla.redhat.com/show_bug.cgi?id=855372
-enable mdmonitor.service
-enable mdmonitor-takeover.service
+enable packagekit-offline-update.service
 
 # Enforce Fedora's disable-by-default policy
 disable *