diff --git a/application/ApplicationUtils.php b/application/ApplicationUtils.php
index 7f963e9..c0b03a3 100644
--- a/application/ApplicationUtils.php
+++ b/application/ApplicationUtils.php
@@ -149,7 +149,7 @@ class ApplicationUtils
             'application',
             'inc',
             'plugins',
-            $conf->get('resource.raintpl_tpl'),
+            'tpl/'.$conf->get('resource.theme'),
         ) as $path) {
             if (! is_readable(realpath($path))) {
                 $errors[] = '"'.$path.'" directory is not readable';
diff --git a/application/PageBuilder.php b/application/PageBuilder.php
index 32c7f9f..7cddb71 100644
--- a/application/PageBuilder.php
+++ b/application/PageBuilder.php
@@ -79,7 +79,7 @@ class PageBuilder
         $this->tpl->assign('hide_timestamps', $this->conf->get('privacy.hide_timestamps', false));
         $this->tpl->assign('token', getToken($this->conf));
         // To be removed with a proper theme configuration.
-        $this->tpl->assign('conf', $this->conf);
+        $this->tpl->assign('conf', $this->conf->get('resource.theme', 'Default'));
     }
 
     /**
diff --git a/application/Utils.php b/application/Utils.php
index 0166ee2..d03af31 100644
--- a/application/Utils.php
+++ b/application/Utils.php
@@ -227,3 +227,13 @@ function autoLocale($headerLocale)
     }
     setlocale(LC_ALL, $attempts);
 }
+
+function getAllTheme()
+{
+    $allTheme = glob('tpl/*', GLOB_ONLYDIR);
+    foreach ($allTheme as $value) {
+        $themes[] = str_replace('tpl/', '', $value);
+    }
+
+    return $themes;
+}
diff --git a/application/config/ConfigManager.php b/application/config/ConfigManager.php
index f5f753f..77804b8 100644
--- a/application/config/ConfigManager.php
+++ b/application/config/ConfigManager.php
@@ -189,7 +189,7 @@ class ConfigManager
             'general.title',
             'general.header_link',
             'privacy.default_private_links',
-            'redirector.url',
+            'redirector.url'
         );
 
         // Only logged in user can alter config.
@@ -296,7 +296,7 @@ class ConfigManager
         $this->setEmpty('resource.updates', 'data/updates.txt');
         $this->setEmpty('resource.log', 'data/log.txt');
         $this->setEmpty('resource.update_check', 'data/lastupdatecheck.txt');
-        $this->setEmpty('resource.raintpl_tpl', 'tpl/');
+        $this->setEmpty('resource.theme', 'Default');
         $this->setEmpty('resource.raintpl_tmp', 'tmp/');
         $this->setEmpty('resource.thumbnails_cache', 'cache');
         $this->setEmpty('resource.page_cache', 'pagecache');
diff --git a/application/config/ConfigPhp.php b/application/config/ConfigPhp.php
index 27187b6..5752d37 100644
--- a/application/config/ConfigPhp.php
+++ b/application/config/ConfigPhp.php
@@ -40,7 +40,7 @@ class ConfigPhp implements ConfigIO
         'resource.updates' => 'config.UPDATES_FILE',
         'resource.log' => 'config.LOG_FILE',
         'resource.update_check' => 'config.UPDATECHECK_FILENAME',
-        'resource.raintpl_tpl' => 'config.RAINTPL_TPL',
+        'resource.theme' => 'config.theme',
         'resource.raintpl_tmp' => 'config.RAINTPL_TMP',
         'resource.thumbnails_cache' => 'config.CACHEDIR',
         'resource.page_cache' => 'config.PAGECACHE',
diff --git a/doc/Shaarli-configuration.html b/doc/Shaarli-configuration.html
index 6d717c6..3494506 100644
--- a/doc/Shaarli-configuration.html
+++ b/doc/Shaarli-configuration.html
@@ -172,7 +172,7 @@ It might be useful if your IP adress often changes.<br />
 <strong>updates</strong>: File path for the ran updates file.<br />
 <strong>log</strong>: Log file path.<br />
 <strong>update_check</strong>: Last update check file path.<br />
-<strong>raintpl_tpl</strong>: Templates directory.<br />
+<strong>theme</strong>: Templates directory.<br />
 <strong>raintpl_tmp</strong>: Template engine cache directory.<br />
 <strong>thumbnails_cache</strong>: Thumbnails cache directory.<br />
 <strong>page_cache</strong>: Shaarli's internal cache directory.<br />
@@ -220,7 +220,7 @@ It might be useful if your IP adress often changes.<br />
         <span class="dt">&quot;log&quot;</span><span class="fu">:</span> <span class="st">&quot;data</span><span class="ch">\/</span><span class="st">log.txt&quot;</span><span class="fu">,</span>
         <span class="dt">&quot;update_check&quot;</span><span class="fu">:</span> <span class="st">&quot;data</span><span class="ch">\/</span><span class="st">lastupdatecheck.txt&quot;</span><span class="fu">,</span>
         <span class="dt">&quot;raintpl_tmp&quot;</span><span class="fu">:</span> <span class="st">&quot;tmp</span><span class="ch">\/</span><span class="st">&quot;</span><span class="fu">,</span>
-        <span class="dt">&quot;raintpl_tpl&quot;</span><span class="fu">:</span> <span class="st">&quot;tpl</span><span class="ch">\/</span><span class="st">&quot;</span><span class="fu">,</span>
+        <span class="dt">&quot;theme&quot;</span><span class="fu">:</span> <span class="st">&quot;tpl</span><span class="ch">\/</span><span class="st">&quot;</span><span class="fu">,</span>
         <span class="dt">&quot;thumbnails_cache&quot;</span><span class="fu">:</span> <span class="st">&quot;cache&quot;</span><span class="fu">,</span>
         <span class="dt">&quot;page_cache&quot;</span><span class="fu">:</span> <span class="st">&quot;pagecache&quot;</span>
     <span class="fu">},</span>
diff --git a/doc/Shaarli-configuration.md b/doc/Shaarli-configuration.md
index 4a783c0..430bc5f 100644
--- a/doc/Shaarli-configuration.md
+++ b/doc/Shaarli-configuration.md
@@ -73,7 +73,7 @@ It might be useful if your IP adress often changes.
 **updates**: File path for the ran updates file.  
 **log**: Log file path.  
 **update_check**: Last update check file path.  
-**raintpl_tpl**: Templates directory.  
+**theme**: Templates directory.  
 **raintpl_tmp**: Template engine cache directory.  
 **thumbnails_cache**: Thumbnails cache directory.  
 **page_cache**: Shaarli's internal cache directory.  
@@ -134,7 +134,7 @@ It might be useful if your IP adress often changes.
         "log": "data\/log.txt",
         "update_check": "data\/lastupdatecheck.txt",
         "raintpl_tmp": "tmp\/",
-        "raintpl_tpl": "tpl\/",
+        "theme": "tpl\/",
         "thumbnails_cache": "cache",
         "page_cache": "pagecache"
     },
diff --git a/doc/Theming.html b/doc/Theming.html
index 13e6acf..13dda02 100644
--- a/doc/Theming.html
+++ b/doc/Theming.html
@@ -120,7 +120,7 @@ code > span.in { color: #60a0b0; font-weight: bold; font-style: italic; } /* Inf
 <li>There should now be a <code>my-template/</code> directory under the <code>tpl/</code> dir, containing directly all the template files.</li>
 </ul></li>
 <li><p>Edit <code>data/config.php</code> to have Shaarli use this template, e.g.</p>
-<div class="sourceCode"><pre class="sourceCode php"><code class="sourceCode php"><span class="kw">$GLOBALS</span><span class="ot">[</span><span class="st">&#39;config&#39;</span><span class="ot">[</span><span class="st">&#39;RAINTPL_TPL&#39;</span><span class="ot">]</span> = <span class="st">&#39;tpl/my-template/&#39;</span><span class="ot">;](</span><span class="st">&#39;RAINTPL_TPL&#39;</span><span class="ot">]</span>-=-<span class="st">&#39;tpl/my-template/&#39;</span><span class="ot">;</span>.html<span class="ot">)</span></code></pre></div></li>
+<div class="sourceCode"><pre class="sourceCode php"><code class="sourceCode php"><span class="kw">$GLOBALS</span><span class="ot">[</span><span class="st">&#39;config&#39;</span><span class="ot">[</span><span class="st">&#39;theme&#39;</span><span class="ot">]</span> = <span class="st">&#39;tpl/my-template/&#39;</span><span class="ot">;](</span><span class="st">&#39;theme&#39;</span><span class="ot">]</span>-=-<span class="st">&#39;tpl/my-template/&#39;</span><span class="ot">;</span>.html<span class="ot">)</span></code></pre></div></li>
 </ul>
 <h2 id="community-themes-templates">Community themes &amp; templates</h2>
 <ul>
diff --git a/doc/Theming.md b/doc/Theming.md
index 7fb8d92..9287d12 100644
--- a/doc/Theming.md
+++ b/doc/Theming.md
@@ -18,7 +18,7 @@ _WARNING - This feature is currently being worked on and will be improved in the
     - There should now be a `my-template/` directory under the `tpl/` dir, containing directly all the template files.
 - Edit `data/config.php` to have Shaarli use this template, e.g.
 ```php
-$GLOBALS['config'['RAINTPL_TPL'] = 'tpl/my-template/';]('RAINTPL_TPL']-=-'tpl/my-template/';.html)
+$GLOBALS['config'['theme'] = 'tpl/my-template/';]('theme']-=-'tpl/my-template/';.html)
 ```
 
 ## Community themes & templates
diff --git a/index.php b/index.php
index 5366cb0..16d1e46 100644
--- a/index.php
+++ b/index.php
@@ -122,12 +122,12 @@ if (isset($_COOKIE['shaarli']) && !is_session_id_valid($_COOKIE['shaarli'])) {
 $conf = new ConfigManager();
 $conf->setEmpty('general.timezone', date_default_timezone_get());
 $conf->setEmpty('general.title', 'Shared links on '. escape(index_url($_SERVER)));
-RainTPL::$tpl_dir = $conf->get('resource.raintpl_tpl'); // template directory
+$conf->setEmpty('resource.theme', 'Default');
+RainTPL::$tpl_dir = 'tpl/'.$conf->get('resource.theme').'/'; // template directory
 RainTPL::$cache_dir = $conf->get('resource.raintpl_tmp'); // cache directory
 
 $pluginManager = new PluginManager($conf);
 $pluginManager->load($conf->get('general.enabled_plugins'));
-
 date_default_timezone_set($conf->get('general.timezone', 'UTC'));
 
 ob_start();  // Output buffering for the page cache.
@@ -1148,6 +1148,7 @@ function renderPage($conf, $pluginManager)
             $conf->set('general.timezone', $tz);
             $conf->set('general.title', escape($_POST['title']));
             $conf->set('general.header_link', escape($_POST['titleLink']));
+            $conf->set('resource.theme', escape($_POST['theme']));
             $conf->set('redirector.url', escape($_POST['redirector']));
             $conf->set('security.session_protection_disabled', !empty($_POST['disablesessionprotection']));
             $conf->set('privacy.default_private_links', !empty($_POST['privateLinkByDefault']));
@@ -1173,6 +1174,8 @@ function renderPage($conf, $pluginManager)
         else // Show the configuration form.
         {
             $PAGE->assign('title', $conf->get('general.title'));
+            $PAGE->assign('theme', $conf->get('resource.theme'));
+            $PAGE->assign('theme_avaible', getAllTheme());
             $PAGE->assign('redirector', $conf->get('redirector.url'));
             list($timezone_form, $timezone_js) = generateTimeZoneForm($conf->get('general.timezone'));
             $PAGE->assign('timezone_form', $timezone_form);
diff --git a/tests/ApplicationUtilsTest.php b/tests/ApplicationUtilsTest.php
index 861b8d4..c80e134 100644
--- a/tests/ApplicationUtilsTest.php
+++ b/tests/ApplicationUtilsTest.php
@@ -288,7 +288,7 @@ class ApplicationUtilsTest extends PHPUnit_Framework_TestCase
         $conf->set('resource.log', 'data/log.txt');
         $conf->set('resource.page_cache', 'pagecache');
         $conf->set('resource.raintpl_tmp', 'tmp');
-        $conf->set('resource.raintpl_tpl', 'tpl');
+        $conf->set('resource.theme', 'tpl');
         $conf->set('resource.update_check', 'data/lastupdatecheck.txt');
 
         $this->assertEquals(
@@ -311,7 +311,7 @@ class ApplicationUtilsTest extends PHPUnit_Framework_TestCase
         $conf->set('resource.log', 'null/data/log.txt');
         $conf->set('resource.page_cache', 'null/pagecache');
         $conf->set('resource.raintpl_tmp', 'null/tmp');
-        $conf->set('resource.raintpl_tpl', 'null/tpl');
+        $conf->set('resource.theme', 'null/tpl');
         $conf->set('resource.update_check', 'null/data/lastupdatecheck.txt');
         $this->assertEquals(
             array(
diff --git a/tpl/404.html b/tpl/Default/404.html
similarity index 100%
rename from tpl/404.html
rename to tpl/Default/404.html
diff --git a/tpl/addlink.html b/tpl/Default/addlink.html
similarity index 100%
rename from tpl/addlink.html
rename to tpl/Default/addlink.html
diff --git a/tpl/changepassword.html b/tpl/Default/changepassword.html
similarity index 100%
rename from tpl/changepassword.html
rename to tpl/Default/changepassword.html
diff --git a/tpl/changetag.html b/tpl/Default/changetag.html
similarity index 100%
rename from tpl/changetag.html
rename to tpl/Default/changetag.html
diff --git a/tpl/configure.html b/tpl/Default/configure.html
similarity index 86%
rename from tpl/configure.html
rename to tpl/Default/configure.html
index 983bcd0..9b3feae 100644
--- a/tpl/configure.html
+++ b/tpl/Default/configure.html
@@ -19,6 +19,23 @@
         <td><input type="text" name="titleLink" id="titleLink" size="50" value="{$titleLink}"><br/><label
             for="titleLink">(default value is: ?)</label></td>
       </tr>
+
+      <tr>
+        <td><b>Theme:</b></td>
+        <td>
+          <select name="theme" id="theme">
+            {loop="$theme_avaible"}
+              {if="$value===$theme"}
+                <option selected value="{$value}">{$value|ucfirst}</option>
+              {else}
+                <option value="{$value}">{$value|ucfirst}</option>
+              {/if}
+            {/loop}
+          </select>
+          <label for="theme">(default value is: Default)</label>
+        </td>
+      </tr>
+
       <tr>
         <td><b>Timezone:</b></td>
         <td>{$timezone_form}</td>
diff --git a/tpl/daily.html b/tpl/Default/daily.html
similarity index 88%
rename from tpl/daily.html
rename to tpl/Default/daily.html
index b82ad48..217e492 100644
--- a/tpl/daily.html
+++ b/tpl/Default/daily.html
@@ -28,9 +28,9 @@
     </div>
 
     <div class="dailyTitle">
-        <img src="../images/floral_left.png" width="51" height="50" class="nomobile" alt="floral_left">
+        <img src="../../images/floral_left.png" width="51" height="50" class="nomobile" alt="floral_left">
         The Daily Shaarli
-        <img src="../images/floral_right.png" width="51" height="50" class="nomobile" alt="floral_right">
+        <img src="../../images/floral_right.png" width="51" height="50" class="nomobile" alt="floral_right">
     </div>
 
     <div class="dailyDate">
@@ -50,7 +50,7 @@
                     <div class="dailyEntry">
                         <div class="dailyEntryPermalink">
                             <a href="?{$link.linkdate|smallHash}">
-                                <img src="../images/squiggle2.png" width="25" height="26" title="permalink" alt="permalink">
+                                <img src="../../images/squiggle2.png" width="25" height="26" title="permalink" alt="permalink">
                             </a>
                         </div>
                         {if="!$hide_timestamps || isLoggedIn()"}
@@ -94,7 +94,7 @@
             {$value}
         {/loop}
     </div>
-    <div id="closing"><img src="../images/squiggle_closing.png" width="66" height="61" alt="-"></div>
+    <div id="closing"><img src="../../images/squiggle_closing.png" width="66" height="61" alt="-"></div>
 </div>
 {include="page.footer"}
 </body>
diff --git a/tpl/dailyrss.html b/tpl/Default/dailyrss.html
similarity index 100%
rename from tpl/dailyrss.html
rename to tpl/Default/dailyrss.html
diff --git a/tpl/editlink.html b/tpl/Default/editlink.html
similarity index 100%
rename from tpl/editlink.html
rename to tpl/Default/editlink.html
diff --git a/tpl/export.bookmarks.html b/tpl/Default/export.bookmarks.html
similarity index 100%
rename from tpl/export.bookmarks.html
rename to tpl/Default/export.bookmarks.html
diff --git a/tpl/export.html b/tpl/Default/export.html
similarity index 100%
rename from tpl/export.html
rename to tpl/Default/export.html
diff --git a/tpl/feed.atom.html b/tpl/Default/feed.atom.html
similarity index 100%
rename from tpl/feed.atom.html
rename to tpl/Default/feed.atom.html
diff --git a/tpl/feed.rss.html b/tpl/Default/feed.rss.html
similarity index 100%
rename from tpl/feed.rss.html
rename to tpl/Default/feed.rss.html
diff --git a/tpl/import.html b/tpl/Default/import.html
similarity index 100%
rename from tpl/import.html
rename to tpl/Default/import.html
diff --git a/tpl/includes.html b/tpl/Default/includes.html
similarity index 83%
rename from tpl/includes.html
rename to tpl/Default/includes.html
index 7b2997c..50298da 100644
--- a/tpl/includes.html
+++ b/tpl/Default/includes.html
@@ -6,9 +6,9 @@
 <link rel="alternate" type="application/rss+xml" href="{$feedurl}?do=rss{$searchcrits}#" title="RSS Feed" />
 <link rel="alternate" type="application/atom+xml" href="{$feedurl}?do=atom{$searchcrits}#" title="ATOM Feed" />
 <link href="images/favicon.ico#" rel="shortcut icon" type="image/x-icon" />
-<link type="text/css" rel="stylesheet" href="../inc/reset.css" />
-<link type="text/css" rel="stylesheet" href="../inc/shaarli.css" />
-{if="is_file('inc/user.css')"}<link type="text/css" rel="stylesheet" href="../inc/user.css" />{/if}
+<link type="text/css" rel="stylesheet" href="reset.css" />
+<link type="text/css" rel="stylesheet" href="shaarli.css" />
+{if="is_file('inc/user.css')"}<link type="text/css" rel="stylesheet" href="../../inc/user.css" />{/if}
 {loop="$plugins_includes.css_files"}
 <link type="text/css" rel="stylesheet" href="{$value}#"/>
 {/loop}
diff --git a/tpl/install.html b/tpl/Default/install.html
similarity index 100%
rename from tpl/install.html
rename to tpl/Default/install.html
diff --git a/tpl/linklist.html b/tpl/Default/linklist.html
similarity index 98%
rename from tpl/linklist.html
rename to tpl/Default/linklist.html
index ddfd729..a06cec3 100644
--- a/tpl/linklist.html
+++ b/tpl/Default/linklist.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <link type="text/css" rel="stylesheet" href="../inc/awesomplete.css" />
+    <link type="text/css" rel="stylesheet" href="../../inc/awesomplete.css" />
     {include="includes"}
 </head>
 <body>
diff --git a/tpl/linklist.paging.html b/tpl/Default/linklist.paging.html
similarity index 100%
rename from tpl/linklist.paging.html
rename to tpl/Default/linklist.paging.html
diff --git a/tpl/loginform.html b/tpl/Default/loginform.html
similarity index 100%
rename from tpl/loginform.html
rename to tpl/Default/loginform.html
diff --git a/tpl/opensearch.html b/tpl/Default/opensearch.html
similarity index 100%
rename from tpl/opensearch.html
rename to tpl/Default/opensearch.html
diff --git a/tpl/page.footer.html b/tpl/Default/page.footer.html
similarity index 100%
rename from tpl/page.footer.html
rename to tpl/Default/page.footer.html
diff --git a/tpl/page.header.html b/tpl/Default/page.header.html
similarity index 100%
rename from tpl/page.header.html
rename to tpl/Default/page.header.html
diff --git a/tpl/page.html b/tpl/Default/page.html
similarity index 100%
rename from tpl/page.html
rename to tpl/Default/page.html
diff --git a/tpl/picwall.html b/tpl/Default/picwall.html
similarity index 100%
rename from tpl/picwall.html
rename to tpl/Default/picwall.html
diff --git a/tpl/pluginsadmin.html b/tpl/Default/pluginsadmin.html
similarity index 100%
rename from tpl/pluginsadmin.html
rename to tpl/Default/pluginsadmin.html
diff --git a/tpl/readme.txt b/tpl/Default/readme.txt
similarity index 100%
rename from tpl/readme.txt
rename to tpl/Default/readme.txt
diff --git a/inc/reset.css b/tpl/Default/reset.css
similarity index 100%
rename from inc/reset.css
rename to tpl/Default/reset.css
diff --git a/inc/shaarli.css b/tpl/Default/shaarli.css
similarity index 98%
rename from inc/shaarli.css
rename to tpl/Default/shaarli.css
index a24d4b7..90fc5d2 100644
--- a/inc/shaarli.css
+++ b/tpl/Default/shaarli.css
@@ -103,7 +103,7 @@ strong {
 }
 
 #pageheader #logo {
-    background-image: url('../images/logo.png');
+    background-image: url('../../images/logo.png');
     background-repeat: no-repeat;
     float: left;
     margin: 0 10px 0 10px;
@@ -423,7 +423,7 @@ strong {
 }
 
 #linklist li.private {
-    background: url('../images/private.png') no-repeat 4px center;
+    background: url('../../../images/private.png') no-repeat 4px center;
     padding-left: 30px;
 }
 
@@ -455,7 +455,7 @@ strong {
 }
 
 .linkdate a {
-    background-image: url('../images/calendar.png');
+    background-image: url('../../images/calendar.png');
     padding: 2px 0 3px 20px;
     background-repeat: no-repeat;
     text-decoration: none;
@@ -506,7 +506,7 @@ strong {
     height: 20px;
     border-radius: 3px;
     cursor: pointer;
-    background-image: url('../images/tag_blue.png');
+    background-image: url('../../images/tag_blue.png');
     background-repeat: no-repeat;
     background-position: 3px center;
     background-color: #ffffff;
@@ -752,7 +752,7 @@ div.daily {
     /* Background paper texture by BashCorpo:
        http://www.bashcorpo.dk/textures.php
        http://bashcorpo.deviantart.com/art/Grungy-paper-texture-v-5-22966998  */
-    background-image: url("../images/Paper_texture_v5_by_bashcorpo_w1000.jpg");
+    background-image: url("../../images/Paper_texture_v5_by_bashcorpo_w1000.jpg");
     -webkit-background-size: cover;
     -moz-background-size: cover;
     -o-background-size: cover;
@@ -846,7 +846,7 @@ div.dailyEntryThumbnail {
     width: 100%;
     text-align: center;
     background-color: rgb(128, 128, 128);
-    background: url(../images/50pc_transparent.png);
+    background: url(../../images/50pc_transparent.png);
     padding: 4px 0px 2px 0px;
 }
 
diff --git a/tpl/tagcloud.html b/tpl/Default/tagcloud.html
similarity index 100%
rename from tpl/tagcloud.html
rename to tpl/Default/tagcloud.html
diff --git a/tpl/tools.html b/tpl/Default/tools.html
similarity index 100%
rename from tpl/tools.html
rename to tpl/Default/tools.html