Updates for both Smarty 3 and Ink FrameworkINK_Port

24 files changed, 224 insertions, 252 deletions

diff --git a/adodb b/adodb
new file mode 160000
+Subproject ae61ce7f153e66effbf68cc088d981c8c040000
diff --git a/modules/mod_admin_menu.tpl b/modules/mod_admin_menu.tpl
index 76a509f..96e72ca 100644
--- a/modules/mod_admin_menu.tpl
+++ b/modules/mod_admin_menu.tpl
@@ -10,7 +10,7 @@
 			&nbsp;&nbsp;{tr}{$key|capitalize}{/tr}</a>
 
 			<div id="{$key}admenu">
-				{include file=`$menu.tpl`}
+				{include file=$menu.tpl}
 			</div>
 
 			<script type="text/javascript">
diff --git a/modules/mod_package_menu.tpl b/modules/mod_package_menu.tpl
index b0d0e83..63a0524 100644
--- a/modules/mod_package_menu.tpl
+++ b/modules/mod_package_menu.tpl
@@ -2,7 +2,7 @@
 {if $packageMenu}
 	{bitmodule title="$moduleTitle" name="package_menu"}
 		<div class="menu">
-			{include file=$packageMenu.menu_template}
+			{include file=$packageMenu.menu_template packageMenuClass="unstyled"}
 		</div>
 	{/bitmodule}
 {/if}
diff --git a/modules/mod_twitter_feed.tpl b/modules/mod_twitter_feed.tpl
index 0700a94..62442e5 100644
--- a/modules/mod_twitter_feed.tpl
+++ b/modules/mod_twitter_feed.tpl
@@ -1,38 +1,22 @@
 {strip}

+{if $smarty.cookies.cc_social eq 'yes'}

 {bitmodule title="$moduleTitle" name="twitter"}

 	<div style="text-align:center;">

-			<div id="js_twitter" style="font-family:monospace;">

-				<script src="http://widgets.twimg.com/j/2/widget.js"></script>

-				<script type="text/javascript">

-					/* <![CDATA[ */

-					new TWTR.Widget({ldelim}

-					  version: 2,

-					  type: 'profile',

-					  rpp: 4,

-					  interval: 30000,

-					  width: 222,

-					  height: 240,

-					  theme: {ldelim}

-					    shell: {ldelim}

-					      background: '#ffffff',

-					      color: '#ff8800'

-					    {rdelim},

-					    tweets: {ldelim}

-					      background: '#eeeeee',

-					      color: '#000000',

-					      links: '#eb072d'

-					    {rdelim}

-					  {rdelim},

-					  features: {ldelim}

-					    scrollbar: false,

-					    loop: false,

-					    live: false,

-					    behavior: 'all'

-					  {rdelim}

-					{rdelim}).render().setUser('{$moduleTitle}').start();

-					/* ]]> */

-				</script>

-			</div>

+		<div id="js_twitter" style="font-family:monospace;">

+			<a class="twitter-timeline" width="219px" height="200px" href="https://twitter.com/CotswolSecurity" 

+				data-widget-id="12345678" data-link-color="#cc0000"

+				data-tweet-limit="3" data-chrome="nofooter noborders transparent">

+				Tweets by @CotswolSecurity

+			</a>

+			<script>

+				!function(d,s,id){ldelim}var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';

+				if(!d.getElementById(id)){ldelim}js=d.createElement(s);

+				js.id=id;

+				js.src=p+"://platform.twitter.com/widgets.js";

+				fjs.parentNode.insertBefore(js,fjs);{rdelim}{rdelim}(document,"script","twitter-wjs");

+			</script>

+		</div>

 	</div>

 {/bitmodule}

+{/if}

 {/strip}
\ No newline at end of file
diff --git a/templates/admin.tpl b/templates/admin.tpl
index 03aaddf..70e75bb 100644
--- a/templates/admin.tpl
+++ b/templates/admin.tpl
@@ -36,7 +36,7 @@
 							{formfeedback warning="{tr}Seems you are using a test version.{/tr}"}
 						{/if}
 
-						<div class="control-group">
+						<div class="control-group column-group gutters">
 							{formlabel label="Your Version"}
 							{forminput}
 								<strong>bitweaver {$version_info.local}</strong>
@@ -44,7 +44,7 @@
 						</div>
 
 						{if $version_info.compare < 0}
-							<div class="control-group">
+							<div class="control-group column-group gutters">
 								{formlabel label="Upgrade"}
 								{forminput class=warning}
 									<strong>bitweaver {$version_info.upgrade}</strong>
@@ -52,7 +52,7 @@
 								{/forminput}
 							</div>
 						{elseif $version_info.compare > 0}
-							<div class="control-group">
+							<div class="control-group column-group gutters">
 								{formlabel label="Latest Version"}
 								{forminput}
 									<strong>bitweaver {$version_info.upgrade}</strong>
@@ -62,7 +62,7 @@
 						{/if}
 
 						{if $version_info.release}
-							<div class="control-group">
+							<div class="control-group column-group gutters">
 								{formlabel label="Latest Release"}
 								{forminput class=warning}
 									<strong>bitweaver {$version_info.release}</strong>
@@ -74,16 +74,21 @@
 				{/if}
 			{/if}
 
-			<div class="row">
+			<table width="100%" class="menutable">
+				<tr>
 					{assign var="i" value="1"}
 					{foreach key=key item=template from=$adminTemplates}
-						<div class="col-md-4">
-							{box class="`$key`menu menu box" ipackage=$key iname="pkg_`$key`" iexplain="$key" iclass="menuicon" title=$key|capitalize}
+						<td class="large-33 aligntop">
+							{box class="`$key`menu menu box vspace" ipackage=$key iname="pkg_`$key`" iexplain="$key" iclass="menuicon" title=$key|capitalize}
 								{include file="bitpackage:`$key`/menu_`$key`_admin.tpl" packageMenuClass="unstyled"}
 							{/box}
-						</div>
+						</td>
+						{if not ($i++ mod 3)}
+							</tr><tr>
+						{/if}
 					{/foreach}
-			</div>
+				</tr>
+			</table>
 		{/if}
 	</div><!-- end .body -->
 </div><!-- end .body -->
diff --git a/templates/admin_features.tpl b/templates/admin_features.tpl
index bc0bc90..38dd387 100644
--- a/templates/admin_features.tpl
+++ b/templates/admin_features.tpl
@@ -6,7 +6,7 @@
 			<input type="hidden" name="page" value="{$page}" />
 			{legend legend="URL Settings"}
 				{foreach from=$formBit key=feature item=output}
-					<div class="control-group">
+					<div class="control-group column-group gutters">
 						{formlabel label=$output.label for=$feature}
 						{forminput}
 							{html_checkboxes name="$feature" values="y" checked=$gBitSystem->getConfig($feature) labels=false id=$feature}
@@ -18,7 +18,7 @@
 
 			{legend legend="bitweaver Help Features"}
 				{foreach from=$formHelp key=feature item=output}
-					<div class="control-group">
+					<div class="control-group column-group gutters">
 						{formlabel label=$output.label for=$feature}
 						{forminput}
 							{html_checkboxes name="$feature" values="y" checked=$gBitSystem->getConfig($feature) labels=false id=$feature}
@@ -31,7 +31,7 @@
 
 		{jstab title="Homepage Settings"}
 			{legend legend="Homepage Settings"}
-				<div class="control-group">
+				<div class="control-group column-group gutters">
 					{formlabel label="Home page" for="bit_index"}
 					{forminput}
 						<select name="bit_index" id="bit_index">
@@ -59,7 +59,7 @@
 					{/forminput}
 				</div>
 
-				<div class="control-group">
+				<div class="control-group column-group gutters">
 					{formlabel label="URI for custom home" for="site_url_index"}
 					{forminput}
 						<input type="text" id="site_url_index" name="site_url_index" value="{$gBitSystem->getConfig('site_url_index')|escape}" size="50" />
@@ -71,14 +71,15 @@
 
 		{jstab title="Miscellaneous"}
 			{legend legend="Date and Time Formats"}
-				<div class="control-group">
-					<label class="checkbox">
-						<input type="checkbox" name="site_display_reltime" id="site_display_reltime" {if $gBitSystem->isFeatureActive('site_display_reltime')}checked="checked"{/if} />Relative Time Display
+				<div class="row">
+					{formlabel label="Relative Time Display" for="site_display_reltime"}
+					{forminput}
+						{html_checkboxes name="site_display_reltime" values="y" labels=false id="site_display_reltime"}
 						{formhelp note="If enabled, the date and time will be displayed relative to the time of posting (on occasion), e.g., 'Yesterday' instead of 'January 1, 1970'. "}
-					</label>
+					{/forminput}
 				</div>
 				
-				<div class="control-group">
+				<div class="control-group column-group gutters">
 					{formlabel label="Long date" for="site_long_date_format"}
 					{forminput}
 						<input type="text" name="site_long_date_format" id="site_long_date_format" value="{$gBitSystem->getConfig('site_long_date_format')|escape}" size="50"/>
@@ -86,7 +87,7 @@
 					{/forminput}
 				</div>
 
-				<div class="control-group">
+				<div class="control-group column-group gutters">
 					{formlabel label="Short date" for="site_short_date_format"}
 					{forminput}
 						<input type="text" name="site_short_date_format" id="site_short_date_format" value="{$gBitSystem->getConfig('site_short_date_format')|escape}" size="50"/>
@@ -94,7 +95,7 @@
 					{/forminput}
 				</div>
 
-				<div class="control-group">
+				<div class="control-group column-group gutters">
 					{formlabel label="Long time" for="site_long_time_format"}
 					{forminput}
 						<input type="text" name="site_long_time_format" id="site_long_time_format" value="{$gBitSystem->getConfig('site_long_time_format')|escape}" size="50"/>
@@ -102,7 +103,7 @@
 					{/forminput}
 				</div>
 
-				<div class="control-group">
+				<div class="control-group column-group gutters">
 					{formlabel label="Short time" for="site_short_time_format"}
 					{forminput}
 						<input type="text" name="site_short_time_format" id="site_short_time_format" value="{$gBitSystem->getConfig('site_short_time_format')|escape}" size="50"/>
@@ -110,21 +111,21 @@
 					{/forminput}
 				</div>
 
-				<div class="control-group">
+				<div class="control-group column-group gutters">
 					{formlabel label="Long date and time" for="site_long_datetime_format"}
 					{forminput}
 						<input type="text" name="site_long_datetime_format" id="site_long_datetime_format" value="{$gBitSystem->getConfig('site_long_datetime_format')|escape}" size="50"/>
 						{formhelp note="Default: %A %d of %B, %Y (%H:%M:%S %Z)"}
 					{/forminput}
 				</div>
-				<div class="control-group">
+				<div class="control-group column-group gutters">
 					{formlabel label="Short date and time" for="site_short_datetime_format"}
 					{forminput}
 						<input type="text" name="site_short_datetime_format" id="site_short_datetime_format" value="{$gBitSystem->getConfig('site_short_datetime_format')|escape}" size="50"/>
 						{formhelp note="Default: %a %d of %b, %Y (%H:%M %Z)"}
 					{/forminput}
 				</div>
-				<div class="control-group">
+				<div class="control-group column-group gutters">
 					{formlabel label="Online Help:"}
 					{forminput}
 						{formhelp note="<a class=\"external\" href=\"http://www.php.net/manual/`$bitlanguage`/function.strftime.php\">Conversion specifiers for date and time formats</a> (php.net)"}
@@ -137,7 +138,7 @@
 				<p class="help">{tr}To improve accessibility on your website further, you can activate the following feature. Most of these settings will not be visible to the common user but if you are using a browser such as <a class="external" href="http://elinks.or.cz">Elinks</a> or have the navigation bar active in <a class="external" href="http://www.opera.com">Opera</a> or the <a class="external" href="http://cdn.mozdev.org/linkToolbar/">linkToolbar</a> extension installed in <a class="external" href="http://www.mozilla.org">Firefox</a> these features will be visible to you. Any values left blank will not be inserted.{/tr}</p>
 
 				{foreach from=$extendedHeader key=feature item=output}
-					<div class="control-group">
+					<div class="control-group column-group gutters">
 						{formlabel label=$output.label for=$feature}
 						{forminput}
 							{if $output.type == 'checkbox'}
@@ -152,7 +153,7 @@
 			{/legend}
 
 			{legend legend="Other stuff"}
-				<div class="control-group">
+				<div class="control-group column-group gutters">
 					{formlabel label="Maximum records" for="max_records"}
 					{forminput}
 						<input size="5" type="text" name="max_records" id="max_records" value="{$gBitSystem->getConfig('max_records')|escape}" />
@@ -161,7 +162,7 @@
 				</div>
 
 				{foreach from=$formMisc key=feature item=output}
-					<div class="control-group">
+					<div class="control-group column-group gutters">
 						{formlabel label=$output.label for=$feature}
 						{forminput}
 							{html_checkboxes name="$feature" values="y" checked=$gBitSystem->getConfig($feature) labels=false id=$feature}
@@ -175,7 +176,7 @@
 	{/jstabs}
 
 	<div class="control-group submit">
-		<input type="submit" class="btn btn-default" name="change_prefs" value="{tr}Change preferences{/tr}" />
+		<input type="submit" class="ink-button" name="change_prefs" value="{tr}Change preferences{/tr}" />
 	</div>
 {/form}
 {/strip}
diff --git a/templates/admin_menu_options.tpl b/templates/admin_menu_options.tpl
index 511b718..2d6325c 100644
--- a/templates/admin_menu_options.tpl
+++ b/templates/admin_menu_options.tpl
@@ -12,7 +12,7 @@
 				<input type="hidden" name="page" value="{$page}" />
 				<input type="hidden" name="option_id" value="{$option_id|escape}" />
 				<input type="hidden" name="menu_id" value="{$menu_id|escape}" />
-				<div class="control-group">
+				<div class="control-group column-group gutters">
 					{formlabel label="Name" for="menu_name"}
 					{forminput}
 						<input id="menu_name" type="text" name="name" value="{$name|escape}"size="34"  />
@@ -20,7 +20,7 @@
 					{/forminput}
 				</div>
 
-				<div class="control-group">
+				<div class="control-group column-group gutters">
 					{formlabel label="URL" for="menu_url"}
 					{forminput}
 						<input id="menu_url" type="text" name="url" value="{$url|escape}" size="34" />
@@ -28,7 +28,7 @@
 					{/forminput}
 				</div>
 
-				<div class="control-group">
+				<div class="control-group column-group gutters">
 					{formlabel label="Package" for="menu_section"}
 					{forminput}
 						<input id="menu_section" type="text" name="section" value="{$section|escape}" size="34" />
@@ -36,7 +36,7 @@
 					{/forminput}
 				</div>
 
-				<div class="control-group">
+				<div class="control-group column-group gutters">
 					{formlabel label="Permissions" for="menu_perm"}
 					{forminput}
 						<input id="menu_perm" type="text" name="perm" value="{$perm|escape}" size="34" />
@@ -44,7 +44,7 @@
 					{/forminput}
 				</div>
 
-				<div class="control-group">
+				<div class="control-group column-group gutters">
 					{formlabel label="Group" for="menu_groupname"}
 					{forminput}
 						<input id="menu_groupname" type="text" name="groupname" value="{$groupname|escape}" size="34" />
@@ -52,7 +52,7 @@
 					{/forminput}
 				</div>
 
-				<div class="control-group">
+				<div class="control-group column-group gutters">
 					{formlabel label="Type" for="type"}
 					{forminput}
 						<select name="type" id="type">
@@ -63,7 +63,7 @@
 					{/forminput}
 				</div>
 
-				<div class="control-group">
+				<div class="control-group column-group gutters">
 					{formlabel label="Position" for="position"}
 					{forminput}
 						<input type="text" name="position" id="position" value="{$position|escape}" size="5" />
@@ -72,7 +72,7 @@
 				</div>
 
 				<div class="control-group submit">
-					<input type="submit" class="btn btn-default" name="save" value="{tr}Save{/tr}" />
+					<input type="submit" class="ink-button" name="save" value="{tr}Save{/tr}" />
 				</div>
 			{/form}
 
diff --git a/templates/admin_notifications.tpl b/templates/admin_notifications.tpl
index 787c30c..00c7235 100644
--- a/templates/admin_notifications.tpl
+++ b/templates/admin_notifications.tpl
@@ -11,7 +11,7 @@
 			<input type="hidden" name="sort_mode" value="{$sort_mode|escape}" />
 			<input type="hidden" name="offset" value="{$offset|escape}" />
 
-			<div class="control-group">
+			<div class="control-group column-group gutters">
 				{formlabel label="Event" for="event"}
 				{forminput}
 					<select name="event" id="event">
@@ -23,7 +23,7 @@
 				{/forminput}
 			</div>
 
-			<div class="control-group">
+			<div class="control-group column-group gutters">
 				{formlabel label="Email address" for="femail"}
 				{forminput}
 					<input type="text" id="femail" name="email" />
@@ -35,7 +35,7 @@
 			</div>
 
 			<div class="control-group submit">
-				<input type="submit" class="btn btn-default" name="add" value="{tr}Add{/tr}" />
+				<input type="submit" class="ink-button" name="add" value="{tr}Add{/tr}" />
 			</div>
 		{/form}
 
diff --git a/templates/admin_packages.tpl b/templates/admin_packages.tpl
index 3797a14..57b6bcf 100644
--- a/templates/admin_packages.tpl
+++ b/templates/admin_packages.tpl
@@ -21,7 +21,7 @@
 					</p>
 
 					{foreach from=$upgradable item=package key=name}
-						<div class="control-group">
+						<div class="control-group column-group gutters">
 							<div class="formlabel">
 								<label for="package_{$name}">{biticon ipackage=$name iname="pkg_`$name`" iexplain="$name" iforce=icon}</label>
 							</div>
@@ -47,7 +47,7 @@
 
 				{foreach key=name item=package from=$gBitSystem->mPackages}
 					{if $package.installed && !$package.service && !$package.required}
-						<div class="control-group clear">
+						<div class="control-group column-group gutters">
 							<div class="formlabel">
 								<label for="package_{$name}">{biticon ipackage=$name iname="pkg_`$name`" iexplain="$name" iforce=icon}</label>
 							</div>
@@ -89,7 +89,7 @@
 				</p>
 				{foreach key=name item=package from=$gBitSystem->mPackages}
 					{if $package.installed && $package.service && !$package.required}
-						<div class="control-group">
+						<div class="control-group column-group gutters">
 							<div class="formlabel">
 								{if !$package.required}<label for="package_{$name}">{/if}{biticon ipackage=$name iname="pkg_`$name`" iexplain="$name" iforce=icon}{if !$package.required}</label>{/if}
 							</div>
@@ -126,7 +126,7 @@
 			{/legend}
 
 			<div class="control-group submit">
-				<input type="submit" class="btn btn-default" name="features" value="{tr}Modify Activation{/tr}"/>
+				<input type="submit" class="ink-button" name="features" value="{tr}Modify Activation{/tr}"/>
 			</div>
 		{/jstab}
 
@@ -135,7 +135,7 @@
 			{legend legend="Required packages installed on your system"}
 				{foreach key=name item=package from=$gBitSystem->mPackages}
 					{if $package.installed && !$package.service && $package.required}
-						<div class="control-group">
+						<div class="control-group column-group gutters">
 							<div class="formlabel">
 								{biticon ipackage=$name iname="pkg_`$name`" iexplain="$name" iforce=icon}
 							</div>
@@ -150,7 +150,7 @@
 			{legend legend="Required services installed on your system"}
 				{foreach key=name item=package from=$gBitSystem->mPackages}
 					{if $package.installed && $package.service && $package.required}
-						<div class="control-group">
+						<div class="control-group column-group gutters">
 							<div class="formlabel">
 								{biticon ipackage=$name iname="pkg_`$name`" iexplain="$name" iforce=icon}
 							</div>
@@ -257,7 +257,7 @@
 		{jstab title="Not Installed"}
 			{legend legend="bitweaver packages available for installation"}
 
-				<div class="control-group">
+				<div class="control-group column-group gutters">
 					<div class="formlabel">
 						{biticon ipackage=install iname="pkg_install" iexplain="install" iforce=icon}
 					</div>
@@ -272,7 +272,7 @@
 
 				{foreach key=name item=package from=$gBitSystem->mPackages}
 					{if ((1 or $package.tables) && !$package.required && !$package.installed) }
-						<div class="control-group clear">
+						<div class="control-group column-group gutters">
 							<div class="formlabel">
 								{biticon ipackage=$name iname="pkg_`$name`" iexplain="$name" iforce=icon}
 							</div>
diff --git a/templates/admin_server.tpl b/templates/admin_server.tpl
index 419522f..61708d7 100644
--- a/templates/admin_server.tpl
+++ b/templates/admin_server.tpl
@@ -6,7 +6,7 @@
 	{jstabs}
 		{jstab title="Server Settings"}
 			{legend legend="Page Setup"}
-				<div class="control-group">
+				<div class="control-group column-group gutters">
 					{formfeedback warning="After changing the browser title, you might have to login again."}
 					{formlabel label="Site title" for="site_title"}
 					{forminput}
@@ -15,7 +15,7 @@
 					{/forminput}
 				</div>
 
-				<div class="control-group">
+				<div class="control-group column-group gutters">
 					{formlabel label="Site slogan" for="site_slogan"}
 					{forminput}
 						<input size="50" type="text" name="site_slogan" id="site_slogan" value="{$gBitSystem->getConfig('site_slogan')|escape}" />
@@ -23,7 +23,7 @@
 					{/forminput}
 				</div>
 
-				<div class="control-group">
+				<div class="control-group column-group gutters">
 					{formlabel label="Site Description" for="site_description"}
 					{forminput}
 						<input size="50" type="text" name="site_description" id="site_description" maxlength="180" value="{$gBitSystem->getConfig('site_description')|escape}" />
@@ -31,7 +31,7 @@
 					{/forminput}
 				</div>
 
-				<div class="control-group">
+				<div class="control-group column-group gutters">
 					{formlabel label="Site Keywords" for="site_keywords"}
 					{forminput}
 						<textarea cols="50" rows="5" name="site_keywords" id="site_keywords">{$gBitSystem->getConfig('site_keywords')|escape}</textarea>
@@ -39,7 +39,7 @@
 					{/forminput}
 				</div>
 
-				<div class="control-group">
+				<div class="control-group column-group gutters">
 					{formlabel label="Site Notice" for="site_notice"}
 					{forminput}
 						<input size="50" type="text" name="site_notice" id="site_notice" maxlength="180" value="{$gBitSystem->getConfig('site_notice')|escape}" />
@@ -47,7 +47,7 @@
 					{/forminput}
 				</div>
 
-				<div class="control-group">
+				<div class="control-group column-group gutters">
 					{formlabel label="Default Error Message" for="site_error_title"}
 					{forminput}
 						<input size="50" type="text" name="site_error_title" id="site_error_title" maxlength="180" value="{$gBitSystem->getConfig('site_error_title')|escape}" />
@@ -56,14 +56,14 @@
 				</div>
 
 				<div class="control-group submit">
-					<input type="submit" class="btn btn-default" name="serverTabSubmit" value="{tr}Change preferences{/tr}" />
+					<input type="submit" class="ink-button" name="serverTabSubmit" value="{tr}Change preferences{/tr}" />
 				</div>
 			{/legend}
 		{/jstab}
 
 		{jstab title="Miscellaneous"}
 			{legend legend="Server Settings"}
-				<div class="control-group">
+				<div class="control-group column-group gutters">
 					{formfeedback warning="Please make sure you know what you are doing as setting this wrongly could prevent you from logging in again."}
 					{formlabel label="Server name" for="kernel_server_name"}
 					{forminput}
@@ -72,7 +72,7 @@
 					{/forminput}
 				</div>
 
-				<div class="control-group">
+				<div class="control-group column-group gutters">
 					{if !$gBitSystem->hasValidSenderEmail()}
 						{formfeedback error="Site emailer return address is not valid!"}
 					{/if}
@@ -84,7 +84,7 @@
 				</div>
 
 {* defaults to STORAGE_PKG_NAME now
-				<div class="control-group">
+				<div class="control-group column-group gutters">
 					{formlabel label="Centralized user upload directory" for="site_upload_dir"}
 					{forminput}
 						<input size="50" type="text" name="site_upload_dir" id="site_upload_dir" value="{$gBitSystem->getConfig('site_upload_dir',$smarty.const.STORAGE_PKG_URL)|escape}" />
@@ -92,7 +92,7 @@
 				</div>
 *}
 
-				<div class="control-group">
+				<div class="control-group column-group gutters">
 					{formlabel label="Temporary directory" for="site_temp_dir"}
 					{forminput}
 						<input size="50" type="text" name="site_temp_dir" id="site_temp_dir" value="{$gBitSystem->getConfig('site_temp_dir',$smarty.const.TEMP_PKG_PATH)|escape}" />
@@ -100,7 +100,7 @@
 					{/forminput}
 				</div>
 
-				<div class="control-group">
+				<div class="control-group column-group gutters">
 					{formlabel label="Storage Host URI" for="storage_host"}
 					{forminput}
 						<input size="50" type="text" name="storage_host" id="storage_host" value="{$gBitSystem->getConfig('storage_host')|escape}" />
@@ -108,7 +108,7 @@
 					{/forminput}
 				</div>
 
-				<div class="control-group">
+				<div class="control-group column-group gutters">
 					{formfeedback warning="After changing this setting you might have to log in again."}
 					{formlabel label="Store session data in database" for="site_store_session_db"}
 					{forminput}
@@ -116,7 +116,7 @@
 					{/forminput}
 				</div>
 
-				<div class="control-group">
+				<div class="control-group column-group gutters">
 					{formlabel label="Session lifetime in seconds" for="site_session_lifetime"}
 					{forminput}
 						<input size="5" type="text" name="site_session_lifetime" id="site_session_lifetime" value="{$gBitSystem->getConfig('site_session_lifetime')}" /> {tr}seconds{/tr}
@@ -125,14 +125,14 @@
 				</div>
 
 				<div class="control-group submit">
-					<input type="submit" class="btn btn-default" name="serverTabSubmit" value="{tr}Change preferences{/tr}" />
+					<input type="submit" class="ink-button" name="serverTabSubmit" value="{tr}Change preferences{/tr}" />
 				</div>
 			{/legend}
 		{/jstab}
 
 		{jstab title="Site Access"}
 			{legend legend="Site Access"}
-				<div class="control-group">
+				<div class="control-group column-group gutters">
 					{formlabel label="Disallow access to the site" for="site_closed"}
 					{forminput}
 						{html_checkboxes name="site_closed" values="y" checked=$gBitSystem->getConfig('site_closed') labels=false id="site_closed"}
@@ -140,14 +140,14 @@
 					{/forminput}
 				</div>
 
-				<div class="control-group">
+				<div class="control-group column-group gutters">
 					{formlabel label="Message to display when site is closed" for="site_closed_msg"}
 					{forminput}
 						<input type="text" name="site_closed_msg" id="site_closed_msg" value="{$gBitSystem->getConfig('site_closed_msg')|escape}" size="50" />
 					{/forminput}
 				</div>
 
-				<div class="control-group">
+				<div class="control-group column-group gutters">
 					{formlabel label="Disallow access when load is above the threshold" for="site_load_threshold"}
 					{forminput}
 						{html_checkboxes name="site_load_threshold" values="y" checked=$BitSystemPrefs.site_load_threshold labels=false id="site_load_threshold"}
@@ -155,14 +155,14 @@
 					{/forminput}
 				</div>
 
-				<div class="control-group">
+				<div class="control-group column-group gutters">
 					{formlabel label="Max average server load threshold in the last minute" for="site_load_threshold"}
 					{forminput}
 						<input type="text" name="site_load_threshold" id="site_load_threshold" value="{$gBitSystem->getConfig('site_load_threshold')}" size="5" />
 					{/forminput}
 				</div>
 
-				<div class="control-group">
+				<div class="control-group column-group gutters">
 					{formlabel label="Message to display when server is too busy" for="site_busy_msg"}
 					{forminput}
 						<input type="text" name="site_busy_msg" id="site_busy_msg" value="{$gBitSystem->getConfig('site_busy_msg')}" size="50" />
@@ -170,28 +170,28 @@
 				</div>
 
 				<div class="control-group submit">
-					<input type="submit" class="btn btn-default" name="siteTabSubmit" value="{tr}Change preferences{/tr}" />
+					<input type="submit" class="ink-button" name="siteTabSubmit" value="{tr}Change preferences{/tr}" />
 				</div>
 			{/legend}
 		{/jstab}
 
 		{jstab title="Proxy"}
 			{legend legend="Proxy Settings"}
-				<div class="control-group">
+				<div class="control-group column-group gutters">
 					{formlabel label="Use proxy" for="site_use_proxy"}
 					{forminput}
 						{html_checkboxes name="site_use_proxy" values="y" checked=$gBitSystem->getConfig('site_use_proxy') labels=false id="site_use_proxy"}
 					{/forminput}
 				</div>
 
-				<div class="control-group">
+				<div class="control-group column-group gutters">
 					{formlabel label="Proxy Host" for="site_proxy_host"}
 					{forminput}
 						<input type="text" name="site_proxy_host" id="site_proxy_host" value="{$gBitSystem->getConfig('site_proxy_host')|escape}" size="50" />
 					{/forminput}
 				</div>
 
-				<div class="control-group">
+				<div class="control-group column-group gutters">
 					{formlabel label="Proxy port" for="site_proxy_port"}
 					{forminput}
 						<input type="text" name="site_proxy_port" id="site_proxy_port" value="{$gBitSystem->getConfig('site_proxy_port')|escape}" size="50" />
@@ -199,7 +199,7 @@
 				</div>
 
 				<div class="control-group submit">
-					<input type="submit" class="btn btn-default" name="proxyTabSubmit" value="{tr}Change preferences{/tr}" />
+					<input type="submit" class="ink-button" name="proxyTabSubmit" value="{tr}Change preferences{/tr}" />
 				</div>
 			{/legend}
 		{/jstab}
diff --git a/templates/admin_system.tpl b/templates/admin_system.tpl
index 270f2bc..095e079 100644
--- a/templates/admin_system.tpl
+++ b/templates/admin_system.tpl
@@ -9,7 +9,7 @@
 	<div class="body">
 		{formfeedback hash=$feedback}
 		{legend legend="Exterminator"}
-			<div class="control-group">
+			<div class="control-group column-group gutters">
 				{formlabel label="Clear entire cache" for=""}
 				{forminput}
 					<a href="{$smarty.const.KERNEL_PKG_URL}admin/admin_system.php?prune=all">{tr}Empty All{/tr}</a>
diff --git a/templates/backup.tpl b/templates/backup.tpl
index 8dff325..b90b793 100644
--- a/templates/backup.tpl
+++ b/templates/backup.tpl
@@ -18,14 +18,14 @@
 					<p><strong>Please note that there is no ecryption added to the backup file when you create a backup.</strong></p>
 
 					<div class="control-group submit">
-						<input type="submit" class="btn btn-default" name="generate" value="{tr}Create new Backup{/tr}" />
+						<input type="submit" class="ink-button" name="generate" value="{tr}Create new Backup{/tr}" />
 					</div>
 				{/form}
 			{/jstab}
 
 			{jstab title="Upload a Backup"}
 				{form enctype="multipart/form-data" legend="Upload a Backup"}
-					<div class="control-group">
+					<div class="control-group column-group gutters">
 						{formlabel label="Upload Backup"}
 						{forminput}
 							<input type="hidden" name="MAX_FILE_SIZE" value="10000000000" />
@@ -34,7 +34,7 @@
 					</div>
 					
 					<div class="control-group submit">
-						<input type="submit" class="btn btn-default" name="upload" value="{tr}upload{/tr}" />
+						<input type="submit" class="ink-button" name="upload" value="{tr}upload{/tr}" />
 					</div>
 				{/form}
 			{/jstab}
diff --git a/templates/bot_bar.tpl b/templates/bot_bar.tpl
index 2ea9656..a15e14e 100644
--- a/templates/bot_bar.tpl
+++ b/templates/bot_bar.tpl
@@ -1,4 +1,4 @@
-<div class="col-md-12">
+<div class="span12">
 {if $gBitSystem->isFeatureActive( 'messages_site_contact' )}
 	<a href="{$smarty.const.MESSAGES_PKG_URL}contact.php">{booticon iname="icon-envelope" ilocation=menu iexplain="Contact Us"}</a> 
 {/if}
diff --git a/templates/confirm.tpl b/templates/confirm.tpl
index 00d8915..f2a5a63 100644
--- a/templates/confirm.tpl
+++ b/templates/confirm.tpl
@@ -2,12 +2,12 @@
 <div class="display confirm">
 
 	<div class="body">
-		{form class="col-md-6"}
+		{form class="span6"}
 			{box class="box confirm" title=$msgFields.label|default:"Please Confirm"}
 				{foreach from=$hiddenFields item=value key=name}
 					<input type="hidden" name="{$name}" value="{$value}" />
 				{/foreach}
-				<div class="control-group">
+				<div class="control-group column-group gutters">
 					<p class="highlight">{$msgFields.confirm_item}</p>
 					{if $inputFields}
 						<ul>
@@ -22,8 +22,8 @@
 				</div>
 
 				<div class="control-group submit">
-					<input type="button" class="btn btn-default" name="cancel" {$backJavascript} value="{tr}Cancel{/tr}" /> &nbsp;
-					<input type="submit" class="btn btn-default" name="confirm" value="{tr}Yes{/tr}" />
+					<input type="button" class="ink-button" name="cancel" {$backJavascript} value="{tr}Cancel{/tr}" /> &nbsp;
+					<input type="submit" class="ink-button" name="confirm" value="{tr}Yes{/tr}" />
 				</div>
 			{/box}
 		{/form}
diff --git a/templates/error.tpl b/templates/error.tpl
index 3a23794..50a0310 100644
--- a/templates/error.tpl
+++ b/templates/error.tpl
@@ -6,14 +6,13 @@
 		{/if}
 	</div>
 
-	<div class="body row">
+	<div class="body">
 		{if $fatalTitle}
 			<h2>{tr}{$fatalTitle}{/tr}</h2>
 		{/if}
 
-		{if $msg}	
-		<div class="alert alert-error">{$msg}</div>
-		{/if}
+	
+		<p class="highlight">{$msg}</p>
 
 		{if $template}
 			{include file=$template}
diff --git a/templates/error_ticket.tpl b/templates/error_ticket.tpl
index 1637a80..c6fd72f 100644
--- a/templates/error_ticket.tpl
+++ b/templates/error_ticket.tpl
@@ -28,7 +28,7 @@
             {foreach key=k item=i from=$post}
             <input type="hidden" name="{$k}" value="{$i|escape}" />
             {/foreach}
-            <input type="submit" class="btn btn-default" name="ticket_action_button" value="{tr}Click here to confirm your action{/tr}" />
+            <input type="submit" class="ink-button" name="ticket_action_button" value="{tr}Click here to confirm your action{/tr}" />
             </form><br /><br />
             <a href="javascript:history.back()">{tr}Go back{/tr}</a><br /><br />
             <a href="{$bit_index}">{tr}Return to home page{/tr}</a>
diff --git a/templates/html.tpl b/templates/html.tpl
index fbf1e3a..adc8df2 100644
--- a/templates/html.tpl
+++ b/templates/html.tpl
@@ -12,9 +12,6 @@
 {strip}
 <head>
 	<title>{$browserTitle} - {$gBitSystem->getConfig('site_title')}</title>
-	<meta name="viewport" content="width=device-width, initial-scale=1">
-
-	<link rel="icon" href="{$gBitThemes->getStyleUrl()}favicon.png" type="image/png" />
 
 	{**** if the theme has a header, it goes first ****}
 	{if file_exists("`$smarty.const.CONFIG_THEME_PATH`theme_head_inc.tpl")}
@@ -28,7 +25,7 @@
 
     <!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
     <!--[if lt IE 9]>
-    <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
+    <script src="{$smarty.const.CONFIG_PKG_URL}js/html5shim/html5shiv.js"></script>
     <![endif]-->
 </head>
 <body
@@ -55,59 +52,57 @@
 		{assign var=extraColumns value=0}{/if}
 
 	{if $gBitSystem->isFeatureActive( 'site_top_column' ) && !$gHideModules}
-	<header role="banner" class="container{$gBitSystem->getConfig('layout-header')} mainheader">
+	<header class="container{$gBitSystem->getConfig('layout-header')} mainheader">
 		{$gBitThemes->displayLayoutColumn('t')}
 	</header>
 	{/if}
 
-	{if $gBitSystem->getConfig('site_notice')}
-		<div class="sitenotice">{$gBitSystem->getConfig('site_notice')}</div>
-	{/if}
-
-	<section class="maincontent container{$gBitSystem->getConfig('layout-maincontent')}">
-		{include file="bitpackage:liberty/services_inc.tpl" serviceLocation='row' serviceHash=$gContent->mInfo}
+	<section class="container{$gBitSystem->getConfig('layout-body')}">
+			{if $gBitSystem->getConfig('site_notice')}
+			<div class="sitenotice">{$gBitSystem->getConfig('site_notice')}</div>
+			{/if}
+			<div class="ink-grid  {$gBitSystem->getConfig('layout-maincontent')}">
+				{include file="bitpackage:liberty/services_inc.tpl" serviceLocation='row' serviceHash=$gContent->mInfo}
 
-		{if $gBitSystem->isFeatureActive( 'site_left_column' ) && !$gHideModules && $gBitThemes->hasColumnModules('l')}
-			{**** Theme Layout Modules : NAVIGATION ****}
-			<nav id="navigation" class="col-md-3 col-xs-12">
-				<div class="row">
-					{$gBitThemes->displayLayoutColumn('l')}
-				</div>
-			</nav><!-- end #navigation -->{* needed by output filters. *}
-		{/if}
+				{if $gBitSystem->isFeatureActive( 'site_left_column' ) && !$gHideModules && $gBitThemes->hasColumnModules('l')}
+					{**** Theme Layout Modules : NAVIGATION ****}
+					<nav id="navigation" class="large-20 medium-25 small-100">
+						{$gBitThemes->displayLayoutColumn('l')}
+					</nav><!-- end #navigation -->{* needed by output filters. *}
+				{/if}
 
-		<main role="main" id="wrapper" class="col-md-{math equation='12-x*3' x=$extraColumns} col-sm-12">
-			{**** Theme Layout Modules : CENTER ****}
-			{include file="bitpackage:liberty/services_inc.tpl" serviceLocation='wrapper' serviceHash=$gContent->mInfo}
-			{include file="bitpackage:liberty/display_structure.tpl"}
-			{include file=$mid}
-		</main><!-- end #wrapper -->
+				<section id="wrapper" class="large-{math equation="100-x*20" x=$extraColumns} medium-{math equation="100-x*25" x=$extraColumns} small-100" id="content">
+					{**** Theme Layout Modules : CENTER ****}
+					{include file="bitpackage:liberty/services_inc.tpl" serviceLocation='wrapper' serviceHash=$gContent->mInfo}
+					{include file="bitpackage:liberty/display_structure.tpl"}
+					{include file=$mid}
+				</section><!-- end #wrapper -->
 
-		{if $gBitSystem->isFeatureActive( 'site_right_column' ) && !$gHideModules && $gBitThemes->hasColumnModules('r')}
-			{**** Theme Layout Modules : EXTRA ****}
-			<nav id="extra" class="col-md-3 col-xs-12">
-				<div class="row">
-					{$gBitThemes->displayLayoutColumn('r')}
-				</div>
-			</nav><!-- end #extra -->{* needed by output filters. *}
-		{/if}
+				{if $gBitSystem->isFeatureActive( 'site_right_column' ) && !$gHideModules && $gBitThemes->hasColumnModules('r')}
+					{**** Theme Layout Modules : EXTRA ****}
+					<nav id="extra" class="large-20 medium-25 small-100">
+						{$gBitThemes->displayLayoutColumn('r')}
+					</nav><!-- end #extra -->{* needed by output filters. *}
+				{/if}
+			</div>
+			<div class="clear"></div>
 	</section>
-
-	<footer role="contentinfo" class="container{$gBitSystem->getConfig('layout-footer')} mainfooter">
-		<div class="row{$gBitSystem->getConfig('layout-footer')}">
+	
+	<footer class="container{$gBitSystem->getConfig('layout-footer')} mainfooter">
+		<div class="ink-grid">
 			{**** Theme Layout Modules : BOTTOM ****}
 			{if $gBitSystem->isFeatureActive( 'site_bottom_column' ) && !$gHideModules}
 				{$gBitThemes->displayLayoutColumn('b')}
 			{/if}
-			{* get custom footer files from individual packages *}
-			{foreach from=$gBitThemes->mAuxFiles.templates.footer_inc item=file}
-				{include file=$file}
-			{/foreach}
 		</div>
+		<div class="clear"></div>
 	</footer>
 
 	{if $gBitSystem->isFeatureActive( 'bidirectional_text' )}</div>{/if}
-	{include file="bitpackage:kernel/footer.tpl"}
-	</body>
+	{* get custom footer files from individual packages *}
+	{foreach from=$gBitThemes->mAuxFiles.templates.footer_inc item=file}
+		{include file=$file}
+	{/foreach}
+</body>
 </html>
 {/strip}
diff --git a/templates/html_head_inc.tpl b/templates/html_head_inc.tpl
index 1253193..0ded055 100644
--- a/templates/html_head_inc.tpl
+++ b/templates/html_head_inc.tpl
@@ -10,10 +10,6 @@
 <meta name="description" content="{$gContent->generateDescription()|strip_tags|escape}"/>
 {/if}
 
-{if $metaNoIndex}
-<meta name="robots" content="noindex">
-{/if}
-
 {if $metaKeywords}
 <meta name="keywords" content="{$metaKeywords|escape}" />
 {elseif $smarty.server.REQUEST_URI==BIT_ROOT_URI}
@@ -22,11 +18,16 @@
 <meta name="keywords" content="{$gContent->generateKeywords()|@implode:','|strip_tags|escape}"/>
 {/if}
 
+<link rel="shortcut icon" href="{$smarty.const.BIT_ROOT_URL}favicon.ico" type="image/x-icon" />
+<link rel="icon" href="{$smarty.const.BIT_ROOT_URL}favicon.ico" type="image/x-icon" />
+
 {if $canonicalLink}
-<link rel="canonical" href="{$canonicalLink|escape}"/>
+<link rel="canonical" href="{$canonicalLink}"/>
 {/if}
 {if !$gBitSystem->isLive()}
 <meta name="robots" content="noindex,nofollow">
+{else}
+<meta name="robots" content="index,follow">
 {/if}
 
 {if $gBitSystem->isFeatureActive( 'site_header_extended_nav' )}
@@ -62,20 +63,59 @@
 <script type="text/javascript">/* <![CDATA[ */
 	BitSystem = {ldelim}
 		"urls":{ldelim}
+		{foreach from=$gBitSystem->mPackages item=pkgInfo key=pkg}
+			{if $gBitSystem->isPackageActive( $pkg )}
+				"{$pkg}":"{$pkgInfo.url}",
+			{/if}
+		{/foreach}
 			"root":"{$smarty.const.BIT_ROOT_URL}",
 			"cookie":"{$smarty.const.BIT_ROOT_URL}",
+			"iconstyle":"{$smarty.const.CONFIG_PKG_URL}iconsets/{$smarty.const.DEFAULT_ICON_STYLE}/"
 		{rdelim}
 	{rdelim};
 	var bitCookiePath = "{$smarty.const.BIT_ROOT_URL}";
 	var bitCookieDomain = "";
+	var bitIconDir = "{$smarty.const.LIBERTY_PKG_URL}icons/";
 	var bitRootUrl = "{$smarty.const.BIT_ROOT_URL}";
 	var bitTk = "{$gBitUser->mTicket}";
-/* ]]> */</script>
+/* ]]> */
+</script>
 
-{if $gBitSystem->isFeatureActive( 'site_use_jscalendar' )}
-	<link rel="stylesheet" title="{$style}" type="text/css" href="{$smarty.const.UTIL_PKG_URL}javascript/libs/dynarch/jscalendar/calendar-system.css" media="all" />
-	<script async type="text/javascript" src="{$smarty.const.UTIL_PKG_URL}javascript/libs/dynarch/jscalendar/calendar.js"></script>
-	<script async type="text/javascript" src="{$smarty.const.UTIL_PKG_URL}javascript/libs/dynarch/jscalendar/lang/calendar-en.js"></script>
-	<script async type="text/javascript" src="{$smarty.const.UTIL_PKG_URL}javascript/libs/dynarch/jscalendar/calendar-setup.js"></script>
+{if $gBitThemes->mStyles.joined_javascript}
+	<script type="text/javascript" src="{$gBitThemes->mStyles.joined_javascript}"></script>
 {/if}
+{foreach from=$gBitThemes->mRawFiles.js item=jsFile}
+	<script type="text/javascript" src="{$jsFile}"></script>
+{/foreach}
+
+<script type="text/javascript">/* <![CDATA[ */
+	BitSystem = 
+$(document).ready(
+	function(){ldelim}
+		$('ul#background').innerfade({ldelim}
+			speed: 1000,
+			timeout: 5000,
+			type: 'sequence',
+			animationtype: 'fade',
+			containerheight: '259px'
+		{rdelim});
+		
+		$('ul#specials').innerfade({ldelim}
+			speed: 1000,
+			timeout: 5000,
+			type: 'sequence',
+			containerheight: '220px'
+		{rdelim});
+	{rdelim}
+);
+
+$(function() {ldelim}
+	$( "#tabs" ).tabs();
+{rdelim});
+
+ $(function() {ldelim}
+	$( "#menu" ).menu();
+{rdelim});
+/* ]]> */
+</script>
 {/strip}
diff --git a/templates/list_cache.tpl b/templates/list_cache.tpl
index b819269..0b949b3 100644
--- a/templates/list_cache.tpl
+++ b/templates/list_cache.tpl
@@ -12,7 +12,7 @@
    <td>
    <form method="get" action="{$smarty.const.THEMES_PKG_URL}list_cache.php">
      <input type="text" name="find" value="{$find|escape}" />
-     <input type="submit" class="btn btn-default" value="{tr}find{/tr}" name="search" />
+     <input type="submit" class="ink-button" value="{tr}find{/tr}" name="search" />
      <input type="hidden" name="sort_mode" value="{$sort_mode|escape}" />
    </form>
    </td>
diff --git a/templates/minifind.tpl b/templates/minifind.tpl
index e797b46..9da5790 100644
--- a/templates/minifind.tpl
+++ b/templates/minifind.tpl
@@ -1,8 +1,8 @@
 {strip}
 {form class="form-search minifind" method="get" action="`$smarty.server.SCRIPT_NAME`?`$hidden|@http_build_query`"}
-	<div class="input-prepend">
-		<button type="submit" class="btn btn-default" name="search">{tr}Search{/tr}</button>
+	<div class="input-append">
 		<input class="input-small search-query" type="text" name="find" placeholder="{$prompt|escape}" value="{$find|default:$smarty.request.find|escape}" {if $prompt}onclick="if (this.value == '{$prompt}') this.value = '';"{/if}/>&nbsp;
+		<button type="submit" class="ink-button" name="search">{tr}Search{/tr}</button>
 	</div>
 {/form}
 {/strip}
diff --git a/templates/pagination.tpl b/templates/pagination.tpl
index ca127f5..aa080b6 100644
--- a/templates/pagination.tpl
+++ b/templates/pagination.tpl
@@ -41,8 +41,8 @@
 	{assign var=pageUrl value="`$pgnUrl`?`$pageUrlVar`"}
 {/if}
 {if $listInfo.total_pages > 1 && $listInfo.page_records}
-<div class="paginator overflow-hidden clear">
-	<ul class="pagination pull-left">
+<div class="ink-navigation" style="overflow:hidden">
+	<ul class="large-60 pagination blue">
 		{if $listInfo.current_page > 1}
 			{assign var=blockStart value=1}
 			<li>{tr}<a href="{$pageUrl}&amp;page={$listInfo.current_page-1}&amp;max_records={$listInfo.max_records}&amp;sort_mode={$listInfo.sort_mode}">&laquo;</a>{/tr}</li>
@@ -63,7 +63,7 @@
 			{if $smarty.section.current_page.index != $listInfo.current_page}
 			<li><a href="{$pageUrl}&amp;page={$smarty.section.current_page.index}&amp;max_records={$listInfo.max_records}&amp;sort_mode={$listInfo.sort_mode}">{$smarty.section.current_page.index}</a></li>
 			{else}
-			<li class="active"><span>{$listInfo.current_page}</span></li>
+			<li class="active"><a href="#">{$listInfo.current_page}</a></li>
 			{/if}
 		{/if}
 		{/section}
@@ -76,7 +76,7 @@
 		<li><a href="{$pageUrl}&amp;page={$listInfo.current_page+1}&amp;max_records={$listInfo.max_records}&amp;sort_mode={$listInfo.sort_mode}">&raquo;</a></li>
 		{/if}
 	</ul>
-	<div class="pagination pull-right">
+	<div class="large-40 push-right">
 		{form action="$pageUrl" class="form-inline"}
 		{$listInfo.offset+1} {tr}to{/tr} {math equation="x + y" x=$listInfo.offset y=$listInfo.page_records} {tr}of{/tr} {$listInfo.total_records},&nbsp; 
 				<input type="hidden" name="find" value="{$find|default:$smarty.request.find}" />
diff --git a/templates/server_stats_inc.tpl b/templates/server_stats_inc.tpl
index 09eda2d..ede16a3 100644
--- a/templates/server_stats_inc.tpl
+++ b/templates/server_stats_inc.tpl
@@ -1,11 +1,12 @@
-{if !$gBitSystem->isLive() || $gBitUser->hasPermission('p_stats_view')}
+{if $gBitUser->hasPermission('p_stats_view')}
 <div class="server-stats">
-	<ul class="list-inline">
+	<ul class="inline">
 		{if !$gBitSystem->isLive()}<li><span class="alert alert-warning">{tr}Site is not live. Search engines will not index this site.{/tr}</span></li>{/if}
 		<li>{tr}Execution time:{/tr} {elapsed}s</li>
 		<li>{tr}Memory:{/tr} {memusage}</li>
 		<li>{tr}Db queries:{/tr} {$gBitSystem->mDb->mNumQueries}</li>
 		<li>{tr}Db time:{/tr} {$gBitSystem->mDb->mQueryTime|string_format:"%.3f"}s / {($gBitSystem->mDb->mQueryTime/$gBitSystem->mTimer->elapsed()*100)|round}%</li>
+		<li>{tr}Compression:{/tr} {$output_compression|default:"0"}</li>
 		{if $server_load}
 			<li>{tr}Server load:{/tr} {$server_load|default:"&#8211;"}</li>
 		{/if}
diff --git a/templates/top_bar.tpl b/templates/top_bar.tpl
index 3a5da32..353c0a1 100644
--- a/templates/top_bar.tpl
+++ b/templates/top_bar.tpl
@@ -1,72 +1,19 @@
 {strip}
-<nav class="navbar navbar-default {if $gBitSystem->getConfig('layout-header')}navbar-static-top{/if}" role="navigation" id="bittopbar">
-	<div class="container-fluid">
-		<div class="navbar-header">
-			<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bit-top-menu">{booticon iname="icon-reorder"}</button>
-			<a class="navbar-brand" href="{$smarty.const.BIT_ROOT_URL}" {if $gBitSystem->getConfig('site_slogan')} title="{$gBitSystem->getConfig('site_slogan')|escape}" {/if}>{$gBitSystem->getConfig('site_title')}</a>
-		</div>
-		{if $gBitSystem->mAppMenu}
-		<div class="collapse navbar-collapse" id="bit-top-menu">
-			{if $gBitSystem->mAppMenu.bar}
-			<ul class="nav navbar-nav">
-				{foreach key=key item=menu from=$gBitSystem->mAppMenu.bar}
-					{if $menu.menu_title && $menu.index_url && $menu.menu_template && !$menu.is_disabled}
-						{if $gBitSystem->isFeatureActive( 'site_top_bar_dropdown' )}
-						<li class="dropdown m-{$key}{if $smarty.const.ACTIVE_PACKAGE eq $menu.package_name} active{/if}">
-							{include file="`$menu.menu_template`" packageMenuClass="dropdown-menu" packageMenuTitle=$menu.menu_title}
-						</li>
-						{else}
-						<li class="m-{$key}{if $smarty.const.ACTIVE_PACKAGE eq $menu.package_name} active{/if}">
-							<a accesskey="{$key|truncate:1:""}" class="{if $gBitSystem->isFeatureActive( 'site_top_bar_dropdown' )}head{else}item{/if}{if $smarty.const.ACTIVE_PACKAGE eq $menu.package_name} selected{/if}" href="{$menu.index_url}">{tr}{$menu.menu_title}{/tr}</a>
-						</li>
-						{/if}
-					{/if}
-				{/foreach}
-			</ul>
-			{/if}
-			{if $gBitSystem->mAppMenu.form}
-			{foreach key=key item=menu from=$gBitSystem->mAppMenu.form}
+<nav class="ink-navigation">
+	<ul class="menu horizontal blue">
+		{foreach key=key item=menu from=$gBitSystem->mAppMenu}
 				{if $menu.menu_title && $menu.index_url && $menu.menu_template && !$menu.is_disabled}
-					{include file="`$menu.menu_template`" packageMenuClass="dropdown-menu" packageMenuTitle=$menu.menu_title}
-				{/if}
-			{/foreach}
-			{/if}
-
-			<ul class="nav navbar-nav navbar-right">
-				{if $gBitUser->isRegistered()}
-					<li class="dropdown">
-						<a class="dropdown-toggle" id="dLabel" role="button" data-toggle="dropdown" data-target="#"><i class="icon-user"></i> {displayname hash=$gBitUser->mInfo nolink=1} <b class="caret"></b></a>
-						<ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
-							<li><a href="{$gBitUser->getDisplayUrl()}">{tr}My Profile{/tr}</a></li>
-							<li><a href="{$smarty.const.USERS_PKG_URL}my.php">{tr}My Account{/tr}</a></li>
-							<li><a href="{$smarty.const.USERS_PKG_URL}logout.php">{tr}Logout{/tr}</a></li>
-							{if $adminMenu}
-								<li class="dropdown-submenu menu-admin">{include file="bitpackage:kernel/menu_top_admin_inc.tpl"}</li>
-							{/if}
-						</ul>
-					</li>
+				{if $gBitSystem->isFeatureActive( 'site_top_bar_dropdown' )}
+				<li class="{if $smarty.const.ACTIVE_PACKAGE eq $menu.package_name}active{/if}">
+					{include file=$menu.menu_template packageMenuClass="submenu" packageMenuTitle=$menu.menu_title}
+				</li>
 				{else}
-					<li><a href="{$smarty.const.USERS_PKG_URL}signin.php">{tr}Sign In{/tr}</a></li>
+				<li class="m-{$key}{if $smarty.const.ACTIVE_PACKAGE eq $menu.package_name} active{/if}">
+					<a accesskey="{$key|truncate:1:""}" class="{if $gBitSystem->isFeatureActive( 'site_top_bar_dropdown' )}head{else}item{/if}{if $smarty.const.ACTIVE_PACKAGE eq $menu.package_name} selected{/if}" href="{$menu.index_url}">{tr}{$menu.menu_title}{/tr}</a>
+				</li>
 				{/if}
-			</ul>
-		</div>
-		{/if}
-	</div>
+			{/if}
+		{/foreach}
+	</ul>
 </nav>
-
-{if $gBitSystem->isFeatureActive('site_top_bar_js') && $gBitSystem->isFeatureActive('site_top_bar_dropdown')}
-	<script type="text/javascript"> /*<![CDATA[*/
-		var listMenu = new FSMenu('listMenu', true, 'left', 'auto', '-999');
-		{if $gBitSystem->isFeatureActive( 'site_top_bar_js_fade' )}
-			listMenu.animations[listMenu.animations.length] = FSMenu.animFade;
-		{/if}
-		{if $gBitSystem->isFeatureActive( 'site_top_bar_js_swipe' )}
-			listMenu.animations[listMenu.animations.length] = FSMenu.animSwipeDown;
-		{/if}
-		{if $gBitSystem->isFeatureActive( 'site_top_bar_js_clip' )}
-			listMenu.animations[listMenu.animations.length] = FSMenu.animClipDown;
-		{/if}
-		addEvent(window, 'load', new Function('listMenu.activateMenu("nav")'));
-	/*]]>*/ </script>
-{/if}
 {/strip}
diff --git a/templates/upload_slot_inc.tpl b/templates/upload_slot_inc.tpl
index 6f00d78..a79bc76 100644
--- a/templates/upload_slot_inc.tpl
+++ b/templates/upload_slot_inc.tpl
@@ -1,21 +1,21 @@
 {strip}
 {assign var=id value=$smarty.request.upload_id|default:0}
 {assign var=hash_key value=$smarty.request.hash_key|default:$hash_key}
-<div class="control-group">
+<div class="control-group column-group gutters">
 	{formlabel label="Title" for="title-$id"}
 	{forminput}
 		<input type="text" name="{$hash_key|default:'file'}[{$id}][title]" id="title-{$id}" size="40" />
 	{/forminput}
 </div>
 
-<div class="control-group">
+<div class="control-group column-group gutters">
 	{formlabel label="File" for="upload-$id"}
 	{forminput}
 		<input type="file" name="upload-{$id}" id="upload-{$id}" size="30" />
 	{/forminput}
 </div>
 
-<div class="control-group">
+<div class="control-group column-group gutters">
 	{formlabel label="Description" for="edit-$id"}
 	{forminput}
 		<textarea rows="2" cols="40" name="{$hash_key|default:'file'}[{$id}][edit]" id="edit-{$id}"></textarea>
@@ -24,7 +24,7 @@
 
 {if $gBitThemes->isJavascriptEnabled()}
 	<div id="upload-slot-{$id+1}">
-		<div class="control-group">
+		<div class="control-group column-group gutters">
 			{forminput}
 				<a href="javascript:void(0);" onclick="BitAjax.updater('upload-slot-{$id+1}', '{$smarty.const.KERNEL_PKG_URL}upload_slot_inc.php', 'upload_id={$id+1}&amp;hash_key={$hash_key}')">
 					{biticon iname=large/list-add iexplain="Add upload slot" iforce="icon"}