diff --git a/yolk.rhai b/yolk.rhai
index 898c9e7..7261574 100644
--- a/yolk.rhai
+++ b/yolk.rhai
@@ -1,17 +1,18 @@
 export const device = #{
     thinkix: SYSTEM.hostname == "thinkix",
-    desktop: SYSTEM.hostname == "fedora.fritz.box" ||SYSTEM.hostname == "fedora",
-    laptop: SYSTEM.hostname == "thinkix" || SYSTEM.hostname == "frissnix",
+    desktop: SYSTEM.hostname == "fedora.fritz.box" || SYSTEM.hostname == "fedora",
+    laptop: SYSTEM.hostname == "thinkix"
+        || SYSTEM.hostname == "frissnix"
+        || SYSTEM.device_name == "Matthiass MacBook Pro",
 
     linux: SYSTEM.platform == "Linux",
     windows: SYSTEM.platform == "Windows",
 
-    macbook: "Matthiass-MacBook-Pro" in SYSTEM.hostname,
-    kenbun: "Matthiass-MacBook-Pro" in SYSTEM.hostname,
+    macbook: SYSTEM.device_name == "Matthiass MacBook Pro",
+    kenbun:  SYSTEM.device_name == "Matthiass MacBook Pro",
 };
 
 
-
 private fn merge_into_home(enabled, templates) {
     #{ enabled: enabled, targets: "~", strategy: "merge", templates: templates }
 }