--- a/tdm/config.def
+++ b/tdm/config.def
@@ -2614,18 +2614,18 @@
 
 Key: UseTheme
 Type: bool
-Default: true
+Default: false
 User: greeter
-Instance: */true
+Instance: #*/true
 Comment: &
 Description:
  Whether the greeter should be themed.
 
 Key: Theme
 Type: string
-Default: TDMDATA "/themes/o2_enterprise"
+Default: ""
 User: greeter
-Instance: */TDMDATA "/themes/o2_enterprise"
+Instance: */ "@@@ToBeReplacedByDesktopBase@@@"
 Comment: &
 Description:
  The theme to use for the greeter. Can point to either a directory or an XML