diff --git a/profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0-4.0/.calculate/ini.env b/profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0-4.0/.calculate/ini.env
new file mode 100644
index 000000000..e12914af4
--- /dev/null
+++ b/profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0-4.0/.calculate/ini.env
@@ -0,0 +1,7 @@
+# Calculate format=samba
+
+[ver]
+cinnamon = 4.0
+
+[update]
+cinnamon = on
diff --git a/profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0-4.0/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0-4.0/.calculate_directory
new file mode 100644
index 000000000..2f435b516
--- /dev/null
+++ b/profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0-4.0/.calculate_directory
@@ -0,0 +1 @@
+# Calculate append=skip mergepkg(gnome-extra/cinnamon)>=4.0&&ini(update.cinnamon)!=off&&ini(ver.cinnamon)!=&&ini(ver.cinnamon)<4.0
diff --git a/profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0-4.0/menu@cinnamon.org/.calculate_directory b/profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0-4.0/menu@cinnamon.org/.calculate_directory
new file mode 100644
index 000000000..754fd4500
--- /dev/null
+++ b/profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0-4.0/menu@cinnamon.org/.calculate_directory
@@ -0,0 +1 @@
+# Calculate path=~/.cinnamon/configs
diff --git a/profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0-4.0/menu@cinnamon.org/0.json b/profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0-4.0/menu@cinnamon.org/0.json
new file mode 100644
index 000000000..53b84cfc4
--- /dev/null
+++ b/profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0-4.0/menu@cinnamon.org/0.json
@@ -0,0 +1,10 @@
+# Calculate format=json
+{
+    "menu-custom": {
+        "type": "switch",
+        "default": false,
+        "description": "Use a custom icon and label",
+        "tooltip": "Checking this to specify a custom icon and label",
+        "value": true
+    }
+}
diff --git a/profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/ini.env b/profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/ini.env
index a244f62e7..97a79351c 100644
--- a/profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/ini.env
+++ b/profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/ini.env
@@ -1,7 +1,11 @@
 # Calculate format=samba path=~/.calculate
 
 [ver]
-cinnamon = 1.8
+#?pkg(gnome-extra/cinnamon)>=4#
+cinnamon = 4.0
+#!pkg#
+cinnamon = 3.0
+#pkg#
 
 [update]
 cinnamon = on
diff --git a/profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/menu@cinnamon.org/0.json b/profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/menu@cinnamon.org/0.json
index 9b4cf0ca9..7ff1d71be 100644
--- a/profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/menu@cinnamon.org/0.json
+++ b/profiles/templates/3.6/6_ac_desktop_profile/2-user/gnome-extra/Cinnamon-3.0/menu@cinnamon.org/0.json
@@ -26,7 +26,11 @@
             "type": "section",
             "title": "Appearance",
             "keys": [
+#?pkg(gnome-extra/cinnamon)>=4#
+                "menu-custom",
+#!pkg#
                 "menu-icon-custom",
+#pkg#
                 "menu-icon",
                 "menu-label"
             ]
@@ -67,6 +71,16 @@
         "default": "Super_L::Super_R",
         "value": "<Alt>F1::Super_R"
     },
+
+#?pkg(gnome-extra/cinnamon)>=4#
+    "menu-custom": {
+        "type": "switch",
+        "default": false,
+        "description": "Use a custom icon and label",
+        "tooltip": "Checking this to specify a custom icon and label",
+        "value": true
+    },
+#!pkg#
     "menu-icon-custom": {
         "type": "switch",
         "default": false,
@@ -74,12 +88,17 @@
         "tooltip": "Unchecking this allows the theme to set the icon",
         "value": true
     },
+#pkg#
     "menu-icon": {
         "type": "iconfilechooser",
         "default": "/usr/share/cinnamon/theme/menu-symbolic.svg",
         "description": "Icon",
         "tooltip": "Select an icon to show in the panel.",
+#?pkg(gnome-extra/cinnamon)>=4#
         "dependency": "menu-icon-custom",
+#!pkg#
+        "dependency": "menu-custom",
+#pkg#
         "indent": "true",
         "value": "/usr/share/pixmaps/calculate/start-here-brown.svg"
     },