diff --git a/anda/desktops/waylands/hyprgraphics/anda.hcl b/anda/desktops/hyprland/hyprgraphics/anda.hcl
similarity index 100%
rename from anda/desktops/waylands/hyprgraphics/anda.hcl
rename to anda/desktops/hyprland/hyprgraphics/anda.hcl
diff --git a/anda/desktops/waylands/hyprgraphics/hyprgraphics.nightly.spec b/anda/desktops/hyprland/hyprgraphics/hyprgraphics.nightly.spec
similarity index 100%
rename from anda/desktops/waylands/hyprgraphics/hyprgraphics.nightly.spec
rename to anda/desktops/hyprland/hyprgraphics/hyprgraphics.nightly.spec
diff --git a/anda/desktops/hyprland/hyprgraphics/update.rhai b/anda/desktops/hyprland/hyprgraphics/update.rhai
new file mode 100644
index 0000000000..2ddb0b8570
--- /dev/null
+++ b/anda/desktops/hyprland/hyprgraphics/update.rhai
@@ -0,0 +1,16 @@
+import "andax/bump_extras.rhai" as bump;
+import "andax/spec.rhai" as spec;
+
+rpm.global("commit", gh_commit("hyprwm/hyprgraphics"));
+if rpm.changed() {
+	rpm.global("ver", gh_rawfile("hyprwm/hyprgraphics", "main", "VERSION"));
+	rpm.global("commit_date", date());
+}
+
+// FIXME: should be updbranch but we also need nightly and we are using gh_commit()?
+let dir = sub(`/[^/]+$`, "", __script_path);
+open_file(`${dir}/VER_hyprlang.txt`, "w").write(bump::madoguchi("hyprlang.nightly", labels.branch));
+if sh("[[ `git status " + dir + " --porcelain` ]] && exit 1 || exit 0", #{}).ctx.rc == 1 {
+    let rel = spec::get_release(rpm).parse_int();
+    rpm.release(rel + 1);
+}
diff --git a/anda/desktops/waylands/hypridle/anda.hcl b/anda/desktops/hyprland/hypridle/anda.hcl
similarity index 100%
rename from anda/desktops/waylands/hypridle/anda.hcl
rename to anda/desktops/hyprland/hypridle/anda.hcl
diff --git a/anda/desktops/waylands/hypridle/ci_setup.rhai b/anda/desktops/hyprland/hypridle/ci_setup.rhai
similarity index 100%
rename from anda/desktops/waylands/hypridle/ci_setup.rhai
rename to anda/desktops/hyprland/hypridle/ci_setup.rhai
diff --git a/anda/desktops/waylands/hypridle/hypridle.spec b/anda/desktops/hyprland/hypridle/hypridle.spec
similarity index 100%
rename from anda/desktops/waylands/hypridle/hypridle.spec
rename to anda/desktops/hyprland/hypridle/hypridle.spec
diff --git a/anda/desktops/waylands/hypridle/update.rhai b/anda/desktops/hyprland/hypridle/update.rhai
similarity index 100%
rename from anda/desktops/waylands/hypridle/update.rhai
rename to anda/desktops/hyprland/hypridle/update.rhai
diff --git a/anda/desktops/waylands/hyprland-protocols/anda.hcl b/anda/desktops/hyprland/hyprland-protocols/anda.hcl
similarity index 100%
rename from anda/desktops/waylands/hyprland-protocols/anda.hcl
rename to anda/desktops/hyprland/hyprland-protocols/anda.hcl
diff --git a/anda/desktops/waylands/hyprland-protocols/hyprland-protocols.nightly.spec b/anda/desktops/hyprland/hyprland-protocols/hyprland-protocols.nightly.spec
similarity index 100%
rename from anda/desktops/waylands/hyprland-protocols/hyprland-protocols.nightly.spec
rename to anda/desktops/hyprland/hyprland-protocols/hyprland-protocols.nightly.spec
diff --git a/anda/desktops/waylands/hyprland-protocols/update.rhai b/anda/desktops/hyprland/hyprland-protocols/update.rhai
similarity index 100%
rename from anda/desktops/waylands/hyprland-protocols/update.rhai
rename to anda/desktops/hyprland/hyprland-protocols/update.rhai
diff --git a/anda/desktops/hyprland/hyprlang/VER_hyprutil.txt b/anda/desktops/hyprland/hyprlang/VER_hyprutil.txt
new file mode 100644
index 0000000000..7d0807b501
--- /dev/null
+++ b/anda/desktops/hyprland/hyprlang/VER_hyprutil.txt
@@ -0,0 +1 @@
+0.10.0^20251005git.3df7bde
\ No newline at end of file
diff --git a/anda/desktops/waylands/hyprlang/anda.hcl b/anda/desktops/hyprland/hyprlang/anda.hcl
similarity index 100%
rename from anda/desktops/waylands/hyprlang/anda.hcl
rename to anda/desktops/hyprland/hyprlang/anda.hcl
diff --git a/anda/desktops/waylands/hyprlang/hyprlang.nightly.spec b/anda/desktops/hyprland/hyprlang/hyprlang.nightly.spec
similarity index 100%
rename from anda/desktops/waylands/hyprlang/hyprlang.nightly.spec
rename to anda/desktops/hyprland/hyprlang/hyprlang.nightly.spec
diff --git a/anda/desktops/hyprland/hyprlang/update.rhai b/anda/desktops/hyprland/hyprlang/update.rhai
new file mode 100644
index 0000000000..a08e4157bb
--- /dev/null
+++ b/anda/desktops/hyprland/hyprlang/update.rhai
@@ -0,0 +1,16 @@
+import "andax/bump_extras.rhai" as bump;
+import "andax/spec.rhai" as spec;
+
+            // FIXME: should be updbranch but we also need nightly and we are using gh_commit()?
+            let dir = sub(`/[^/]+$`, "", __script_path);
+            open_file(`${dir}/VER_hyprutil.txt`, "w").write(bump::madoguchi("hyprutils.nightly", labels.branch));
+            if sh("[[ `git status " + dir + " --porcelain` ]] && exit 1 || exit 0", #{}).ctx.rc == 1 {
+                let rel = spec::get_release(rpm).parse_int();
+                rpm.release(rel + 1);
+            }
+
+rpm.global("commit", gh_commit("hyprwm/hyprlang"));
+if rpm.changed() {
+	rpm.global("ver", gh_rawfile("hyprwm/hyprlang", "main", "VERSION"));
+	rpm.global("commit_date", date());
+}
diff --git a/anda/desktops/waylands/hyprlock/anda.hcl b/anda/desktops/hyprland/hyprlock/anda.hcl
similarity index 100%
rename from anda/desktops/waylands/hyprlock/anda.hcl
rename to anda/desktops/hyprland/hyprlock/anda.hcl
diff --git a/anda/desktops/waylands/hyprlock/ci_setup.rhai b/anda/desktops/hyprland/hyprlock/ci_setup.rhai
similarity index 100%
rename from anda/desktops/waylands/hyprlock/ci_setup.rhai
rename to anda/desktops/hyprland/hyprlock/ci_setup.rhai
diff --git a/anda/desktops/waylands/hyprlock/hyprlock.spec b/anda/desktops/hyprland/hyprlock/hyprlock.spec
similarity index 100%
rename from anda/desktops/waylands/hyprlock/hyprlock.spec
rename to anda/desktops/hyprland/hyprlock/hyprlock.spec
diff --git a/anda/desktops/hyprland/hyprlock/update.rhai b/anda/desktops/hyprland/hyprlock/update.rhai
new file mode 100644
index 0000000000..8fac9b39fe
--- /dev/null
+++ b/anda/desktops/hyprland/hyprlock/update.rhai
@@ -0,0 +1,14 @@
+import "andax/bump_extras.rhai" as bump;
+import "andax/spec.rhai" as spec;
+
+let v = gh_rawfile("hyprwm/hyprlock", "main", "VERSION");
+v.trim();
+rpm.version(v);
+
+// FIXME: should be updbranch but we also need nightly and we are using gh_commit()?
+let dir = sub(`/[^/]+$`, "", __script_path);
+open_file(`${dir}/VER_hyprgraphics.txt`, "w").write(bump::madoguchi("hyprgraphics.nightly", labels.branch));
+if sh("[[ `git status " + dir + " --porcelain` ]] && exit 1 || exit 0", #{}).ctx.rc == 1 {
+    let rel = spec::get_release(rpm).parse_int();
+    rpm.release(rel + 1);
+}
diff --git a/anda/desktops/waylands/hyprutils/anda.hcl b/anda/desktops/hyprland/hyprutils/anda.hcl
similarity index 100%
rename from anda/desktops/waylands/hyprutils/anda.hcl
rename to anda/desktops/hyprland/hyprutils/anda.hcl
diff --git a/anda/desktops/waylands/hyprutils/hyprutils.nightly.spec b/anda/desktops/hyprland/hyprutils/hyprutils.nightly.spec
similarity index 100%
rename from anda/desktops/waylands/hyprutils/hyprutils.nightly.spec
rename to anda/desktops/hyprland/hyprutils/hyprutils.nightly.spec
diff --git a/anda/desktops/waylands/hyprutils/update.rhai b/anda/desktops/hyprland/hyprutils/update.rhai
similarity index 100%
rename from anda/desktops/waylands/hyprutils/update.rhai
rename to anda/desktops/hyprland/hyprutils/update.rhai
diff --git a/anda/desktops/waylands/hyprwayland-scanner/anda.hcl b/anda/desktops/hyprland/hyprwayland-scanner/anda.hcl
similarity index 100%
rename from anda/desktops/waylands/hyprwayland-scanner/anda.hcl
rename to anda/desktops/hyprland/hyprwayland-scanner/anda.hcl
diff --git a/anda/desktops/waylands/hyprwayland-scanner/hyprwayland-scanner.nightly.spec b/anda/desktops/hyprland/hyprwayland-scanner/hyprwayland-scanner.nightly.spec
similarity index 100%
rename from anda/desktops/waylands/hyprwayland-scanner/hyprwayland-scanner.nightly.spec
rename to anda/desktops/hyprland/hyprwayland-scanner/hyprwayland-scanner.nightly.spec
diff --git a/anda/desktops/waylands/hyprwayland-scanner/update.rhai b/anda/desktops/hyprland/hyprwayland-scanner/update.rhai
similarity index 100%
rename from anda/desktops/waylands/hyprwayland-scanner/update.rhai
rename to anda/desktops/hyprland/hyprwayland-scanner/update.rhai
diff --git a/anda/desktops/waylands/hyprgraphics/update.rhai b/anda/desktops/waylands/hyprgraphics/update.rhai
deleted file mode 100644
index 6a9cc301c7..0000000000
--- a/anda/desktops/waylands/hyprgraphics/update.rhai
+++ /dev/null
@@ -1,5 +0,0 @@
-rpm.global("commit", gh_commit("hyprwm/hyprgraphics"));
-if rpm.changed() {
-	rpm.global("ver", gh_rawfile("hyprwm/hyprgraphics", "main", "VERSION"));
-	rpm.global("commit_date", date());
-}
diff --git a/anda/desktops/waylands/hyprlang/update.rhai b/anda/desktops/waylands/hyprlang/update.rhai
deleted file mode 100644
index bc8ee477cb..0000000000
--- a/anda/desktops/waylands/hyprlang/update.rhai
+++ /dev/null
@@ -1,5 +0,0 @@
-rpm.global("commit", gh_commit("hyprwm/hyprlang"));
-if rpm.changed() {
-	rpm.global("ver", gh_rawfile("hyprwm/hyprlang", "main", "VERSION"));
-	rpm.global("commit_date", date());
-}
diff --git a/anda/desktops/waylands/hyprlock/update.rhai b/anda/desktops/waylands/hyprlock/update.rhai
deleted file mode 100644
index 05b9c25c0c..0000000000
--- a/anda/desktops/waylands/hyprlock/update.rhai
+++ /dev/null
@@ -1,3 +0,0 @@
-let v = gh_rawfile("hyprwm/hyprlock", "main", "VERSION");
-v.trim();
-rpm.version(v);