diff --git a/docs-web/src/main/java/com/sismics/docs/rest/resource/ThemeResource.java b/docs-web/src/main/java/com/sismics/docs/rest/resource/ThemeResource.java
index abf6ee13..6e3f96a1 100644
--- a/docs-web/src/main/java/com/sismics/docs/rest/resource/ThemeResource.java
+++ b/docs-web/src/main/java/com/sismics/docs/rest/resource/ThemeResource.java
@@ -56,6 +56,8 @@ public class ThemeResource extends BaseResource {
         JsonObject themeConfig = getThemeConfig();
         JsonObjectBuilder json = Json.createObjectBuilder();
         json.add("name", themeConfig.getString("name", "Sismics Docs"));
+        json.add("color", themeConfig.getString("color", "#263238"));
+        json.add("css", themeConfig.getString("css", ""));
         return Response.ok().entity(json.build()).build();
     }
 
diff --git a/docs-web/src/main/webapp/src/app/docs/app.js b/docs-web/src/main/webapp/src/app/docs/app.js
index 8c9d4fca..f68b8b72 100644
--- a/docs-web/src/main/webapp/src/app/docs/app.js
+++ b/docs-web/src/main/webapp/src/app/docs/app.js
@@ -13,7 +13,6 @@ angular.module('docs',
  * Configuring modules.
  */
 .config(function($stateProvider, $httpProvider, RestangularProvider) {
-
   // Configuring UI Router
   $stateProvider
     .state('main', {
@@ -381,10 +380,15 @@ angular.module('docs',
 /**
  * Application initialization.
  */
-.run(function($rootScope, $state, $stateParams) {
+.run(function($rootScope, $state, $stateParams, Restangular) {
   $rootScope.$state = $state;
   $rootScope.$stateParams = $stateParams;
-  $rootScope.pageTitle = 'Sismics Docs';
+
+  // Fetch the current theme configuration
+  $rootScope.appName = '';
+  Restangular.one('theme').get().then(function(data) {
+    $rootScope.appName = data.name;
+  });
 })
 /**
  * Redirection support for ui-router.
diff --git a/docs-web/src/main/webapp/src/app/docs/controller/settings/SettingsTheme.js b/docs-web/src/main/webapp/src/app/docs/controller/settings/SettingsTheme.js
index 405d0066..02a06f9d 100644
--- a/docs-web/src/main/webapp/src/app/docs/controller/settings/SettingsTheme.js
+++ b/docs-web/src/main/webapp/src/app/docs/controller/settings/SettingsTheme.js
@@ -3,19 +3,20 @@
 /**
  * Settings theme page controller.
  */
-angular.module('docs').controller('SettingsTheme', function($scope, Restangular) {
-    // Fetch the current theme configuration
-    $scope.theme = {
-        color: $('.navbar').css('background-color')
-    };
+angular.module('docs').controller('SettingsTheme', function($scope, $rootScope, Restangular) {
+  // Fetch the current theme configuration
+  Restangular.one('theme').get().then(function(data) {
+    $scope.theme = data;
+    $rootScope.appName = $scope.theme.name;
+  });
 
-    // Update the main color
-    $scope.updateColor = function(color) {
-        Restangular.one('theme').post('color', {
-            color: color
-        }).then(function() {
-           var stylesheet = $('#theme-stylesheet')[0];
-            stylesheet.href = stylesheet.href.replace(/\?.*|$/, '?' + new Date().getTime());
-        });
-    }
+  // Update the theme
+  $scope.update = function() {
+    $scope.theme.name = $scope.theme.name.length == 0 ? 'Sismics Docs' : $scope.theme.name;
+    Restangular.one('theme').post('', $scope.theme).then(function() {
+      var stylesheet = $('#theme-stylesheet')[0];
+      stylesheet.href = stylesheet.href.replace(/\?.*|$/, '?' + new Date().getTime());
+      $rootScope.appName = $scope.theme.name;
+    });
+  }
 });
\ No newline at end of file
diff --git a/docs-web/src/main/webapp/src/app/share/app.js b/docs-web/src/main/webapp/src/app/share/app.js
index 9fe7cdfb..e9c69b98 100644
--- a/docs-web/src/main/webapp/src/app/share/app.js
+++ b/docs-web/src/main/webapp/src/app/share/app.js
@@ -95,7 +95,13 @@ angular.module('share',
 /**
  * Application initialization.
  */
-.run(function($rootScope, $state, $stateParams) {
+.run(function($rootScope, $state, $stateParams, Restangular) {
   $rootScope.$state = $state;
   $rootScope.$stateParams = $stateParams;
+
+  // Fetch the current theme configuration
+  $rootScope.appName = '';
+  Restangular.one('theme').get().then(function(data) {
+    $rootScope.appName = data.name;
+  });
 });
\ No newline at end of file
diff --git a/docs-web/src/main/webapp/src/index.html b/docs-web/src/main/webapp/src/index.html
index 5b92a0b1..d4cce917 100644
--- a/docs-web/src/main/webapp/src/index.html
+++ b/docs-web/src/main/webapp/src/index.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html ng-app="docs">
   <head>
-    <title ng-bind-template="{{ pageTitle }}">Sismics Docs</title>
+    <title ng-bind-template="{{ appName }}">Sismics Docs</title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <link rel="shortcut icon" href="favicon.png" />
@@ -103,7 +103,7 @@
           <img src="favicon.png" />
         </div>
 
-        <a class="navbar-brand" href="#"> Sismics Docs</a>
+        <a class="navbar-brand" href="#"> {{ appName }}</a>
       </div>
 
       <div class="collapse navbar-collapse" collapse="isCollapsed">
diff --git a/docs-web/src/main/webapp/src/partial/docs/settings.security.html b/docs-web/src/main/webapp/src/partial/docs/settings.security.html
index 410ebf10..eaa75515 100644
--- a/docs-web/src/main/webapp/src/partial/docs/settings.security.html
+++ b/docs-web/src/main/webapp/src/partial/docs/settings.security.html
@@ -7,7 +7,7 @@
 
 <div ng-if="!user.totp_enabled">
   <p>
-    Two-factor authentication allows you to add a layer of security on your <strong>Sismics Docs</strong> account.<br/>
+    Two-factor authentication allows you to add a layer of security on your <strong>{{ appName }}</strong> account.<br/>
     Before activating this feature, make sure you have a TOTP-compatible app on your phone:
   </p>
   <ul>
@@ -17,7 +17,7 @@
   </ul>
   <p>
     Those applications automatically generate a validation code that changes after a certain period of time.<br/>
-    You will be required to enter this validation code each time you login on <strong>Sismics Docs</strong>.
+    You will be required to enter this validation code each time you login on <strong>{{ appName }}</strong>.
   </p>
   <p>
     <button class="btn btn-primary" ng-click="enableTotp()">Enable two-factor authentication</button>
@@ -34,7 +34,7 @@
   </div>
   <p>
     Two-factor authentication is enabled on your account.<br/>
-    Each time you login on <strong>Sismics Docs</strong>, you will be asked a validation code from your configured phone app.<br/>
+    Each time you login on <strong>{{ appName }}</strong>, you will be asked a validation code from your configured phone app.<br/>
     If you loose your phone, you will not be able to login into your account but active sessions will allow you to regenerate a secrey key.
   </p>
   <p>
diff --git a/docs-web/src/main/webapp/src/partial/docs/settings.theme.html b/docs-web/src/main/webapp/src/partial/docs/settings.theme.html
index 093a8521..0b0f611d 100644
--- a/docs-web/src/main/webapp/src/partial/docs/settings.theme.html
+++ b/docs-web/src/main/webapp/src/partial/docs/settings.theme.html
@@ -1,8 +1,26 @@
 <h1>Theme <small>customization</small></h1>
 <form class="form-horizontal" name="editColorForm" novalidate>
+  <div class="form-group">
+    <label class="col-sm-2 control-label" for="inputName">Application name</label>
+    <div class="col-sm-8">
+      <input type="text" class="form-control"
+        id="inputName" ng-model="theme.name" ng-blur="update()" />
+    </div>
+  </div>
+
   <div class="form-group">
     <label class="col-sm-2 control-label" for="inputColor">Main color</label>
-    <span colorpicker class="col-sm-1 btn btn-default" id="inputColor" on-hide="updateColor(theme.color)"
-          data-color="" ng-model="theme.color" ng-style="{ 'background': theme.color }">&nbsp;</span>
+    <div class="col-sm-1">
+      <span colorpicker class="btn btn-default" id="inputColor" on-hide="update()"
+            data-color="" ng-model="theme.color" ng-style="{ 'background': theme.color }">&nbsp;&nbsp;&nbsp;</span>
+    </div>
+  </div>
+
+  <div class="form-group">
+    <label class="col-sm-2 control-label" for="inputCss">Custom CSS</label>
+    <div class="col-sm-8">
+      <textarea class="form-control" rows="6" placeholder="Custom CSS to add after the main stylesheet"
+        id="inputCss" ng-model="theme.css" ng-blur="update()"></textarea>
+    </div>
   </div>
 </form>
\ No newline at end of file
diff --git a/docs-web/src/main/webapp/src/share.html b/docs-web/src/main/webapp/src/share.html
index 2dbc2ab7..a9a7ddf8 100644
--- a/docs-web/src/main/webapp/src/share.html
+++ b/docs-web/src/main/webapp/src/share.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html ng-app="share">
   <head>
-    <title>Sismics Docs</title>
+    <title>{{ appName }}</title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <link rel="shortcut icon" href="favicon.png" />
@@ -49,7 +49,7 @@
           <img src="favicon.png" />
         </div>
 
-        <a class="navbar-brand" href="#"> Sismics Docs</a>
+        <a class="navbar-brand" href="#"> {{ appName }}</a>
       </div>
     </div>
 
diff --git a/docs-web/src/test/java/com/sismics/docs/rest/TestThemeResource.java b/docs-web/src/test/java/com/sismics/docs/rest/TestThemeResource.java
index 61c06cef..79039e9d 100644
--- a/docs-web/src/test/java/com/sismics/docs/rest/TestThemeResource.java
+++ b/docs-web/src/test/java/com/sismics/docs/rest/TestThemeResource.java
@@ -31,6 +31,8 @@ public class TestThemeResource extends BaseJerseyTest {
         JsonObject json = target().path("/theme").request()
                 .get(JsonObject.class);
         Assert.assertEquals("Sismics Docs", json.getString("name"));
+        Assert.assertEquals("#263238", json.getString("color"));
+        Assert.assertEquals("", json.getString("css"));
 
         // Update the main color as admin
         target().path("/theme").request()
@@ -50,5 +52,7 @@ public class TestThemeResource extends BaseJerseyTest {
         json = target().path("/theme").request()
                 .get(JsonObject.class);
         Assert.assertEquals("My App", json.getString("name"));
+        Assert.assertEquals("#ff0000", json.getString("color"));
+        Assert.assertEquals(".body { content: 'Custom CSS'; }", json.getString("css"));
     }
 }
\ No newline at end of file