diff --git a/openerp/cli/templates/theme/__openerp__.py.template b/openerp/cli/templates/theme/__openerp__.py.template
index 329483fa078..9eba44581a9 100644
--- a/openerp/cli/templates/theme/__openerp__.py.template
+++ b/openerp/cli/templates/theme/__openerp__.py.template
@@ -7,13 +7,17 @@
     'version': '1.0',
     'depends': ['website'],
 
-    # templates, pages, and snippets
+    # templates
     'data': [
-        'views/pages.xml',
         'views/options.xml',
         'views/snippets.xml',
     ],
 
+    # demo pages
+    'demo': [
+        'demo/pages.xml',
+    ],
+
     # Your information
     'author': "Your Company",
     'website': "",
diff --git a/openerp/cli/templates/theme/views/pages.xml.template b/openerp/cli/templates/theme/demo/pages.xml.template
similarity index 100%
rename from openerp/cli/templates/theme/views/pages.xml.template
rename to openerp/cli/templates/theme/demo/pages.xml.template
diff --git a/openerp/cli/templates/theme/static/style/custom.less.template b/openerp/cli/templates/theme/static/src/less/custom.less.template
similarity index 100%
rename from openerp/cli/templates/theme/static/style/custom.less.template
rename to openerp/cli/templates/theme/static/src/less/custom.less.template