diff --git a/.gitignore b/.gitignore
index 69b977aee0..215682c408 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,6 +25,7 @@
 !/apps/testing
 !/apps/admin_audit
 !/apps/updatenotification
+!/apps/theming
 /apps/files_external/3rdparty/irodsphp/PHPUnitTest
 /apps/files_external/3rdparty/irodsphp/web
 /apps/files_external/3rdparty/irodsphp/prods/test
diff --git a/apps/theming/appinfo/app.php b/apps/theming/appinfo/app.php
new file mode 100644
index 0000000000..97db0e568b
--- /dev/null
+++ b/apps/theming/appinfo/app.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * @author Björn Schießle <bjoern@schiessle.org>
+ *
+ * @copyright Copyright (c) 2016, Bjoern Schiessle
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the 
+ * License, or (at your opinion) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+\OCP\App::registerAdmin('theming', 'settings/settings-admin');
\ No newline at end of file
diff --git a/apps/theming/appinfo/info.xml b/apps/theming/appinfo/info.xml
new file mode 100644
index 0000000000..f0f2fb80af
--- /dev/null
+++ b/apps/theming/appinfo/info.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<info>
+	<id>theming</id>
+	<name>Theming</name>
+	<description>Adjust the Nextcloud theme</description>
+	<licence>AGPL</licence>
+	<author>Bjoern Schiessle</author>
+	<version>0.1.0</version>
+	<namespace>Theming</namespace>
+	<category>other</category>
+	<dependencies>
+		<owncloud min-version="9.0" max-version="9.1" />
+	</dependencies>
+	<default_enable/>
+</info>
diff --git a/apps/theming/css/settings-admin.css b/apps/theming/css/settings-admin.css
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/apps/theming/js/settings-admin.js b/apps/theming/js/settings-admin.js
new file mode 100644
index 0000000000..317773a32c
--- /dev/null
+++ b/apps/theming/js/settings-admin.js
@@ -0,0 +1,20 @@
+/**
+ * @author Björn Schießle <bjoern@schiessle.org>
+ *
+ * @copyright Copyright (c) 2016, Bjoern Schiessle
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the 
+ * License, or (at your opinion) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
diff --git a/apps/theming/settings/settings-admin.php b/apps/theming/settings/settings-admin.php
new file mode 100644
index 0000000000..8c7effb310
--- /dev/null
+++ b/apps/theming/settings/settings-admin.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * @author Björn Schießle <bjoern@schiessle.org>
+ *
+ * @copyright Copyright (c) 2016, Bjoern Schiessle
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the 
+ * License, or (at your opinion) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+\OC_Util::checkAdminUser();
+
+$template = new OCP\Template('theming', 'settings-admin');
+
+return $template->fetchPage();
diff --git a/apps/theming/templates/settings-admin.php b/apps/theming/templates/settings-admin.php
new file mode 100644
index 0000000000..4177f59d07
--- /dev/null
+++ b/apps/theming/templates/settings-admin.php
@@ -0,0 +1,11 @@
+<?php
+/** @var array $_ */
+/** @var OC_L10N $l */
+script('theming', 'settings-admin');
+style('theming', 'settings-admin')
+?>
+<div id="ncTheming" class="section">
+	<h2><?php p($l->t('Theming')); ?></h2>
+        Hello World
+</div>
+