diff --git a/utils.nix b/utils.nix
index 666779b..2caabb1 100644
--- a/utils.nix
+++ b/utils.nix
@@ -227,18 +227,34 @@ in {
     system = pkgs.lib.concatStrings [
       (mkSection "system" config.system [
         (typeString (mkOptional "hostname"))
-        (typeString (mkOptional "timezone"))
-        (typeBool (mkOptional "ttylogin"))
-        (typeInt (mkOptional "log_size"))
-        (typeInt (mkOptional "urandom_seed"))
-        (typeString (mkOptional "compat_version"))
-        (typeString (mkOptional "zonename"))
-        (typeString (mkOptional "log_proto"))
+        (typeString (mkOptional "description"))
+        (typeString (mkOptional "notes"))
+        (typeInt (mkOptional "buffersize"))
         (typeInt (mkOptional "conloglevel"))
         (typeInt (mkOptional "cronloglevel"))
+        (typeInt (mkOptional "klogconloglevel"))
+        (typeInt (mkOptional "log_buffer_size"))
+        (typeString (mkOptional "log_file"))
+        (typeString (mkOptional "log_hostname"))
+        (typeString (mkOptional "log_ip"))
+        (typeInt (mkOptional "log_port"))
+        (typeString (mkOptional "log_prefix"))
+        (typeString (mkOptional "log_proto"))
+        (typeInt (mkOptional "log_size"))
+        (typeBool (mkOptional "log_trailer_null"))
+        (typeString (mkOptional "log_type"))
+        (typeBool (mkOptional "ttylogin"))
+        (typeInt (mkOptional "urandom_seed"))
+        (typeString (mkOptional "timezone"))
+        (typeString (mkOptional "zonename"))
+        (typeString (mkOptional "zram_comp_algo"))
+        (typeInt (mkOptional "zram_size_mb"))
+        (typeString (mkOptional "compat_version"))
       ])
       (mkSections "timeserver" config.system [
-        (typeList (mkOptional "server"))
+        (typeBool (mkOptional "enabled"))
+        (typeBool (mkOptional "enable_server"))
+        (typeList (mkMandatory "server"))
       ])
       (mkSections "led" config.system [
         (typeString (mkOptional "name"))