diff --git a/OPENCLOUD.cmake b/OPENCLOUD.cmake
index 923f6408d9..a14845deed 100644
--- a/OPENCLOUD.cmake
+++ b/OPENCLOUD.cmake
@@ -1,8 +1,15 @@
-set( APPLICATION_NAME       "OpenCloud Desktop" )
-set( APPLICATION_SHORTNAME  "OpenCloud" )
-set( APPLICATION_EXECUTABLE "opencloud" )
-set( APPLICATION_DOMAIN     "opencloud.eu" )
-set( APPLICATION_VENDOR     "OpenCloud" )
+option(DEV_BUILD "Use a standalone profile for developement" OFF)
+
+if (DEV_BUILD)
+    set(THEME_SUFFIX " Dev")
+else()
+    set(THEME_SUFFIX "")
+endif()
+
+set( APPLICATION_NAME       "OpenCloud Desktop${THEME_SUFFIX}")
+set( APPLICATION_SHORTNAME  "OpenCloud${THEME_SUFFIX}" )
+set( APPLICATION_EXECUTABLE "opencloud${THEME_SUFFIX}" )
+set( APPLICATION_VENDOR     "OpenCloud${THEME_SUFFIX}" )
 set( APPLICATION_ICON_NAME  "opencloud" )
 
 # TODO: re enable once we got icons
diff --git a/src/csync/config.h.in b/src/csync/config.h.in
index 1346780ec2..9f178c6be4 100644
--- a/src/csync/config.h.in
+++ b/src/csync/config.h.in
@@ -6,7 +6,6 @@
 #cmakedefine WITH_CRASHREPORTER
 #cmakedefine CRASHREPORTER_EXECUTABLE "@CRASHREPORTER_EXECUTABLE@"
 
-#cmakedefine APPLICATION_DOMAIN "@APPLICATION_DOMAIN@"
 #cmakedefine THEME_CLASS @THEME_CLASS@
 #cmakedefine THEME_INCLUDE "@THEME_INCLUDE@"
 
diff --git a/src/resources/resources.cpp b/src/resources/resources.cpp
index 89d894a74a..b46f76517a 100644
--- a/src/resources/resources.cpp
+++ b/src/resources/resources.cpp
@@ -58,7 +58,7 @@ QString brandThemePath()
 
 bool Resources::isVanillaTheme()
 {
-    return std::string_view(APPLICATION_SHORTNAME) == "OpenCloud";
+    return std::string_view(APPLICATION_SHORTNAME).starts_with("OpenCloud");
 }
 
 bool OCC::Resources::isUsingDarkTheme()