diff -r 58bc29c14a4d -r 82bbfe3dc8a0 language/english/core.json
--- a/language/english/core.json	Wed Mar 18 11:35:28 2009 -0400
+++ b/language/english/core.json	Fri Mar 20 09:13:17 2009 -0400
@@ -1,6 +1,6 @@
 /*
  * Enano - an open-source CMS capable of wiki functions, Drupal-like sidebar blocks, and everything in between
- * Version 1.1.1
+ * Version 1.1.6 (Caoineag beta 1)
  * Copyright (C) 2006-2007 Dan Fuhry
  *
  * This program is Free Software; you can redistribute and/or modify it under the terms of the GNU General Public License
@@ -40,7 +40,7 @@
       tz: 'Time zones',
       plural: 's',
       enano_about_th: 'About the Enano Content Management System',
-      enano_about_poweredby: '<p>This website is powered by <a href="http://enanocms.org/">Enano</a>, the lightweight and open source CMS that everyone can use. Enano is copyright &copy; 2006-2007 Dan Fuhry. For legal information, along with a list of libraries that Enano uses, please see <a href="http://enanocms.org/Legal_information">Legal Information</a>.</p><p>The developers and maintainers of Enano strongly believe that software should not only be free to use, but free to be modified, distributed, and used to create derivative works. For more information about Free Software, check out the <a href="http://en.wikipedia.org/wiki/Free_Software" onclick="window.open(this.href); return false;">Wikipedia page</a> or the <a href="http://www.fsf.org/" onclick="window.open(this.href); return false;">Free Software Foundation\'s</a> homepage.</p>',
+      enano_about_poweredby: '<p>This website is powered by <a href="http://enanocms.org/">Enano</a>, the lightweight and open source CMS that everyone can use. Enano is copyright &copy; 2006-2009 Dan Fuhry. For legal information, along with a list of libraries that Enano uses, please see <a href="http://enanocms.org/Legal_information">Legal Information</a>.</p><p>The developers and maintainers of Enano strongly believe that software should not only be free to use, but free to be modified, distributed, and used to create derivative works. For more information about Free Software, check out the <a href="http://en.wikipedia.org/wiki/Free_Software" onclick="window.open(this.href); return false;">Wikipedia page</a> or the <a href="http://www.fsf.org/" onclick="window.open(this.href); return false;">Free Software Foundation\'s</a> homepage.</p>',
       enano_about_gpl: '<p>This program is Free Software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.</p><p>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 General Public License for details.</p><p>You should have received <a href="%gpl_link%">a copy of the GNU General Public License</a> along with this program; if not, write to:</p><p style="margin-left 2em;">Free Software Foundation, Inc.,<br />51 Franklin Street, Fifth Floor<br />Boston, MA 02110-1301, USA</p><p>Alternatively, you can <a href="http://www.gnu.org/licenses/old-licenses/gpl-2.0.html">read it online</a>.</p>',
       enano_about_lbl_enanoversion: '<a href="http://enanocms.org">Enano</a> version:',
       enano_about_lbl_webserver: 'Web server:',
@@ -258,6 +258,13 @@
       lbl_page_category: 'category',
       lbl_page_external: 'external page',
       
+      lbl_sitetools: 'site tools',
+      lbl_changes: 'changes',
+      
+      btn_changes_mine: 'mine',
+      btn_changes_recent: 'recent',
+      btn_changes_history: 'this page',
+      
       btn_discussion: 'discussion (%num_comments%)',
       btn_discussion_unapp: '<span title="Approved: %num_app% | Unapproved: %num_unapp% | Spam: %num_spam%">discussion (%num_comments%) [!]</span>',
       btn_edit: 'edit this page',
@@ -474,17 +481,18 @@
       clearlogs_confirm_title: 'Clear this page\'s logs?',
       clearlogs_confirm_body: 'This will erase this page\'s entire history and is an irreversible operation.',
       clearlogs_btn_submit: 'Clear Logs',
-      changestyle_select: '[Select]',
-      changestyle_title: 'Change your theme',
-      changestyle_pleaseselect_theme: 'Please select a theme from the list.',
-      changestyle_lbl_theme: 'Theme:',
-      changestyle_lbl_style: 'Style:',
-      changestyle_success: 'Your theme preference has been changed.\nWould you like to reload the page now to see the changes?',
       killphp_confirm: 'Are you really sure you want to do this? Some pages might not function if this emergency-only feature is activated.',
       killphp_success: 'Embedded PHP in pages has been disabled.',
       lbl_moreoptions_nojs: 'More options for this page',
       msg_loading_component: 'Loading %component%...',
       
+      thmsel_lbl_choosetheme: 'Choose a theme',
+      thmsel_lbl_choosestyle: 'Choose a style variation',
+      thmsel_msg_success: 'Theme changed',
+      thmsel_btn_reload: 'Reload page',
+      thmsel_btn_close: 'Close selector and reload later',
+      thmsel_btn_close_hint: 'You will see your new theme choice go into effect the next time you refresh this page.',
+      
       badjson_title: 'The site encountered an error while processing your request.',
       badjson_body: 'We unexpectedly received the following response from the server. The response should have been in the JSON serialization format, but the response wasn\'t composed only of the JSON response. There are three possible triggers for this problem:',
       badjson_tip1: 'The server sent back a bad HTTP response code and thus sent an error page instead of running Enano. This indicates a possible problem with your server, and is not likely to be a bug with Enano.',
@@ -529,6 +537,7 @@
       btn_userpage: 'User page',
       btn_mycontribs: 'My contributions',
       btn_preferences: 'Preferences',
+      btn_preferences_short: 'User CP',
       btn_privatemessages: 'Private messages',
       btn_groupcp: 'Group control panel',
       btn_register: 'Create an account',