From 2cd54fc5837582552df2f8c2361fa108512ff5af Mon Sep 17 00:00:00 2001
From: Matthias Mees <mm@yellowled.de>
Date: Wed, 11 Feb 2015 14:32:24 +0100
Subject: [PATCH] Move/rename 2k15 to next

The name has been changed to protect the innocent. (Meaning the
users. From confusion.)
---
 templates/2k15/UTF-8/lang_de.inc.php          |  15 ---------------
 templates/2k15/UTF-8/lang_en.inc.php          |  15 ---------------
 templates/2k15/lang_de.inc.php                |  15 ---------------
 templates/2k15/lang_en.inc.php                |  15 ---------------
 templates/next/UTF-8/lang_de.inc.php          |  16 ++++++++++++++++
 templates/next/UTF-8/lang_en.inc.php          |  16 ++++++++++++++++
 templates/{2k15 => next}/commentform.tpl      |   0
 templates/{2k15 => next}/comments.tpl         |   4 ++--
 .../{2k15 => next}/comments_by_author.tpl     |   0
 templates/{2k15 => next}/config.inc.php       |  18 +++++++++---------
 templates/{2k15 => next}/content.tpl          |   0
 templates/{2k15 => next}/entries.tpl          |   0
 templates/{2k15 => next}/entries_archives.tpl |   0
 templates/{2k15 => next}/entries_summary.tpl  |   0
 templates/{2k15 => next}/font/fontello.eot    | Bin
 templates/{2k15 => next}/font/fontello.svg    |   0
 templates/{2k15 => next}/font/fontello.ttf    | Bin
 templates/{2k15 => next}/font/fontello.woff   | Bin
 templates/{2k15 => next}/img/xml.gif          | Bin
 templates/{2k15 => next}/index.tpl            |   6 +++---
 templates/{2k15 => next}/info.txt             |   2 +-
 templates/next/lang_de.inc.php                |  16 ++++++++++++++++
 templates/next/lang_en.inc.php                |  16 ++++++++++++++++
 templates/{2k15 => next}/oldie.css            |   0
 templates/{2k15 => next}/plugin_calendar.tpl  |   0
 .../{2k15 => next}/plugin_categories.tpl      |   0
 .../plugin_commentsearch_searchresults.tpl    |   0
 .../{2k15 => next}/plugin_contactform.tpl     |   2 +-
 templates/{2k15 => next}/plugin_findmore.tpl  |   0
 .../{2k15 => next}/plugin_staticblock.tpl     |   0
 .../{2k15 => next}/plugin_staticpage.tpl      |   0
 .../plugin_staticpage_searchresults.tpl       |   0
 .../plugin_staticpage_sidebar.tpl             |   0
 templates/{2k15 => next}/preview.png          | Bin
 templates/{2k15 => next}/preview_fullsize.jpg | Bin
 templates/{2k15 => next}/preview_iframe.tpl   |   0
 templates/{2k15 => next}/scripts/master.js    |   0
 .../scripts/modernizr/modernizr.js            |   0
 templates/{2k15 => next}/sidebar.tpl          |   0
 templates/{2k15 => next}/style.css            |   0
 templates/{2k15 => next}/trackbacks.tpl       |   0
 41 files changed, 80 insertions(+), 76 deletions(-)
 delete mode 100644 templates/2k15/UTF-8/lang_de.inc.php
 delete mode 100644 templates/2k15/UTF-8/lang_en.inc.php
 delete mode 100644 templates/2k15/lang_de.inc.php
 delete mode 100644 templates/2k15/lang_en.inc.php
 create mode 100644 templates/next/UTF-8/lang_de.inc.php
 create mode 100644 templates/next/UTF-8/lang_en.inc.php
 rename templates/{2k15 => next}/commentform.tpl (100%)
 rename templates/{2k15 => next}/comments.tpl (92%)
 rename templates/{2k15 => next}/comments_by_author.tpl (100%)
 rename templates/{2k15 => next}/config.inc.php (91%)
 rename templates/{2k15 => next}/content.tpl (100%)
 rename templates/{2k15 => next}/entries.tpl (100%)
 rename templates/{2k15 => next}/entries_archives.tpl (100%)
 rename templates/{2k15 => next}/entries_summary.tpl (100%)
 rename templates/{2k15 => next}/font/fontello.eot (100%)
 rename templates/{2k15 => next}/font/fontello.svg (100%)
 rename templates/{2k15 => next}/font/fontello.ttf (100%)
 rename templates/{2k15 => next}/font/fontello.woff (100%)
 rename templates/{2k15 => next}/img/xml.gif (100%)
 rename templates/{2k15 => next}/index.tpl (96%)
 rename templates/{2k15 => next}/info.txt (88%)
 create mode 100644 templates/next/lang_de.inc.php
 create mode 100644 templates/next/lang_en.inc.php
 rename templates/{2k15 => next}/oldie.css (100%)
 rename templates/{2k15 => next}/plugin_calendar.tpl (100%)
 rename templates/{2k15 => next}/plugin_categories.tpl (100%)
 rename templates/{2k15 => next}/plugin_commentsearch_searchresults.tpl (100%)
 rename templates/{2k15 => next}/plugin_contactform.tpl (97%)
 rename templates/{2k15 => next}/plugin_findmore.tpl (100%)
 rename templates/{2k15 => next}/plugin_staticblock.tpl (100%)
 rename templates/{2k15 => next}/plugin_staticpage.tpl (100%)
 rename templates/{2k15 => next}/plugin_staticpage_searchresults.tpl (100%)
 rename templates/{2k15 => next}/plugin_staticpage_sidebar.tpl (100%)
 rename templates/{2k15 => next}/preview.png (100%)
 rename templates/{2k15 => next}/preview_fullsize.jpg (100%)
 rename templates/{2k15 => next}/preview_iframe.tpl (100%)
 rename templates/{2k15 => next}/scripts/master.js (100%)
 rename templates/{2k15 => next}/scripts/modernizr/modernizr.js (100%)
 rename templates/{2k15 => next}/sidebar.tpl (100%)
 rename templates/{2k15 => next}/style.css (100%)
 rename templates/{2k15 => next}/trackbacks.tpl (100%)

diff --git a/templates/2k15/UTF-8/lang_de.inc.php b/templates/2k15/UTF-8/lang_de.inc.php
deleted file mode 100644
index 374e5ef3..00000000
--- a/templates/2k15/UTF-8/lang_de.inc.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-// Theme-Optionen
-@define('TWOK15_INSTR', '<b>Hinweis:</b> 2k15 mag <em>aussehen</em>, als sei es im Prinzip wie 2k11 - unter der Haube ist es (technisch gesehen) ein völlig anderes Theme. Es ist daher <strong>nicht</strong> kompatibel mit dem user.css-Generator für 2k11.');
-@define('TWOK15_HEADER_IMG','Bannergrafik im Kopfbereich einbinden? (1296 Pixel breit; Feld leeren um Ausgabe zu unterdrücken)');
-@define('TWOK15_USE_CORENAV', 'Globale Navigation einbinden?');
-@define('TWOK15_WEBFONTS', 'Einen von Google gehosteten Webfont nutzen?');
-@define('TWOK15_NOWEBFONT', 'Keinen Webfont einbinden');
-@define('TWOK15_USERSTYLES', 'user.css einbinden? (Muss selbst im Themeverzeichnis angelegt werden!)');
-@define('TWOK15_REFCOMMENTS', 'Kommentaren (falls vorhanden) einen Link zum Kommentar, auf den geantwortet wurde, hinzufügen?');
-// Sprachkonstanten
-@define('TWOK15_PLINK_TEXT', 'Link');
-@define('TWOK15_PLINK_TITLE', 'Permanenter Link zu diesem Kommentar');
-@define('TWOK15_PLACE_SEARCH', 'Suchbegriff(e)');
-@define('TWOK15_SEND_MAIL', 'Senden');
-@define('TWOK15_REPLYORIGIN', 'Antwort auf');
diff --git a/templates/2k15/UTF-8/lang_en.inc.php b/templates/2k15/UTF-8/lang_en.inc.php
deleted file mode 100644
index e1154ea0..00000000
--- a/templates/2k15/UTF-8/lang_en.inc.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-// Theme options
-@define('TWOK15_INSTR', '<b>Hinweis:</b> While 2k15 may <em>look</em> as if it were basically the same as 2k11, it is a completely different theme from a technical point of view. Because of that, it is <strong>not</strong> compatible with the user.css generator for 2k11.');
-@define('TWOK15_HEADER_IMG','Use a banner image in the header? (1296 pixels wide; leave box empty to not use a banner)');
-@define('TWOK15_USE_CORENAV', 'Use global navigation?');
-@define('TWOK15_WEBFONTS', 'Use a webfont, hosted by Google?');
-@define('TWOK15_NOWEBFONT', 'Include no webfont');
-@define('TWOK15_USERSTYLES', 'Include user.css? (You need to create that file in your theme directory!)');
-@define('TWOK15_REFCOMMENTS', 'Add link to related comment to comments (if they are replies to another comment)?');
-// Lang constants
-@define('TWOK15_PLINK_TEXT', 'Link');
-@define('TWOK15_PLINK_TITLE', 'Permanent link for this comment');
-@define('TWOK15_PLACE_SEARCH', 'Search term(s)');
-@define('TWOK15_SEND_MAIL', 'Send');
-@define('TWOK15_REPLYORIGIN', 'Origin');
diff --git a/templates/2k15/lang_de.inc.php b/templates/2k15/lang_de.inc.php
deleted file mode 100644
index f8d21046..00000000
--- a/templates/2k15/lang_de.inc.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-// Theme-Optionen
-@define('TWOK15_INSTR', '<b>Hinweis:</b> 2k15 mag <em>aussehen</em>, als sei es im Prinzip wie 2k11 - unter der Haube ist es (technisch gesehen) ein völlig anderes Theme. Es ist daher <strong>nicht</strong> kompatibel mit dem user.css-Generator für 2k11.');
-@define('TWOK15_HEADER_IMG','Bannergrafik im Kopfbereich einbinden? (1296 Pixel breit; Feld leeren um Ausgabe zu unterdrücken)');
-@define('TWOK15_USE_CORENAV', 'Globale Navigation einbinden?');
-@define('TWOK15_WEBFONTS', 'Einen von Google gehosteten Webfont nutzen?');
-@define('TWOK15_NOWEBFONT', 'Keinen Webfont einbinden');
-@define('TWOK15_USERSTYLES', 'user.css einbinden? (Muss selbst im Themeverzeichnis angelegt werden!)');
-@define('TWOK15_REFCOMMENTS', 'Kommentaren (falls vorhanden) einen Link zum Kommentar, auf den geantwortet wurde, hinzufügen?');
-// Sprachkonstanten
-@define('TWOK15_PLINK_TEXT', 'Link');
-@define('TWOK15_PLINK_TITLE', 'Permanenter Link zu diesem Kommentar');
-@define('TWOK15_PLACE_SEARCH', 'Suchbegriff(e)');
-@define('TWOK15_SEND_MAIL', 'Senden');
-@define('TWOK15_REPLYORIGIN', 'Antwort auf');
diff --git a/templates/2k15/lang_en.inc.php b/templates/2k15/lang_en.inc.php
deleted file mode 100644
index 5b7d3b5a..00000000
--- a/templates/2k15/lang_en.inc.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-// Theme options
-@define('TWOK15_INSTR', '<b>Hinweis:</b> While 2k15 may <em>look</em> as if it were basically the same as 2k11, it is a completely different theme from a technical point of view. Because of that, it is <strong>not</strong> compatible with the user.css generator for 2k11.');
-@define('TWOK15_HEADER_IMG','Use a banner image in the header? (1296 pixels wide; leave box empty to not use a banner)');
-@define('TWOK15_USE_CORENAV', 'Use global navigation?');
-@define('TWOK15_WEBFONTS', 'Use a webfont, hosted by Google?');
-@define('TWOK15_NOWEBFONT', 'Include no webfont');
-@define('TWOK15_USERSTYLES', 'Include user.css? (You need to create that file in your theme directory!)');
-@define('TWOK15_REFCOMMENTS', 'Add link to related comment to comments (if they are replies to another comment)?');
-// Lang constants
-@define('TWOK15_PLINK_TEXT', 'Link');
-@define('TWOK15_PLINK_TITLE', 'Permanent link for this comment');
-@define('TWOK15_PLACE_SEARCH', 'Search term(s)');
-@define('TWOK15_SEND_MAIL', 'Send');
-@define('TWOK15_REPLYORIGIN', 'Origin');
\ No newline at end of file
diff --git a/templates/next/UTF-8/lang_de.inc.php b/templates/next/UTF-8/lang_de.inc.php
new file mode 100644
index 00000000..236e20ed
--- /dev/null
+++ b/templates/next/UTF-8/lang_de.inc.php
@@ -0,0 +1,16 @@
+<?php
+// Theme-Optionen
+@define('NEXT_INSTR', '<b>Hinweis:</b> Next mag <em>aussehen</em>, als sei es im Prinzip wie 2k11 - unter der Haube ist es (technisch gesehen) ein völlig anderes Theme. Es ist daher <strong>nicht</strong> kompatibel mit dem user.css-Generator für 2k11.');
+@define('NEXT_HEADER_IMG','Bannergrafik im Kopfbereich einbinden? (1296 Pixel breit; Feld leeren um Ausgabe zu unterdrücken)');
+@define('NEXT_USE_CORENAV', 'Globale Navigation einbinden?');
+@define('NEXT_WEBFONTS', 'Einen von Google gehosteten Webfont nutzen?');
+@define('NEXT_NOWEBFONT', 'Keinen Webfont einbinden');
+@define('NEXT_USERSTYLES', 'user.css einbinden? (Muss selbst im Themeverzeichnis angelegt werden!)');
+@define('NEXT_REFCOMMENTS', 'Kommentaren (falls vorhanden) einen Link zum Kommentar, auf den geantwortet wurde, hinzufügen?');
+// Sprachkonstanten
+@define('NEXT_PLINK_TEXT', 'Link');
+@define('NEXT_PLINK_TITLE', 'Permanenter Link zu diesem Kommentar');
+@define('NEXT_PLACE_SEARCH', 'Suchbegriff(e)');
+@define('NEXT_SEND_MAIL', 'Senden');
+@define('NEXT_REPLYORIGIN', 'Antwort auf');
+@define('NEXT_NAVTEXT', 'Menü');
diff --git a/templates/next/UTF-8/lang_en.inc.php b/templates/next/UTF-8/lang_en.inc.php
new file mode 100644
index 00000000..c9d3a4d7
--- /dev/null
+++ b/templates/next/UTF-8/lang_en.inc.php
@@ -0,0 +1,16 @@
+<?php
+// Theme options
+@define('NEXT_INSTR', '<b>Hinweis:</b> While Next may <em>look</em> as if it were basically the same as 2k11, it is a completely different theme from a technical point of view. Because of that, it is <strong>not</strong> compatible with the user.css generator for 2k11.');
+@define('NEXT_HEADER_IMG','Use a banner image in the header? (1296 pixels wide; leave box empty to not use a banner)');
+@define('NEXT_USE_CORENAV', 'Use global navigation?');
+@define('NEXT_WEBFONTS', 'Use a webfont, hosted by Google?');
+@define('NEXT_NOWEBFONT', 'Include no webfont');
+@define('NEXT_USERSTYLES', 'Include user.css? (You need to create that file in your theme directory!)');
+@define('NEXT_REFCOMMENTS', 'Add link to related comment to comments (if they are replies to another comment)?');
+// Lang constants
+@define('NEXT_PLINK_TEXT', 'Link');
+@define('NEXT_PLINK_TITLE', 'Permanent link for this comment');
+@define('NEXT_PLACE_SEARCH', 'Search term(s)');
+@define('NEXT_SEND_MAIL', 'Send');
+@define('NEXT_REPLYORIGIN', 'Origin');
+@define('NEXT_NAVTEXT', 'Menu');
diff --git a/templates/2k15/commentform.tpl b/templates/next/commentform.tpl
similarity index 100%
rename from templates/2k15/commentform.tpl
rename to templates/next/commentform.tpl
diff --git a/templates/2k15/comments.tpl b/templates/next/comments.tpl
similarity index 92%
rename from templates/2k15/comments.tpl
rename to templates/next/comments.tpl
index 4b67c473..4aae7398 100644
--- a/templates/2k15/comments.tpl
+++ b/templates/next/comments.tpl
@@ -24,13 +24,13 @@
         {/if}
             <ul class="meta">
                 <li><time>{$comment.timestamp|formatTime:'%H:%M'}</time></li>
-                <li><a class="comment_source_trace" href="#c{$comment.id}" title="{$CONST.TWOK15_PLINK_TITLE}">{$CONST.TWOK15_PLINK_TEXT}</a></li>
+                <li><a class="comment_source_trace" href="#c{$comment.id}" title="{$CONST.NEXT_PLINK_TITLE}">{$CONST.NEXT_PLINK_TEXT}</a></li>
             {if $entry.is_entry_owner}
                 <li><a class="comment_source_ownerlink" href="{$comment.link_delete}" title="{$CONST.COMMENT_DELETE_CONFIRM|sprintf:$comment.id:$comment.author}">{$CONST.DELETE}</a></li>
             {/if}
         {if $template_option.refcomments == true}
             {if $comment.parent_id != '0'}
-                <li><a class="reply_origin" href="#c{$comment.parent_id}" title="{$CONST.TWOK15_REPLYORIGIN}: {$CONST.COMMENT} #c{$comment.parent_id}">{$CONST.TWOK15_REPLYORIGIN}</a></li>
+                <li><a class="reply_origin" href="#c{$comment.parent_id}" title="{$CONST.NEXT_REPLYORIGIN}: {$CONST.COMMENT} #c{$comment.parent_id}">{$CONST.NEXT_REPLYORIGIN}</a></li>
             {/if}
         {/if}
             {if $entry.allow_comments AND $comment.body != 'COMMENT_DELETED'}
diff --git a/templates/2k15/comments_by_author.tpl b/templates/next/comments_by_author.tpl
similarity index 100%
rename from templates/2k15/comments_by_author.tpl
rename to templates/next/comments_by_author.tpl
diff --git a/templates/2k15/config.inc.php b/templates/next/config.inc.php
similarity index 91%
rename from templates/2k15/config.inc.php
rename to templates/next/config.inc.php
index eb7f426a..5c2e7204 100644
--- a/templates/2k15/config.inc.php
+++ b/templates/next/config.inc.php
@@ -41,10 +41,10 @@ if (is_array($required_fieldlist)) {
 
 $template_config = array(
     array(
-      'var'           => 'info2k15',
-      'name'          => 'info2k15',
+      'var'           => 'infonext',
+      'name'          => 'infonext',
       'type'          => 'custom',
-      'custom'        => TWOK15_INSTR,
+      'custom'        => NEXT_INSTR,
     ),
     array(
         'var' => 'date_format',
@@ -65,16 +65,16 @@ $template_config = array(
     ),
     array(
         'var' => 'header_img',
-        'name' => TWOK15_HEADER_IMG,
+        'name' => NEXT_HEADER_IMG,
         'type' => 'media',
         'default' => serendipity_getTemplateFile('header.jpg', 'serendipityHTTPPath', true)
     ),
     array(
         'var' => 'webfonts',
-        'name' => TWOK15_WEBFONTS,
+        'name' => NEXT_WEBFONTS,
         'type' => 'select',
         'default' => 'none',
-        'select_values' => array('none' => TWOK15_NOWEBFONT,
+        'select_values' => array('none' => NEXT_NOWEBFONT,
                                 'osans' => 'Open Sans',
                                 'ssans' => 'Source Sans Pro',
                                 'rsans' => 'Roboto',
@@ -84,19 +84,19 @@ $template_config = array(
     ),
     array(
         'var' => 'userstyles',
-        'name' => TWOK15_USERSTYLES,
+        'name' => NEXT_USERSTYLES,
         'type' => 'boolean',
         'default' => false
     ),
     array(
         'var' => 'refcomments',
-        'name' => TWOK15_REFCOMMENTS,
+        'name' => NEXT_REFCOMMENTS,
         'type' => 'boolean',
         'default' => false
     ),
     array(
         'var' => 'use_corenav',
-        'name' => TWOK15_USE_CORENAV,
+        'name' => NEXT_USE_CORENAV,
         'type' => 'boolean',
         'default' => true
     )
diff --git a/templates/2k15/content.tpl b/templates/next/content.tpl
similarity index 100%
rename from templates/2k15/content.tpl
rename to templates/next/content.tpl
diff --git a/templates/2k15/entries.tpl b/templates/next/entries.tpl
similarity index 100%
rename from templates/2k15/entries.tpl
rename to templates/next/entries.tpl
diff --git a/templates/2k15/entries_archives.tpl b/templates/next/entries_archives.tpl
similarity index 100%
rename from templates/2k15/entries_archives.tpl
rename to templates/next/entries_archives.tpl
diff --git a/templates/2k15/entries_summary.tpl b/templates/next/entries_summary.tpl
similarity index 100%
rename from templates/2k15/entries_summary.tpl
rename to templates/next/entries_summary.tpl
diff --git a/templates/2k15/font/fontello.eot b/templates/next/font/fontello.eot
similarity index 100%
rename from templates/2k15/font/fontello.eot
rename to templates/next/font/fontello.eot
diff --git a/templates/2k15/font/fontello.svg b/templates/next/font/fontello.svg
similarity index 100%
rename from templates/2k15/font/fontello.svg
rename to templates/next/font/fontello.svg
diff --git a/templates/2k15/font/fontello.ttf b/templates/next/font/fontello.ttf
similarity index 100%
rename from templates/2k15/font/fontello.ttf
rename to templates/next/font/fontello.ttf
diff --git a/templates/2k15/font/fontello.woff b/templates/next/font/fontello.woff
similarity index 100%
rename from templates/2k15/font/fontello.woff
rename to templates/next/font/fontello.woff
diff --git a/templates/2k15/img/xml.gif b/templates/next/img/xml.gif
similarity index 100%
rename from templates/2k15/img/xml.gif
rename to templates/next/img/xml.gif
diff --git a/templates/2k15/index.tpl b/templates/next/index.tpl
similarity index 96%
rename from templates/2k15/index.tpl
rename to templates/next/index.tpl
index a8e39c93..ecd63750 100644
--- a/templates/2k15/index.tpl
+++ b/templates/next/index.tpl
@@ -49,7 +49,7 @@
 
         <form id="searchform" action="{$serendipityHTTPPath}{$serendipityIndexFile}" method="get" role="search">
             <input type="hidden" name="serendipity[action]" value="search">
-            <input id="serendipityQuickSearchTermField" name="serendipity[searchTerm]" type="search" placeholder="{$CONST.TWOK15_PLACE_SEARCH}" value="">
+            <input id="serendipityQuickSearchTermField" name="serendipity[searchTerm]" type="search" placeholder="{$CONST.NEXT_PLACE_SEARCH}" value="">
             <label for="serendipityQuickSearchTermField"><span class="icon-search" aria-hidden="true"></span><span class="fallback-text">{$CONST.QUICKSEARCH}</span></label>
             <input id="searchsend" name="serendipity[searchButton]" type="submit" value="{$CONST.GO}">
         </form>
@@ -61,7 +61,7 @@
     </div>
     {/if}
     <div id="navbar">
-        <a id="open-nav" class="nav-toggle" href="#site-nav"><span class="icon-menu" aria-hidden="true"></span><span class="fallback-text">Navigation</span></a>
+        <a id="open-nav" class="nav-toggle" href="#site-nav"><span class="icon-menu" aria-hidden="true"></span><span class="fallback-text">{$CONST.NEXT_NAVTEXT}</span></a>
 
         <nav id="site-nav" class="nav-collapse">
             <ul>{foreach from=$navlinks item="navlink" name="sbnav"}{if $navlink.title!=""&&$navlink.href!=""}<li>{if $currpage==$navlink.href or $currpage2==$navlink.href}<span>{else}<a href="{$navlink.href}">{/if}{$navlink.title}{if $currpage==$navlink.href or $currpage2==$navlink.href}</span>{else}</a>{/if}</li>{/if}{/foreach}</ul>
@@ -83,7 +83,7 @@
 {/if}
 
     <footer id="colophon" class="clearfix">
-        <p lang="en">Powered by <a href="http://s9y.org">Serendipity</a> <abbr title="and">&amp;</abbr> the <i>2k15</i> theme.</p>
+        <p lang="en">Powered by <a href="http://s9y.org">Serendipity</a> <abbr title="and">&amp;</abbr> the <i>Next</i> theme.</p>
     </footer>
 
     <script src="{serendipity_getFile file="scripts/master.js"}"></script>
diff --git a/templates/2k15/info.txt b/templates/next/info.txt
similarity index 88%
rename from templates/2k15/info.txt
rename to templates/next/info.txt
index 4a3aa2a0..7e8c8664 100644
--- a/templates/2k15/info.txt
+++ b/templates/next/info.txt
@@ -1,4 +1,4 @@
-Name: 2k15
+Name: Next
 Author: Matthias Mees, mm@yellowled.de
 Date: 2015-02-10
 Require Serendipity: 2.0
diff --git a/templates/next/lang_de.inc.php b/templates/next/lang_de.inc.php
new file mode 100644
index 00000000..2e05682f
--- /dev/null
+++ b/templates/next/lang_de.inc.php
@@ -0,0 +1,16 @@
+<?php
+// Theme-Optionen
+@define('NEXT_INSTR', '<b>Hinweis:</b> Next mag <em>aussehen</em>, als sei es im Prinzip wie 2k11 - unter der Haube ist es (technisch gesehen) ein völlig anderes Theme. Es ist daher <strong>nicht</strong> kompatibel mit dem user.css-Generator für 2k11.');
+@define('NEXT_HEADER_IMG','Bannergrafik im Kopfbereich einbinden? (1296 Pixel breit; Feld leeren um Ausgabe zu unterdrücken)');
+@define('NEXT_USE_CORENAV', 'Globale Navigation einbinden?');
+@define('NEXT_WEBFONTS', 'Einen von Google gehosteten Webfont nutzen?');
+@define('NEXT_NOWEBFONT', 'Keinen Webfont einbinden');
+@define('NEXT_USERSTYLES', 'user.css einbinden? (Muss selbst im Themeverzeichnis angelegt werden!)');
+@define('NEXT_REFCOMMENTS', 'Kommentaren (falls vorhanden) einen Link zum Kommentar, auf den geantwortet wurde, hinzufügen?');
+// Sprachkonstanten
+@define('NEXT_PLINK_TEXT', 'Link');
+@define('NEXT_PLINK_TITLE', 'Permanenter Link zu diesem Kommentar');
+@define('NEXT_PLACE_SEARCH', 'Suchbegriff(e)');
+@define('NEXT_SEND_MAIL', 'Senden');
+@define('NEXT_REPLYORIGIN', 'Antwort auf');
+@define('NEXT_NAVTEXT', 'Menü');
diff --git a/templates/next/lang_en.inc.php b/templates/next/lang_en.inc.php
new file mode 100644
index 00000000..c9d3a4d7
--- /dev/null
+++ b/templates/next/lang_en.inc.php
@@ -0,0 +1,16 @@
+<?php
+// Theme options
+@define('NEXT_INSTR', '<b>Hinweis:</b> While Next may <em>look</em> as if it were basically the same as 2k11, it is a completely different theme from a technical point of view. Because of that, it is <strong>not</strong> compatible with the user.css generator for 2k11.');
+@define('NEXT_HEADER_IMG','Use a banner image in the header? (1296 pixels wide; leave box empty to not use a banner)');
+@define('NEXT_USE_CORENAV', 'Use global navigation?');
+@define('NEXT_WEBFONTS', 'Use a webfont, hosted by Google?');
+@define('NEXT_NOWEBFONT', 'Include no webfont');
+@define('NEXT_USERSTYLES', 'Include user.css? (You need to create that file in your theme directory!)');
+@define('NEXT_REFCOMMENTS', 'Add link to related comment to comments (if they are replies to another comment)?');
+// Lang constants
+@define('NEXT_PLINK_TEXT', 'Link');
+@define('NEXT_PLINK_TITLE', 'Permanent link for this comment');
+@define('NEXT_PLACE_SEARCH', 'Search term(s)');
+@define('NEXT_SEND_MAIL', 'Send');
+@define('NEXT_REPLYORIGIN', 'Origin');
+@define('NEXT_NAVTEXT', 'Menu');
diff --git a/templates/2k15/oldie.css b/templates/next/oldie.css
similarity index 100%
rename from templates/2k15/oldie.css
rename to templates/next/oldie.css
diff --git a/templates/2k15/plugin_calendar.tpl b/templates/next/plugin_calendar.tpl
similarity index 100%
rename from templates/2k15/plugin_calendar.tpl
rename to templates/next/plugin_calendar.tpl
diff --git a/templates/2k15/plugin_categories.tpl b/templates/next/plugin_categories.tpl
similarity index 100%
rename from templates/2k15/plugin_categories.tpl
rename to templates/next/plugin_categories.tpl
diff --git a/templates/2k15/plugin_commentsearch_searchresults.tpl b/templates/next/plugin_commentsearch_searchresults.tpl
similarity index 100%
rename from templates/2k15/plugin_commentsearch_searchresults.tpl
rename to templates/next/plugin_commentsearch_searchresults.tpl
diff --git a/templates/2k15/plugin_contactform.tpl b/templates/next/plugin_contactform.tpl
similarity index 97%
rename from templates/2k15/plugin_contactform.tpl
rename to templates/next/plugin_contactform.tpl
index 5752e2b1..73803376 100644
--- a/templates/2k15/plugin_contactform.tpl
+++ b/templates/next/plugin_contactform.tpl
@@ -40,7 +40,7 @@
             {serendipity_hookPlugin hook="frontend_comment" data=$commentform_entry}
 
             <div class="form_buttons">
-                <input id="serendipity_submit" type="submit" name="serendipity[submit]" value="{$CONST.TWOK15_SEND_MAIL}">
+                <input id="serendipity_submit" type="submit" name="serendipity[submit]" value="{$CONST.NEXT_SEND_MAIL}">
             </div>
         </form>
     </div>
diff --git a/templates/2k15/plugin_findmore.tpl b/templates/next/plugin_findmore.tpl
similarity index 100%
rename from templates/2k15/plugin_findmore.tpl
rename to templates/next/plugin_findmore.tpl
diff --git a/templates/2k15/plugin_staticblock.tpl b/templates/next/plugin_staticblock.tpl
similarity index 100%
rename from templates/2k15/plugin_staticblock.tpl
rename to templates/next/plugin_staticblock.tpl
diff --git a/templates/2k15/plugin_staticpage.tpl b/templates/next/plugin_staticpage.tpl
similarity index 100%
rename from templates/2k15/plugin_staticpage.tpl
rename to templates/next/plugin_staticpage.tpl
diff --git a/templates/2k15/plugin_staticpage_searchresults.tpl b/templates/next/plugin_staticpage_searchresults.tpl
similarity index 100%
rename from templates/2k15/plugin_staticpage_searchresults.tpl
rename to templates/next/plugin_staticpage_searchresults.tpl
diff --git a/templates/2k15/plugin_staticpage_sidebar.tpl b/templates/next/plugin_staticpage_sidebar.tpl
similarity index 100%
rename from templates/2k15/plugin_staticpage_sidebar.tpl
rename to templates/next/plugin_staticpage_sidebar.tpl
diff --git a/templates/2k15/preview.png b/templates/next/preview.png
similarity index 100%
rename from templates/2k15/preview.png
rename to templates/next/preview.png
diff --git a/templates/2k15/preview_fullsize.jpg b/templates/next/preview_fullsize.jpg
similarity index 100%
rename from templates/2k15/preview_fullsize.jpg
rename to templates/next/preview_fullsize.jpg
diff --git a/templates/2k15/preview_iframe.tpl b/templates/next/preview_iframe.tpl
similarity index 100%
rename from templates/2k15/preview_iframe.tpl
rename to templates/next/preview_iframe.tpl
diff --git a/templates/2k15/scripts/master.js b/templates/next/scripts/master.js
similarity index 100%
rename from templates/2k15/scripts/master.js
rename to templates/next/scripts/master.js
diff --git a/templates/2k15/scripts/modernizr/modernizr.js b/templates/next/scripts/modernizr/modernizr.js
similarity index 100%
rename from templates/2k15/scripts/modernizr/modernizr.js
rename to templates/next/scripts/modernizr/modernizr.js
diff --git a/templates/2k15/sidebar.tpl b/templates/next/sidebar.tpl
similarity index 100%
rename from templates/2k15/sidebar.tpl
rename to templates/next/sidebar.tpl
diff --git a/templates/2k15/style.css b/templates/next/style.css
similarity index 100%
rename from templates/2k15/style.css
rename to templates/next/style.css
diff --git a/templates/2k15/trackbacks.tpl b/templates/next/trackbacks.tpl
similarity index 100%
rename from templates/2k15/trackbacks.tpl
rename to templates/next/trackbacks.tpl