smarty3 and bootstrap updates

30 files changed, 222 insertions, 257 deletions

diff --git a/templates/admin_external_wikis.tpl b/templates/admin_external_wikis.tpl
index 400f46b..5a93d00 100644
--- a/templates/admin_external_wikis.tpl
+++ b/templates/admin_external_wikis.tpl
@@ -13,12 +13,12 @@
 <table class="panel">
 <tr><td>{tr}name{/tr}:</td><td><input type="text" maxlength="255" size="10" name="name" value="{$info.name|escape}" /></td></tr>
 <tr><td>{tr}URL (use $page to be replaced by the page name in the URL example: http://www.example.com/{$smarty.const.WIKI_PKG_URL}index.php?page=$page){/tr}:</td><td><input type="text" maxlength="255" size="40" name="extwiki" value="{$info.extwiki|escape}" /></td></tr>
-<tr class="panelsubmitrow"><td colspan="2"><input type="submit" name="save" value="{tr}Save{/tr}" /></td></tr>
+<tr class="panelsubmitrow"><td colspan="2"><input type="submit" class="btn" name="save" value="{tr}Save{/tr}" /></td></tr>
 </table>
 </form>
 
 <h2>{tr}External Wiki{/tr}</h2>
-<table class="data">
+<table class="table data">
 <tr>
 <th><a href="{$smarty.const.WIKI_PKG_URL}admin/admin_external_wikis.php?offset={$offset}&amp;sort_mode={if $sort_mode eq 'name_desc'}name_asc{else}name_desc{/if}">{tr}name{/tr}</a></th>
 <th><a href="{$smarty.const.WIKI_PKG_URL}admin/admin_external_wikis.php?offset={$offset}&amp;sort_mode={if $sort_mode eq 'extwiki_desc'}extwiki_asc{else}extwiki_desc{/if}">{tr}extwiki{/tr}</a></th>
@@ -30,8 +30,8 @@
 <td>{$channels[user].name}</td>
 <td>{$channels[user].extwiki}</td>
 <td>
-   &nbsp;&nbsp;<a href="{$smarty.const.WIKI_PKG_URL}admin/admin_external_wikis.php?offset={$offset}&amp;sort_mode={$sort_mode}&amp;remove={$channels[user].extwiki_id}" onclick="return confirm('{tr}Are you sure you want to delete this external wiki?{/tr}')" title="Click here to delete this external wiki">{biticon ipackage="icons" iname="edit-delete" iexplain="remove"}</a>&nbsp;&nbsp;
-   <a href="{$smarty.const.WIKI_PKG_URL}admin/admin_external_wikis.php?offset={$offset}&amp;sort_mode={$sort_mode}&amp;extwiki_id={$channels[user].extwiki_id}">{biticon ipackage="icons" iname="accessories-text-editor" iexplain="edit"}</a>
+   &nbsp;&nbsp;<a href="{$smarty.const.WIKI_PKG_URL}admin/admin_external_wikis.php?offset={$offset}&amp;sort_mode={$sort_mode}&amp;remove={$channels[user].extwiki_id}" onclick="return confirm('{tr}Are you sure you want to delete this external wiki?{/tr}')" title="Click here to delete this external wiki">{booticon iname="icon-trash" ipackage="icons" iexplain="remove"}</a>&nbsp;&nbsp;
+   <a href="{$smarty.const.WIKI_PKG_URL}admin/admin_external_wikis.php?offset={$offset}&amp;sort_mode={$sort_mode}&amp;extwiki_id={$channels[user].extwiki_id}">{booticon iname="icon-edit" ipackage="icons" iexplain="edit"}</a>
 </td>
 </tr>
 {sectionelse}
diff --git a/templates/admin_wiki.tpl b/templates/admin_wiki.tpl
index 71ebee3..1194edc 100644
--- a/templates/admin_wiki.tpl
+++ b/templates/admin_wiki.tpl
@@ -6,16 +6,16 @@
 			<input type="hidden" name="page" value="{$page}" />
 
 			{foreach from=$formWikiFeatures key=item item=output}
-				<div class="row">
-					{formlabel label=`$output.label` for=$item}
+				<div class="control-group">
+					{formlabel label=$output.label for=$item}
 					{forminput}
 						{html_checkboxes name="$item" values="y" checked=$gBitSystem->getConfig($item) labels=false id=$item}
-						{formhelp note=`$output.note` page=`$output.page`}
+						{formhelp note=$output.note page=$output.page}
 					{/forminput}
 				</div>
 			{/foreach}
 
-			<div class="row">
+			<div class="control-group">
 				{formlabel label="Edit Page Sections" for="wiki_section_edit"}
 				{forminput}
 					<select name="wiki_section_edit" id="wiki_section_edit">
@@ -27,7 +27,7 @@
 				{/forminput}
 			</div>
 
-			<div class="row">
+			<div class="control-group">
 				{formlabel label="Tables syntax" for="wiki_tables"}
 				{forminput}
 					<select name="wiki_tables" id="wiki_tables">
@@ -38,8 +38,8 @@
 				{/forminput}
 			</div>
 
-			<div class="row submit">
-				<input type="submit" name="wikifeatures" value="{tr}Change preferences{/tr}" />
+			<div class="control-group submit">
+				<input type="submit" class="btn" name="wikifeatures" value="{tr}Change preferences{/tr}" />
 			</div>
 		{/form}
 	{/jstab}
@@ -49,16 +49,16 @@
 			<input type="hidden" name="page" value="{$page}" />
 
 			{foreach from=$formWikiBooks key=item item=output}
-				<div class="row">
-					{formlabel label=`$output.label` for=$item}
+				<div class="control-group">
+					{formlabel label=$output.label for=$item}
 					{forminput}
 						{html_checkboxes name="$item" values="y" checked=$gBitSystem->getConfig($item) labels=false id=$item}
-						{formhelp note=`$output.note` page=`$output.page`}
+						{formhelp note=$output.note page=$output.page}
 					{/forminput}
 				</div>
 			{/foreach}
-			<div class="row submit">
-				<input type="submit" name="wikibooks" value="{tr}Change preferences{/tr}" />
+			<div class="control-group submit">
+				<input type="submit" class="btn" name="wikibooks" value="{tr}Change preferences{/tr}" />
 			</div>
 		{/form}
 	{/jstab}
@@ -68,16 +68,16 @@
 			<input type="hidden" name="page" value="{$page}" />
 
 			{foreach from=$formWikiInOut key=item item=output}
-				<div class="row">
-					{formlabel label=`$output.label` for=$item}
+				<div class="control-group">
+					{formlabel label=$output.label for=$item}
 					{forminput}
 						{html_checkboxes name="$item" values="y" checked=$gBitSystem->getConfig($item) labels=false id=$item}
-						{formhelp note=`$output.note` page=`$output.page`}
+						{formhelp note=$output.note page=$output.page}
 					{/forminput}
 				</div>
 			{/foreach}
-			<div class="row submit">
-				<input type="submit" name="wikiinout" value="{tr}Change preferences{/tr}" />
+			<div class="control-group submit">
+				<input type="submit" class="btn" name="wikiinout" value="{tr}Change preferences{/tr}" />
 			</div>
 		{/form}
 	{/jstab}
@@ -87,17 +87,17 @@
 			<input type="hidden" name="page" value="{$page}" />
 
 			{foreach from=$formWikiLists key=item item=output}
-				<div class="row">
-					{formlabel label=`$output.label` for=$item}
+				<div class="control-group">
+					{formlabel label=$output.label for=$item}
 					{forminput}
 						{html_checkboxes name="$item" values="y" checked=$gBitSystem->getConfig($item) labels=false id=$item}
-						{formhelp note=`$output.note` page=`$output.page`}
+						{formhelp note=$output.note page=$output.page}
 					{/forminput}
 				</div>
 			{/foreach}
 
-			<div class="row submit">
-				<input type="submit" name="wikilistconf" value="{tr}Change preferences{/tr}" />
+			<div class="control-group submit">
+				<input type="submit" class="btn" name="wikilistconf" value="{tr}Change preferences{/tr}" />
 			</div>
 		{/form}
 	{/jstab}
@@ -106,7 +106,7 @@
 		{form}
 			{legend legend="Wiki Home Page"}
 				<input type="hidden" name="page" value="{$page}" />
-				<div class="row">
+				<div class="control-group">
 					{formlabel label="Disable Wiki Home Page" for="wiki_disable_auto_home"}
 					{forminput}
 						{html_checkboxes name="wiki_disable_auto_home" values="y" checked=$gBitSystem->getConfig('wiki_disable_auto_home') labels=false id="wiki_disabled_auto_home"}
@@ -114,7 +114,7 @@
 					{/forminput}
 				</div>
 
-				<div class="row">
+				<div class="control-group">
 					{formlabel label="Wiki Home Page" for="wiki_home_page"}
 					{forminput}
 						<input type="text" name="wiki_home_page" id="wiki_home_page" size="25" value="{$gBitSystem->getConfig('wiki_home_page')|escape}" />
@@ -122,13 +122,13 @@
 					{/forminput}
 				</div>
 
-				<div class="row submit">
-					<input type="submit" name="setwikihome" value="{tr}Change preferences{/tr}" />
+				<div class="control-group submit">
+					<input type="submit" class="btn" name="setwikihome" value="{tr}Change preferences{/tr}" />
 				</div>
 			{/legend}
 
 			{legend legend="Wiki Link Format"}
-				<div class="row">
+				<div class="control-group">
 					{formlabel label="Wiki Link Format" for="wiki_page_regex"}
 					{forminput}
 						<select name="wiki_page_regex" id="wiki_page_regex">
@@ -145,35 +145,35 @@
 					{/forminput}
 				</div>
 
-				<div class="row submit">
-					<input type="submit" name="setwikiregex" value="{tr}Change preferences{/tr}" />
+				<div class="control-group submit">
+					<input type="submit" class="btn" name="setwikiregex" value="{tr}Change preferences{/tr}" />
 				</div>
 			{/legend}
 
 			{legend legend="Copyright Management"}
-				<div class="row">
+				<div class="control-group">
 					{formlabel label="Enable Feature" for="wiki_copyrights"}
 					{forminput}
 						{html_checkboxes name="wiki_copyrights" values="y" checked=$gBitSystem->getConfig('wiki_copyrights') labels=false id="wiki_copyrights"}
 					{/forminput}
 				</div>
 
-				<div class="row">
+				<div class="control-group">
 					{formlabel label="License Page" for="wiki_license_page"}
 					{forminput}
 						<input type="text" name="wiki_license_page" id="wiki_license_page" value="{$wiki_license_page|escape}" />
 					{/forminput}
 				</div>
 
-				<div class="row">
+				<div class="control-group">
 					{formlabel label="Submit Notice" for="wiki_submit_notice"}
 					{forminput}
 						<input type="text" name="wiki_submit_notice" id="wiki_submit_notice" value="{$wiki_submit_notice|escape}" />
 					{/forminput}
 				</div>
 
-				<div class="row submit">
-					<input type="submit" name="wikisetcopyright" value="{tr}Change preferences{/tr}" />
+				<div class="control-group submit">
+					<input type="submit" class="btn" name="wikisetcopyright" value="{tr}Change preferences{/tr}" />
 				</div>
 			{/legend}
 
@@ -181,17 +181,17 @@
 				{formfeedback warning="This feature has been disabled for now since it's not functional."}
 
 				{foreach from=$formWikiWatch key=item item=output}
-					<div class="row">
-						{formlabel label=`$output.label` for=$item}
+					<div class="control-group">
+						{formlabel label=$output.label for=$item}
 						{forminput}
 							{html_checkboxes name="$item" values="y" checked=$gBitSystem->getConfig($item) labels=false id=$item}
-							{formhelp note=`$output.note` page=`$output.page`}
+							{formhelp note=$output.note page=$output.page}
 						{/forminput}
 					</div>
 				{/foreach}
 
-				<div class="row submit">
-					<input type="submit" name="wikiwatch" value="{tr}Change preferences{/tr}" />
+				<div class="control-group submit">
+					<input type="submit" class="btn" name="wikiwatch" value="{tr}Change preferences{/tr}" />
 				</div>
 			{/legend}
 		{/form}
diff --git a/templates/book_toc.tpl b/templates/book_toc.tpl
deleted file mode 100755
index cd7c434..0000000
--- a/templates/book_toc.tpl
+++ /dev/null
@@ -1 +0,0 @@
-<ul class="toc">{section name=sitem loop=$structure_tree}{include file="structures_toc_level.tpl" that=$structure_tree[sitem]}{/section}</ul>
diff --git a/templates/book_toc_endul.tpl b/templates/book_toc_endul.tpl
deleted file mode 100755
index 3d3a44c..0000000
--- a/templates/book_toc_endul.tpl
+++ /dev/null
@@ -1 +0,0 @@
-</ul>
diff --git a/templates/book_toc_leaf.tpl b/templates/book_toc_leaf.tpl
deleted file mode 100755
index e0f51cb..0000000
--- a/templates/book_toc_leaf.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-<li {if $structure_tree.structure_id==$smarty.request.structure_id}class="highlight"{/if}>
-	{if $numbering}<span class="numbering">{$structure_tree.prefix}</span>{/if}
-	<a href="{$structure_tree.display_url|default:"`$smarty.const.WIKI_PKG_URL`index.php?structure_id=`$structure_tree.structure_id`"}">{$structure_tree.title|escape}</a>
-</li>
diff --git a/templates/book_toc_level.tpl b/templates/book_toc_level.tpl
deleted file mode 100755
index fc33b9a..0000000
--- a/templates/book_toc_level.tpl
+++ /dev/null
@@ -1 +0,0 @@
-<li {if $that.structure_id==$smarty.request.structure_id}class="highlight"{/if}><a href="{$smarty.const.WIKI_PKG_URL}index.php?structure_id={$that.structure_id}">{$that.title|escape}</a></li>{if $that.sub}<ul>{section name=xitem loop=$that.sub}{include file="structures_toc_level.tpl" that=$that.sub[xitem]}{/section}</ul>{/if}
diff --git a/templates/book_toc_startul.tpl b/templates/book_toc_startul.tpl
deleted file mode 100755
index be10942..0000000
--- a/templates/book_toc_startul.tpl
+++ /dev/null
@@ -1 +0,0 @@
-<ul class="toc">
diff --git a/templates/books.tpl b/templates/books.tpl
index eeea9be..b29ddb3 100755
--- a/templates/books.tpl
+++ b/templates/books.tpl
@@ -1,6 +1,6 @@
 {strip}
 {if count($showstructs) ne 0}
-	<div class="row">
+	<div class="control-group">
 		{formlabel label="Structures"}
 		{forminput}
 			<a id="show_strct" style="display:block;" href="javascript:show('showstructs');show('hide_strct');hide('show_strct')">{tr}show books{/tr}</a>
diff --git a/templates/center_wiki_page.php b/templates/center_wiki_page.php
index 3aa300a..da4fa9d 100644
--- a/templates/center_wiki_page.php
+++ b/templates/center_wiki_page.php
@@ -1,5 +1,6 @@
 <?php
-global $moduleParams, $gContent;
+global $moduleParams, $gBitSmarty;
+
 // Load up the correct wiki page
 $lookupHash['page_id']    = ( !empty( $moduleParams['module_params']['page_id'] )    ? $moduleParams['module_params']['page_id'] : NULL );
 $lookupHash['content_id'] = ( !empty( $moduleParams['module_params']['content_id'] ) ? $moduleParams['module_params']['content_id'] : NULL );
@@ -10,4 +11,5 @@ include( WIKI_PKG_PATH."lookup_page_inc.php" );
 if( !empty( $moduleParams['title'] )) {
 	$gContent->mInfo['title'] = $moduleParams['title'];
 }
-?>
+
+$_template->tpl_vars['gContent'] = new Smarty_variable( $gContent );
diff --git a/templates/center_wiki_page.tpl b/templates/center_wiki_page.tpl
index b9f2e0d..d85745b 100644
--- a/templates/center_wiki_page.tpl
+++ b/templates/center_wiki_page.tpl
@@ -3,7 +3,7 @@
 <div class="display wiki">
 	<div class="floaticon"> <!-- Actions -->
 		{if $gContent->hasUpdatePermission()}
-			<a href="{$smarty.const.WIKI_PKG_URL}edit.php?page_id={$gContent->mInfo.page_id}">{biticon ipackage="icons" iname="accessories-text-editor" iexplain="edit"}</a>
+			<a href="{$smarty.const.WIKI_PKG_URL}edit.php?page_id={$gContent->mInfo.page_id}">{booticon iname="icon-edit" ipackage="icons" iexplain="edit"}</a>
 		{/if}
 		{if $gBitSystem->isPackageActive( 'pdf' ) && $gContent->hasUserPermission( 'p_pdf_generation' )}
 			<a title="{tr}create PDF{/tr}" href="{$smarty.const.PDF_PKG_URL}?page_id={$gContent->mInfo.page_id}">{biticon ipackage="pdf" iname="pdf" iexplain="PDF"}</a>
diff --git a/templates/copyrights.tpl b/templates/copyrights.tpl
index 1255299..a884ddb 100644
--- a/templates/copyrights.tpl
+++ b/templates/copyrights.tpl
@@ -7,7 +7,7 @@
 	{legend legend="Copyright settings"}
 		{section name=i loop=$copyrights}
 			{form}
-				<div class="row">
+				<div class="control-group">
 					{formlabel label="Title" for="copyleft-title"}
 					{forminput}
 						<input size="40" type="text" name="copyrightTitle" id="copyleft-title" value="{$copyrights[i].title|escape}" />
@@ -15,7 +15,7 @@
 					{/forminput}
 				</div>
 
-				<div class="row">
+				<div class="control-group">
 					{formlabel label="Authors" for="copyleft-authors"}
 					{forminput}
 						<input size="40" type="text" name="copyrightAuthors" id="copyleft-authors" value="{$copyrights[i].authors|escape}" />
@@ -23,7 +23,7 @@
 					{/forminput}
 				</div>
 				
-				<div class="row">
+				<div class="control-group">
 					{formlabel label="Year" for="copyleft-year"}
 					{forminput}
 						<input size="4" type="text" name="copyrightYear" id="copyleft-year" value="{$copyrights[i].year|escape}" />
@@ -31,14 +31,14 @@
 					{/forminput}
 				</div>
 
-				<div class="row submit">
+				<div class="control-group submit">
 					<input type="hidden" name="page_id" value="{$pageInfo.page_id}" />
 					<input type="hidden" name="copyright_id" value="{$copyrights[i].copyright_id|escape}" />
-					<input type="submit" name="editcopyright" value="{tr}edit{/tr}" />
-					<a href="{$smarty.const.WIKI_PKG_URL}copyrights.php?page_id={$pageInfo.page_id}&amp;action=up&amp;copyright_id={$copyrights[i].copyright_id}">{biticon ipackage="icons" iname="go-up" iexplain="move up"}</a>
-					<a href="{$smarty.const.WIKI_PKG_URL}copyrights.php?page_id={$pageInfo.page_id}&amp;action=down&amp;copyright_id={$copyrights[i].copyright_id}">{biticon ipackage="icons" iname="go-down" iexplain="move down"}</a>
+					<input type="submit" class="btn" name="editcopyright" value="{tr}edit{/tr}" />
+					<a href="{$smarty.const.WIKI_PKG_URL}copyrights.php?page_id={$pageInfo.page_id}&amp;action=up&amp;copyright_id={$copyrights[i].copyright_id}">{booticon iname="icon-cloud-upload" ipackage="icons" iexplain="move up"}</a>
+					<a href="{$smarty.const.WIKI_PKG_URL}copyrights.php?page_id={$pageInfo.page_id}&amp;action=down&amp;copyright_id={$copyrights[i].copyright_id}">{booticon iname="icon-cloud-download"  ipackage="icons"  iexplain="move down"}</a>
 					<a title="{tr}Delete this copyright{/tr}" href="{$smarty.const.WIKI_PKG_URL}copyrights.php?page_id={$pageInfo.page_id}&amp;action=delete&amp;copyright_id={$copyrights[i].copyright_id}" 
-						onclick="return confirm('{tr}Are you sure you want to delete this copyright?{/tr}')">{biticon ipackage="icons" iname="edit-delete" iexplain="delete"}</a>
+						onclick="return confirm('{tr}Are you sure you want to delete this copyright?{/tr}')">{booticon iname="icon-trash" ipackage="icons" iexplain="delete"}</a>
 				</div>
 			{/form}
 		{/section}
@@ -46,7 +46,7 @@
 
 		{form legend="Add a new copyright setting"}
 			<input type="hidden" name="page_id" value="{$pageInfo.page_id}" />
-			<div class="row">
+			<div class="control-group">
 				{formlabel label="Title" for="copyleft-tit"}
 				{forminput}
 					<input size="40" type="text" name="copyrightTitle" id="copyleft-tit" />
@@ -54,7 +54,7 @@
 				{/forminput}
 			</div>
 
-			<div class="row">
+			<div class="control-group">
 				{formlabel label="Authors" for="copyleft-aut"}
 				{forminput}
 					<input size="40" type="text" name="copyrightAuthors" id="copyleft-aut" />
@@ -62,7 +62,7 @@
 				{/forminput}
 			</div>
 			
-			<div class="row">
+			<div class="control-group">
 				{formlabel label="Year" for="copyleft-yyyy"}
 				{forminput}
 					<input size="4" type="text" name="copyrightYear" id="copyleft-yyyy" />
@@ -70,8 +70,8 @@
 				{/forminput}
 			</div>
 
-			<div class="row submit">
-				<input type="submit" name="addcopyright" value="{tr}add{/tr}" />
+			<div class="control-group submit">
+				<input type="submit" class="btn" name="addcopyright" value="{tr}add{/tr}" />
 			</div>
 		{/form}
 	</div><!-- end .body -->
diff --git a/templates/create_book.tpl b/templates/create_book.tpl
index 7f25252..3f671a4 100644
--- a/templates/create_book.tpl
+++ b/templates/create_book.tpl
@@ -8,8 +8,8 @@
 
 	<div class="body">
 		{form legend="Create new Wiki Book"}
-			<div class="row">
-				{formfeedback error=`$errors.title`}
+			<div class="control-group">
+				{formfeedback error=$errors.title}
 				{formlabel label="Book Title" for="name"}
 				{forminput}
 					<input type="text" name="name" id="name" size="50" maxlength="240" value="{$name}"/>
@@ -17,7 +17,7 @@
 				{/forminput}
 			</div>
 
-			<div class="row">
+			<div class="control-group">
 				{formlabel label="Table of Contents<br />(optional)" for="chapters"}
 				{forminput}
 					<textarea rows="10" cols="50" name="chapters" id="chapters">{$chapters}</textarea>
@@ -25,8 +25,8 @@
 				{/forminput}
 			</div>
 
-			<div class="row submit">
-				<input type="submit" value="{tr}Create new book{/tr}" name="createstructure" />
+			<div class="control-group submit">
+				<input type="submit" class="btn" value="{tr}Create new book{/tr}" name="createstructure" />
 			</div>
 		{/form}
 	</div><!-- end .body -->
diff --git a/templates/create_webhelp.tpl b/templates/create_webhelp.tpl
index 4ed46ec..1c6b362 100755
--- a/templates/create_webhelp.tpl
+++ b/templates/create_webhelp.tpl
@@ -24,7 +24,7 @@ Here you can generate static HTML files from Wiki Book.
   	<td><input type="text" name="top" value="{$struct_info.title|escape}" /></td>
   </tr>
   <tr>
-  	<td colspan="2"><input type="submit" name="create" value="{tr}Create{/tr}" /></td>
+  	<td colspan="2"><input type="submit" class="btn" name="create" value="{tr}Create{/tr}" /></td>
   </tr>
 </table>
 </form>
diff --git a/templates/edit_page.tpl b/templates/edit_page.tpl
index 4e31104..d29c138 100644
--- a/templates/edit_page.tpl
+++ b/templates/edit_page.tpl
@@ -20,7 +20,7 @@
 		<script type="text/javascript">/* <![CDATA[ */
 			alert( "{$errors.edit_conflict|strip_tags}" );
 		/* ]]> */</script>
-		{formfeedback warning=`$errors.edit_conflict`}
+		{formfeedback warning=$errors.edit_conflict}
 	{/if}
 
 	<div class="body">
@@ -57,19 +57,19 @@
 			<div class="admin box">{tr}The SandBox is a page where you can practice your editing skills, use the preview feature to preview the appeareance of the page, no versions are stored for this page.{/tr}</div>
 		{/if}
 
-		{form enctype="multipart/form-data" id="editpageform"}
+		{form class="form-horizontal" enctype="multipart/form-data" id="editpageform"}
 			{jstabs}
 				{jstab title="Body"}
 					{legend legend="`$editLabel` Body"}
 						<input type="hidden" name="page_id" value="{$pageInfo.page_id}" />
 						<input type="hidden" name="content_id" value="{$pageInfo.content_id}" />
 
-						<div class="row">
-							{formfeedback warning=`$errors.title`}
-							{formlabel label="$conDescr Title" for="title"}
+						<div class="control-group">
+							{formfeedback warning=$errors.title}
+							{formlabel label="$conDescr Title"}
 							{forminput}
 								{if $gBitUser->hasPermission( 'p_wiki_rename_page' ) || !$pageInfo.page_id}
-									<input type="text" size="50" maxlength="200" name="title" id="title" value="{$pageInfo.title|escape}" />
+									<input type="text" class="input-block-level" size="50" maxlength="200" name="title" id="title" value="{$pageInfo.title|escape}" />
 								{else}
 									{$page} {$pageInfo.title|escape}
 								{/if}
@@ -77,10 +77,10 @@
 						</div>
 
 						{if $gBitSystem->isFeatureActive( 'wiki_description' )}
-							<div class="row">
+							<div class="control-group">
 								{formlabel label="Summary" for="summary"}
 								{forminput}
-									<input size="50" type="text" name="summary" id="summary" value="{$pageInfo.summary|escape:html}" />
+									<input size="50" type="text" class="input-block-level" name="summary" id="summary" value="{$pageInfo.summary|escape:html}" />
 									{formhelp note="Brief description of the page. This is visible when you hover over a link to this page and just below the title of the wiki page."}
 								{/forminput}
 							</div>
@@ -90,34 +90,35 @@
 							<input type="hidden" name="section" value="{$pageInfo.section}" />
 						{/if}
 
-						{textarea}{$pageInfo.data}{/textarea}
+						{textarea edit=$pageInfo.data}
 
 						{if $footnote}
-							<div class="row">
+							<div class="control-group">
 								{formlabel label="Footnotes" for="footnote"}
 								{forminput}
-									<textarea name="footnote" id="footnote" rows="8" cols="50">{$footnote|escape}</textarea>
+									<textarea class="input-block-level" name="footnote" id="footnote" rows="8">{$footnote|escape}</textarea>
 									{formhelp note=""}
 								{/forminput}
 							</div>
 						{/if}
 
 						{if $page ne 'SandBox'}
-							<div class="row">
+							<div class="control-group">
 								{formlabel label="Comment" for="edit_comment"}
 								{forminput}
-									<input size="50" type="text" name="edit_comment" id="edit_comment" value="{$pageInfo.edit_comment}" />
+									<input size="50" type="text" class="input-block-level" name="edit_comment" id="edit_comment" value="{$pageInfo.edit_comment}" />
 									{formhelp note="Add a comment to illustrate your most recent changes."}
 								{/forminput}
 							</div>
 						{/if}
 
 						{if $gBitUser->hasPermission( 'p_wiki_save_minor' )}
-							<div class="row">
-								{formlabel label="Minor save" for="isminor"}
+							<div class="control-group">
 								{forminput}
-									<input type="checkbox" name="isminor" id="isminor" value="on" {if $pageInfo.isminor}checked="checked" {/if}/>
+								<label class="checkbox">
+									<input type="checkbox" name="isminor" id="isminor" value="on" {if $pageInfo.isminor}checked="checked" {/if}/>Minor save
 									{formhelp note="This will prevent the generation of a new version. You can use this, if your changes are minor."}
+								</label>
 								{/forminput}
 							</div>
 						{/if}
@@ -126,12 +127,6 @@
 
 						{include file="bitpackage:liberty/edit_services_inc.tpl" serviceFile="content_edit_mini_tpl"}
 
-						<div class="row submit">
-							<input type="submit" name="fCancel" value="{tr}Cancel{/tr}" />&nbsp;
-							<input type="submit" name="preview" value="{tr}Preview{/tr}" />&nbsp;
-							<input type="submit" name="fSavePage" value="{tr}Save{/tr}" />
-						</div>
-
 						{if $gBitSystem->isFeatureActive( 'wiki_attachments' )}
 							{include file="bitpackage:liberty/edit_storage_list.tpl"}
 						{/if}
@@ -150,30 +145,30 @@
 
 				{if $gBitSystem->isFeatureActive( 'wiki_copyrights' )}
 					{jstab title="Copyright"}
-						<div class="row">
+						<div class="control-group">
 							{legend legend="Copyright Settings" for="copyrightTitle"}
-								<div class="row">
+								<div class="control-group">
 									{formlabel label="Title" for="copyrightTitle"}
 									{forminput}
-										<input size="40" type="text" name="copyrightTitle" id="copyrightTitle" value="{$copyrightTitle|escape}" />
+										<input size="40" type="text" class="input-block-level" name="copyrightTitle" id="copyrightTitle" value="{$copyrightTitle|escape}" />
 									{/forminput}
 								</div>
 
-								<div class="row">
+								<div class="control-group">
 									{formlabel label="Authors" for="copyrightAuthors"}
 									{forminput}
-										<input size="40" type="text" name="copyrightAuthors" id="copyrightAuthors" value="{$copyrightAuthors|escape}" />
+										<input size="40" type="text" class="input-block-level" name="copyrightAuthors" id="copyrightAuthors" value="{$copyrightAuthors|escape}" />
 									{/forminput}
 								</div>
 
-								<div class="row">
+								<div class="control-group">
 									{formlabel label="Year" for="copyrightYear"}
 									{forminput}
-										<input size="4" type="text" name="copyrightYear" id="copyrightYear" value="{$copyrightYear|escape}" />
+										<input size="4" type="text" class="input-block-level" name="copyrightYear" id="copyrightYear" value="{$copyrightYear|escape}" />
 									{/forminput}
 								</div>
 
-								<div class="row">
+								<div class="control-group">
 									{formlabel label="License"}
 									{forminput}
 										<a href="{$smarty.const.WIKI_PKG_URL}index.php?page={$wiki_license_page}">{tr}{$wiki_license_page}{/tr}</a>
@@ -182,7 +177,7 @@
 								</div>
 
 								{if $wiki_submit_notice neq ""}
-									<div class="row">
+									<div class="control-group">
 										{formlabel label="Important"}
 										{forminput}
 											{$wiki_submit_notice}
@@ -198,19 +193,20 @@
 				{if $gBitSystem->isFeatureActive( 'wiki_url_import' )}
 					{jstab title="Import HMTL"}
 						{legend legend="Import HMTL"}
-							<div class="row">
+							<div class="control-group">
 								{formlabel label="Import HTML from URL" for="suck_url"}
 								{forminput}
-									<input type="text" size="50" name="suck_url" id="suck_url" value="{$suck_url|escape}" />
+									<input type="text" class="input-block-level" size="50" name="suck_url" id="suck_url" value="{$suck_url|escape}" />
 									{formhelp note=""}
 								{/forminput}
 							</div>
 
-							<div class="row">
-								{formlabel label="Try to convert HTML to wiki" for="parsehtml"}
+							<div class="control-group">
 								{forminput}
-									<input type="checkbox" name="parsehtml" id="parsehtml" {if $parsehtml eq 'y'}checked="checked"{/if} />
+								<label class="checkbox">
+									<input type="checkbox" name="parsehtml" id="parsehtml" {if $parsehtml eq 'y'}checked="checked"{/if} />Try to convert HTML to wiki
 									{formhelp note=""}
+								</label>
 								{/forminput}
 							</div>
 
@@ -224,13 +220,19 @@
 							{/if} { * end upload file row * }
 						*}
 
-							<div class="row submit">
-								<input type="submit" name="do_suck" value="{tr}Import{/tr}" />
+							<div class="control-group submit">
+								<input type="submit" class="btn" name="do_suck" value="{tr}Import{/tr}" />
 							</div>
 						{/legend}
 					{/jstab}
 				{/if}
 			{/jstabs}
+			<div class="control-group submit">
+				{forminput}
+					<input type="submit" class="btn btn-primary" name="fSavePage" value="{tr}Save{/tr}" /> <input type="submit" class="btn pull-right" name="fCancel" value="{tr}Cancel{/tr}" /> <input type="submit" class="btn" name="preview" value="{tr}Preview{/tr}" />
+				{/forminput}
+			</div>
+
 		{/form}
 	</div><!-- end .body -->
 </div><!-- end .admin -->
diff --git a/templates/header_inc.tpl b/templates/html_head_inc.tpl
index 5e9ceb4..5e9ceb4 100644
--- a/templates/header_inc.tpl
+++ b/templates/html_head_inc.tpl
diff --git a/templates/import_phpwiki.tpl b/templates/import_phpwiki.tpl
index 62593ee..3825f87 100644
--- a/templates/import_phpwiki.tpl
+++ b/templates/import_phpwiki.tpl
@@ -24,7 +24,7 @@
 	<input checked="checked" type="radio" name="remo" value="n" /> {tr}no{/tr}</td>
 </tr>
 <tr class="panelsubmitrow">
-  <td colspan="2"><input type="submit" name="import" value="{tr}Import{/tr}" /></td>
+  <td colspan="2"><input type="submit" class="btn" name="import" value="{tr}Import{/tr}" /></td>
 </tr>
 </table>
 </form>
@@ -32,7 +32,7 @@
 <br />
 
 {if $result eq 'y'}
-<table class="data">
+<table class="table data">
 <tr>
   <th>{tr}Page{/tr}</th>
   <th>{tr}version{/tr}</th>
diff --git a/templates/list_books.tpl b/templates/list_books.tpl
index 3decd14..2dd8dd6 100644
--- a/templates/list_books.tpl
+++ b/templates/list_books.tpl
@@ -24,25 +24,15 @@
 			</td>
 			<td class="actionicon">
 				{if ($channels[ix].creator_user_id == $gBitUser->mUserId) || $gBitUser->hasPermission( 'p_wiki_admin_book' )}
-					<a href="{$smarty.const.WIKI_PKG_URL}edit_book.php?structure_id={$channels[ix].structure_id}">{biticon ipackage="icons" iname="emblem-system" iexplain="edit book"}</a>
+					<a href="{$smarty.const.WIKI_PKG_URL}edit_book.php?structure_id={$channels[ix].structure_id}">{booticon iname="icon-cogs"  ipackage="icons"  iexplain="edit book"}</a>
 				{/if}
-{* remove for now because it's broken, and I can't find reason to fix - spiderr
-				<a href="{$smarty.const.WIKI_PKG_URL}edit_book.php?action=export&structure_id={$channels[ix].structure_id}">{biticon ipackage="icons" iname="document-save-as" iexplain="export pages"}</a>
-				<a href="{$smarty.const.WIKI_PKG_URL}edit_book.php?action=export_tree&structure_id={$channels[ix].structure_id}">{biticon ipackage="icons" iname="already dealt with" iexplain="dump tree"}</a>
-*}
 				{if $gBitUser->isAdmin()}
 					{if $gBitSystem->isPackageActive( 'nexus' )}
-						<a href="{$smarty.const.NEXUS_PKG_URL}menus.php?structure_id={$channels[ix].structure_id}&amp;action=convert_structure">{biticon ipackage="icons" iname="folder-remote" iexplain="create menu from structure"}</a>
+						<a href="{$smarty.const.NEXUS_PKG_URL}menus.php?structure_id={$channels[ix].structure_id}&amp;action=convert_structure">{booticon iname="icon-sitemap"  ipackage="icons"  iexplain="create menu from structure"}</a>
 					{/if}
-					{* remove this feature for now - needs fixing or 'real' removal
-					<a href="{$smarty.const.WIKI_PKG_URL}create_webhelp.php?structure_id={$channels[ix].structure_id}">{biticon ipackage="icons" iname="help-browser" iexplain="create webhelp"}</a>
-					*}
 				{/if}
-				{*if $channels[ix].webhelp eq 'y'}
-					<a href="{$smarty.const.BITHELP_PKG_URL}/{$channels[ix].title|escape}/index.html">{biticon ipackage="icons" iname="help-contents" iexplain="view webhelp"}</a>
-				{/if*}
 				{if ($channels[ix].creator_user_id == $gBitUser->mUserId) || $gBitUser->hasPermission( 'p_wiki_admin_book' )}
-					<a href="{$smarty.const.WIKI_PKG_URL}edit_book.php?action=remove&structure_id={$channels[ix].structure_id}">{biticon ipackage="icons" iname="edit-delete" iexplain="remove"}</a>
+					<a href="{$smarty.const.WIKI_PKG_URL}edit_book.php?action=remove&structure_id={$channels[ix].structure_id}">{booticon iname="icon-trash" ipackage="icons" iexplain="remove"}</a>
 				{/if}
 			</td>
 		</tr>
diff --git a/templates/list_pages.tpl b/templates/list_pages.tpl
index ac6749e..8378040 100644
--- a/templates/list_pages.tpl
+++ b/templates/list_pages.tpl
@@ -2,42 +2,40 @@
 <div class="floaticon">{bithelp}</div>
 
 <div class="listing wiki">
-	<div class="header">
+	<header>
+		<div class="floaticon">
+		{form class="form-inline" }
+			<input type="hidden" name="sort_mode" value="{$sort_mode}" />
+			{booticon iname="icon-search"  ipackage="icons"  iexplain="Search"}  
+			<label>{tr}Title{/tr}: <input class="input-small" type="text" name="find_title" value="{$find_title|default:$smarty.request.find_title|escape}" /></label>  <label>{tr}Author{/tr}: <input class="input-small" type="text" name="find_author" value="{$find_author|default:$smarty.request.find_author|escape}" /></label> <label>{tr}Last Editor{/tr}: <input class="input-small" type="text" name="find_last_editor" value="{$find_last_editor|default:$smarty.request.find_last_editor|escape}" /></label>  <input type="submit" class="btn btn-mini" name="search" value="{tr}Find{/tr}" /> 
+		{/form}
+		</div>
 		<h1>{tr}{$gBitSystem->getBrowserTitle()}{/tr}</h1>
-	</div>
+	</header>
+
+	{pagination}
 
 	{formfeedback error=$errors}
 
 	<div class="body">
-		{form class="minifind" legend="find in entries"}
-			<input type="hidden" name="sort_mode" value="{$sort_mode}" />
-			{biticon ipackage="icons" iname="edit-find" iexplain="Search"} &nbsp;
-			<label>{tr}Title{/tr}:&nbsp;<input size="16" type="text" name="find_title" value="{$find_title|default:$smarty.request.find_title|escape}" /></label> &nbsp;
-			<label>{tr}Author{/tr}:&nbsp;<input size="10" type="text" name="find_author" value="{$find_author|default:$smarty.request.find_author|escape}" /></label> &nbsp;
-			<label>{tr}Last Editor{/tr}:&nbsp;<input size="10" type="text" name="find_last_editor" value="{$find_last_editor|default:$smarty.request.find_last_editor|escape}" /></label> &nbsp;
-			<input type="submit" name="search" value="{tr}Find{/tr}" />&nbsp;
-			<input type="button" onclick="location.href='{$smarty.server.SCRIPT_NAME}{if $hidden}?{/if}{foreach from=$hidden item=value key=name}{$name}={$value}&amp;{/foreach}'" value="{tr}Reset{/tr}" />
-		{/form}
 
 		{form id="checkform"}
-			<div class="navbar">
-				<ul>
-					<li>{biticon ipackage="icons" iname="emblem-symbolic-link" iexplain="sort by"}</li>
-					{if $gBitSystem->isFeatureActive( 'wiki_list_name' )}
-						<li>{smartlink ititle="Page Name" isort="title" icontrol=$listInfo}</li>
-					{/if}
-					{if $gBitSystem->isFeatureActive( 'wiki_list_lastmodif' )}
-						<li>{smartlink ititle="Last Modified" iorder="desc" idefault=1 isort="last_modified" icontrol=$listInfo}</li>
-					{/if}
-					{if $gBitSystem->isFeatureActive( 'wiki_list_creator' )}
-						<li>{smartlink ititle="Author" isort="creator_user" icontrol=$listInfo}</li>
-					{/if}
-					{if $gBitSystem->isFeatureActive( 'wiki_list_user' )}
-						<li>{smartlink ititle="Last Editor" isort="modifier_user" icontrol=$listInfo}</li>
-					{/if}
-					{include file="bitpackage:liberty/services_inc.tpl" serviceLocation='list_sort' serviceHash=$gContent->mInfo}
-				</ul>
-			</div>
+			<ul class="inline navbar">
+				<li>{booticon iname="icon-circle-arrow-right"  ipackage="icons"  iexplain="sort by"}</li>
+				{if $gBitSystem->isFeatureActive( 'wiki_list_name' )}
+					<li>{smartlink ititle="Page Name" isort="title" icontrol=$listInfo}</li>
+				{/if}
+				{if $gBitSystem->isFeatureActive( 'wiki_list_lastmodif' )}
+					<li>{smartlink ititle="Last Modified" iorder="desc" idefault=1 isort="last_modified" icontrol=$listInfo}</li>
+				{/if}
+				{if $gBitSystem->isFeatureActive( 'wiki_list_creator' )}
+					<li>{smartlink ititle="Author" isort="creator_user" icontrol=$listInfo}</li>
+				{/if}
+				{if $gBitSystem->isFeatureActive( 'wiki_list_user' )}
+					<li>{smartlink ititle="Last Editor" isort="modifier_user" icontrol=$listInfo}</li>
+				{/if}
+				{include file="bitpackage:liberty/services_inc.tpl" serviceLocation='list_sort' serviceHash=$gContent->mInfo}
+			</ul>
 
 			<input type="hidden" name="offset" value="{$offset}" />
 			<input type="hidden" name="sort_mode" value="{$sort_mode}" />
@@ -46,7 +44,7 @@
 
 			{include file="bitpackage:liberty/services_inc.tpl" serviceLocation='list_options'}
 
-			<table class="data">
+			<table class="table data">
 				<caption>{tr}WikiPages Listing{/tr} <span class="total">[ {$listInfo.total_records} ]</span></caption>
 				<tr>
 					{*  at the moment, the only working option to use the checkboxes for is deleting pages. so for now the checkboxes are visible iff $p_wiki_remove_page is set. Other applications make sense as well (categorize, convert to pdf, etc). Add necessary corresponding permission here: *}
@@ -170,9 +168,9 @@
 						{if $gBitSystem->isFeatureActive( 'wiki_list_status' )}
 							<td style="text-align:center;">
 								{if $listpages[changes].flag eq 'locked'}
-									{biticon ipackage="icons" iname="emblem-readonly" iexplain="locked"}
+									{booticon iname="icon-lock" ipackage="icons" iexplain="locked"}
 								{else}
-									{biticon ipackage="icons" iname="emblem-default" iexplain="unlocked"}
+									{booticon ipackage="icons" iname="icon-asterisk" iexplain="unlocked"}
 								{/if}
 							</td>
 						{/if}
@@ -201,10 +199,8 @@
 						{/if}
 						{if $gBitUser->hasPermission( 'p_wiki_update_page' )}
 							<td class="actionicon">
-								<a href="{$smarty.const.WIKI_PKG_URL}edit.php?page_id={$listpages[changes].page_id}">{biticon ipackage="icons" iname="accessories-text-editor" iexplain="edit"}</a>
-								{if $checkboxes_on eq 'y'}
-									<input type="checkbox" name="checked[]" value="{$listpages[changes].page_id}" />
-								{/if}
+								<a href="{$smarty.const.WIKI_PKG_URL}edit.php?page_id={$listpages[changes].page_id}">{booticon iname="icon-edit" ipackage="icons" iexplain="edit"}</a>
+								{if $checkboxes_on eq 'y'} <input type="checkbox" name="checked[]" value="{$listpages[changes].page_id}" /> {/if}
 							</td>
 						{/if}
 					</tr>
@@ -218,8 +214,7 @@
 			{if $checkboxes_on eq 'y'}
 				<div style="text-align:right;">
 					<script type="text/javascript">/* <![CDATA[ check / uncheck all */
-						document.write("<label for=\"switcher\">{tr}Select All{/tr}</label> ");
-						document.write("<input name=\"switcher\" id=\"switcher\" type=\"checkbox\" onclick=\"BitBase.switchCheckboxes(this.form.id,'checked[]','switcher')\" />");
+						document.write("<label for=\"switcher\">{tr}Select All{/tr} <input name=\"switcher\" id=\"switcher\" type=\"checkbox\" onclick=\"BitBase.switchCheckboxes(this.form.id,'checked[]','switcher')\" /></label>");
 					/* ]]> */</script>
 					<br />
 					<select name="batch_submit" onchange="this.form.submit();">
@@ -230,13 +225,12 @@
 					</select>
 
 					<noscript>
-						<div><input type="submit" value="{tr}Submit{/tr}" /></div>
+						<div><input type="submit" class="btn" value="{tr}Submit{/tr}" /></div>
 					</noscript>
 				</div>
 			{/if}
 		{/form}
 
-		{pagination}
 	</div><!-- end .body -->
 </div><!-- end .wiki -->
 {/strip}
diff --git a/templates/menu_wiki.tpl b/templates/menu_wiki.tpl
index ae4a471..3d13629 100644
--- a/templates/menu_wiki.tpl
+++ b/templates/menu_wiki.tpl
@@ -1,42 +1,32 @@
 {strip}
-{assign var=pkgNameWS value=$gBitSystem->getConfig(wiki_menu_text)|default:"Wiki"|cat:" "}
-<ul>
+{if $packageMenuTitle}<a class="dropdown-toggle" data-toggle="dropdown" href="#"> {tr}{$packageMenuTitle}{/tr} <b class="caret"></b></a>{/if}
+<ul class="{$packageMenuClass}">
 	{if $gBitUser->hasPermission( 'p_wiki_view_page' )}
-		<li><a class="item" href="{$smarty.const.WIKI_PKG_URL}index.php">{biticon iname="go-home" iexplain=$pkgNameWS|cat:"Home" ilocation=menu}</a></li>
+		<li><a class="item" href="{$smarty.const.WIKI_PKG_URL}index.php">{booticon iname="icon-home" iexplain="`$smarty.const.WIKI_PKG_DIR` Home" ilocation=menu}</a></li>
 	{/if}
 	{if $gBitUser->hasPermission( 'p_wiki_list_pages' )}
-		<li><a class="item" href="{$smarty.const.WIKI_PKG_URL}list_pages.php">{biticon iname="format-justify-fill" iexplain="List Pages" ilocation=menu}</a></li>
+		<li><a class="item" href="{$smarty.const.WIKI_PKG_URL}list_pages.php">{booticon iname="icon-list" iexplain="List Pages" ilocation=menu}</a></li>
 	{/if}
 	{if $gBitUser->hasPermission( 'p_wiki_create_page' )}
-		<li><a class="item" href="{$smarty.const.WIKI_PKG_URL}edit.php">{biticon iname="document-new" iexplain="Create Page" ilocation=menu}</a></li>
+		<li><a class="item" href="{$smarty.const.WIKI_PKG_URL}edit.php">{booticon iname="icon-file" iexplain="Create Page" ilocation=menu}</a></li>
 	{/if}
 	{if $gBitUser->hasPermission( 'p_wiki_view_page' ) and $gBitSystem->isFeatureActive( 'wiki_books' )}
-		<li><a class="item" href="{$smarty.const.WIKI_PKG_URL}books.php">{biticon iname="folder-open" iexplain=$pkgNameWS|cat:"Books" ilocation=menu}</a></li>
+		<li><a class="item" href="{$smarty.const.WIKI_PKG_URL}books.php">{booticon iname="icon-book" iexplain="`$smarty.const.WIKI_PKG_DIR` Books" ilocation=menu}</a></li>
 	{/if}
 	{if $gBitSystem->isFeatureActive( 'wiki_books' ) && $gBitUser->hasPermission( 'p_wiki_create_book' )}
-		<li><a class="item" href="{$smarty.const.WIKI_PKG_URL}edit_book.php">{biticon iname="folder-new" iexplain="Create Book" ilocation=menu}</a></li>
+		<li><a class="item" href="{$smarty.const.WIKI_PKG_URL}edit_book.php">{booticon iname="icon-copy" iexplain="Create Book" ilocation=menu}</a></li>
 	{/if}
 	{if $gBitSystem->isFeatureActive( 'wiki_list_orphans' ) and $gBitUser->hasPermission( 'p_wiki_view_page' )}
-		<li><a class="item" href="{$smarty.const.WIKI_PKG_URL}orphan_pages.php">{biticon iname=go-bottom iexplain="Orphan Pages" ilocation=menu}</a></li>
+		<li><a class="item" href="{$smarty.const.WIKI_PKG_URL}orphan_pages.php">{booticon iname="icon-search" iexplain="Orphan Pages" ilocation=menu}</a></li>
 	{/if}
 	{if $gBitSystem->isFeatureActive( 'wiki_multiprint' ) and $gBitUser->hasPermission( 'p_wiki_view_page' )}
-		<li><a class="item" href="{$smarty.const.WIKI_PKG_URL}print_pages.php">{biticon iname="document-print" iexplain="Print" ilocation=menu}</a></li>
+		<li><a class="item" href="{$smarty.const.WIKI_PKG_URL}print_pages.php">{booticon iname="icon-print"   iexplain="Print" ilocation=menu}</a></li>
 	{/if}
 	{if $gBitUser->hasPermission( 'p_wiki_list_pages' )}
-		<li><a class="item" href="{$smarty.const.WIKI_PKG_URL}rankings.php">{biticon iname="format-justify-fill" iexplain=$pkgNameWS|cat:"Rankings" ilocation=menu}</a></li>
+		<li><a class="item" href="{$smarty.const.WIKI_PKG_URL}rankings.php">{booticon iname="icon-list" iexplain="`$smarty.const.WIKI_PKG_DIR` Rankings" ilocation=menu}</a></li>
 	{/if}
 	{if $gBitSystem->isPackageActive( 'rss' )}
-	<li><a title="{tr}Wiki Update RSS Feed{/tr}" href="{$smarty.const.RSS_PKG_URL}index.php?pkg=wiki">{biticon iname="rss-16x16" ipackage=rss iexplain="Changes Feed" ilocation=menu}</a></li>
+	<li><a title="{tr}Wiki Update RSS Feed{/tr}" href="{$smarty.const.RSS_PKG_URL}index.php?pkg=wiki">{booticon iname="icon-rss" ipackage=rss iexplain="Changes Feed" ilocation=menu}</a></li>
 	{/if}
-	{if $gBitSystem->isFeatureActive( 'wiki_sandbox' ) and $gBitUser->hasPermission( 'p_wiki_view_page' )}
-		<li><a class="item" href="{$smarty.const.WIKI_PKG_URL}edit.php?page=SandBox">{biticon iname=user-trash-full iexplain="Sandbox" ilocation=menu}</a></li>
-	{/if}
-
-	{*if $gBitUser->hasPermission( 'p_xmlrpc_send_content' ) and $gBitSystem->isFeatureActive( 'feature_comm' )}
-		<li><a class="item" href="{$smarty.const.XMLRPC_PKG_URL}send_objects.php">{biticon ipackage=liberty iname=spacer iexplain="Send pages" ilocation=menu}</a></li>
-	{/if}
-	{if $gBitUser->hasPermission( 'p_xmlrpc_admin_content' ) and $gBitSystem->isFeatureActive( 'feature_comm' )}
-		<li><a class="item" href="{$smarty.const.WIKI_PKG_URL}received_pages.php">{biticon ipackage=liberty iname=spacer iexplain="Recieved pages" ilocation=menu}</a></li>
-	{/if*}
 </ul>
 {/strip}
diff --git a/templates/menu_wiki_admin.tpl b/templates/menu_wiki_admin.tpl
index 2716f33..191c2a2 100644
--- a/templates/menu_wiki_admin.tpl
+++ b/templates/menu_wiki_admin.tpl
@@ -1,5 +1 @@
-{strip}
-<ul>
-	<li><a class="item" href="{$smarty.const.KERNEL_PKG_URL}admin/index.php?page=wiki">{tr}Wiki Settings{/tr}</a></li>
-</ul>
-{/strip}
+{if $packageMenuTitle}<a class="nosubmenu" href="{$smarty.const.KERNEL_PKG_URL}admin/index.php?page=wiki">{tr}Wiki{/tr}</a>{/if}
diff --git a/templates/page_action_bar.tpl b/templates/page_action_bar.tpl
index c87cba4..0b55ea8 100644
--- a/templates/page_action_bar.tpl
+++ b/templates/page_action_bar.tpl
@@ -47,10 +47,8 @@
 			{/if}
 	{/strip}{/capture}
 	{if $smarty.capture.navbarlist ne ''}
-		<div class="navbar">
-			<ul>
-				{$smarty.capture.navbarlist}
-			</ul>
-		</div>
+		<ul class="inline navbar">
+			{$smarty.capture.navbarlist}
+		</ul>
 	{/if}
 {/if}
diff --git a/templates/page_history.tpl b/templates/page_history.tpl
index 82fd4a0..4182b2d 100644
--- a/templates/page_history.tpl
+++ b/templates/page_history.tpl
@@ -18,7 +18,7 @@
 		{/if}
 
 		{if $compare eq 'y'}
-			<table class="data">
+			<table class="table data">
 				<caption>{tr}Comparing versions{/tr}</caption>
 				<tr>
 					<th width="50%">{tr}Version {$version_from}{/tr}</td>
@@ -48,7 +48,7 @@
 			<input type="hidden" name="page_id" value="{$gContent->mInfo.page_id}" />
 			<input type="hidden" name="page" value="{$page}" />
 
-			<table class="data">
+			<table class="table data">
 				<caption>{tr}Page History{/tr}</caption>
 				<tr>
 					<th style="width:70%;">{tr}Date{/tr}/{tr}Comment{/tr}</th>
@@ -71,7 +71,7 @@
 				<tr class="odd">
 					<td colspan="4">
 						<a href="{$gContent->mInfo.display_url}">{tr}Current{/tr}</a>
-						&nbsp;&bull;&nbsp;{smartlink ititle="Source" page_id=`$gContent->mPageId` source="current"}
+						&nbsp;&bull;&nbsp;{smartlink ititle="Source" page_id=$gContent->mPageId source="current"}
 					</td>
 				</tr>
 
@@ -84,12 +84,12 @@
 					</tr>
 					<tr class="{cycle values='even,odd'}">
 						<td colspan="3">
-							{smartlink ititle="View" page_id=`$gContent->mPageId` preview=`$item.version`}
-							&nbsp;&bull;&nbsp;{smartlink ititle="Compare" page_id=`$gContent->mPageId` compare=`$item.version`}
-							&nbsp;&bull;&nbsp;{smartlink ititle="Difference" page_id=`$gContent->mPageId` diff2=`$item.version`}
-							&nbsp;&bull;&nbsp;{smartlink ititle="Source" page_id=`$gContent->mPageId` source=`$item.version`}
+							{smartlink ititle="View" page_id=$gContent->mPageId preview=$item.version}
+							&nbsp;&bull;&nbsp;{smartlink ititle="Compare" page_id=$gContent->mPageId compare=$item.version}
+							&nbsp;&bull;&nbsp;{smartlink ititle="Difference" page_id=$gContent->mPageId diff2=$item.version}
+							&nbsp;&bull;&nbsp;{smartlink ititle="Source" page_id=$gContent->mPageId source=$item.version}
 							{if $gBitUser->hasPermission( 'p_wiki_rollback' )}
-								&nbsp;&bull;&nbsp;{smartlink ititle="Rollback" page_id=`$gContent->mPageId` rollback=`$item.version`}
+								&nbsp;&bull;&nbsp;{smartlink ititle="Rollback" page_id=$gContent->mPageId rollback=$item.version}
 							{/if}
 						</td>
 						<td style="text-align:right;">
@@ -109,7 +109,7 @@
 
 			{if $gBitUser->hasPermission( 'p_wiki_remove_page' )}
 				<div style="text-align:right;">
-					<input type="submit" name="delete" value="{tr}Delete selected versions{/tr}" />
+					<input type="submit" class="btn" name="delete" value="{tr}Delete selected versions{/tr}" />
 				</div>
 			{/if}
 		{/form}
diff --git a/templates/page_icons.tpl b/templates/page_icons.tpl
index e79254b..af32db7 100644
--- a/templates/page_icons.tpl
+++ b/templates/page_icons.tpl
@@ -4,84 +4,85 @@
 		{include file="bitpackage:liberty/services_inc.tpl" serviceLocation='icon' serviceHash=$gContent->mInfo}
 
 		{if $gBitSystem->isFeatureActive( 'wiki_like_pages' )}
-			<a href="{$smarty.const.WIKI_PKG_URL}like_pages.php?page_id={$gContent->mInfo.page_id}">{biticon ipackage="icons" iname="edit-copy" iexplain="Similar Pages"}</a>
+			<a href="{$smarty.const.WIKI_PKG_URL}like_pages.php?page_id={$gContent->mInfo.page_id}">{booticon iname="icon-copy" ipackage="icons" iexplain="Similar Pages"}</a>
 		{/if}
 
 		{if $gContent->isLocked()}
 			{if $gContent->hasAdminPermission() or ($gContent->isOwner() and $gContent->hasUserPermission( 'p_wiki_lock_page' ) and $gBitSystem->isFeatureActive( 'wiki_usrlock' ))}
-				<a href="{$smarty.const.WIKI_PKG_URL}index.php?page_id={$gContent->mInfo.page_id}&amp;action=unlock">{biticon ipackage="icons" iname="emblem-readonly" iexplain="Unlock this page"}</a>
+				<a href="{$smarty.const.WIKI_PKG_URL}index.php?page_id={$gContent->mInfo.page_id}&amp;action=unlock">{booticon iname="icon-lock" ipackage="icons" iexplain="Unlock this page"}</a>
 			{else}
-				{biticon ipackage="icons" iname="emblem-readonly" iexplain="Locked"}
+				{booticon iname="icon-lock" ipackage="icons" iexplain="Locked"}
 			{/if}
 		{else}
 			{assign var=format_guid value=$gContent->mInfo.format_guid}
 			{if $gLibertySystem->mPlugins.$format_guid.is_active eq 'y' or $gContent->hasAdminPermission()}
-				{if $gContent->hasUpdatePermission() or $gContent->mInfo.title eq 'SandBox'}
+				{if $gContent->hasUpdatePermission()}
 					{if $gContent->hasAdminPermission() or ($gContent->isOwner() and $gContent->hasUserPermission( 'p_wiki_lock_page' ) and $gBitSystem->isFeatureActive( 'wiki_usrlock' ))}
-						<a href="{$smarty.const.WIKI_PKG_URL}index.php?page_id={$gContent->mInfo.page_id}&amp;action=lock">{biticon ipackage="icons" iname="emblem-readonly" iexplain="Lock this page"}</a>
+						<a href="{$smarty.const.WIKI_PKG_URL}index.php?page_id={$gContent->mInfo.page_id}&amp;action=lock">{booticon iname="icon-unlock" ipackage="icons" iexplain="Lock this page"}</a>
 					{/if}
-					<a href="{$smarty.const.WIKI_PKG_URL}edit.php?page_id={$gContent->mInfo.page_id}">{biticon ipackage="icons" iname="accessories-text-editor" iexplain="Edit"}</a>
+					<a href="{$smarty.const.WIKI_PKG_URL}edit.php?page_id={$gContent->mInfo.page_id}">{booticon iname="icon-edit" ipackage="icons" iexplain="Edit"}</a>
 				{/if}
 			{/if}
 
 			{if $gBitSystem->isFeatureActive( 'wiki_undo' ) and $gContent->hasUserPermission('p_wiki_rollback')}
-				<a href="{$smarty.const.WIKI_PKG_URL}index.php?page_id={$gContent->mInfo.page_id}&amp;undo=1">{biticon ipackage=icons iname=edit-undo iexplain="Undo last edit"}</a>
+				<a href="{$smarty.const.WIKI_PKG_URL}index.php?page_id={$gContent->mInfo.page_id}&amp;undo=1">{booticon ipackage=icons iname=icon-undo iexplain="Undo last edit"}</a>
 			{/if}
 
 			{if $gBitSystem->isFeatureActive( 'wiki_history' ) and $gContent->hasUserPermission('p_wiki_view_history')}
-				<a href="{$smarty.const.WIKI_PKG_URL}page_history.php?page_id={$gContent->mInfo.page_id}" rel="nofollow">{biticon ipackage=icons iname="appointment-new" iexplain=History}</a>
+				<a href="{$smarty.const.WIKI_PKG_URL}page_history.php?page_id={$gContent->mInfo.page_id}" rel="nofollow">{booticon iname="icon-time" ipackage="icons" iexplain=History}</a>
 			{/if}
 		{/if}
 
 		{if ($structureInfo.structure_id) && ($gStructure->mInfo.creator_user_id == $gBitUser->mUserId || $gContent->hasUserPermission( 'p_wiki_admin_book' ))}
-			<a href="{$smarty.const.WIKI_PKG_URL}edit_book.php?structure_id={$structureInfo.structure_id}">{biticon ipackage="icons" iname="emblem-system" iexplain="Edit book"}</a>
-		{elseif is_a($gContent,'BitBook')}
-			<a href="{$smarty.const.WIKI_PKG_URL}edit_book.php?content_id={$gContent->mContentId}">{biticon ipackage="icons" iname="emblem-system" iexplain="Edit book"}</a>
-		{/if}
-
-		{if $gBitSystem->isFeatureActive( 'wiki_uses_s5' )}
-			<a href="{$smarty.const.WIKI_PKG_URL}index.php?page_id={$gContent->mInfo.page_id}&amp;s5=1">{biticon ipackage="icons" iname="x-office-presentation" iexplain="s5 slideshow"}</a>
+			<a href="{$smarty.const.WIKI_PKG_URL}edit_book.php?structure_id={$structureInfo.structure_id}">{booticon iname="icon-cogs"  ipackage="icons"  iexplain="Edit book"}</a>
+		{elseif is_a($gContent,'BitBook') && $gContent->hasUpdatePermission()}
+			<a href="{$smarty.const.WIKI_PKG_URL}edit_book.php?content_id={$gContent->mContentId}">{booticon iname="icon-cogs"  ipackage="icons"  iexplain="Edit book"}</a>
 		{/if}
 
 		{if $gBitUser->isRegistered() and $gBitUser->mUserId && $gBitSystem->isFeatureActive( 'users_watches' ) }
 			{if $user_watching_page eq 'y'}
-				<a title="{tr}stop monitoring this page{/tr}" href="{$smarty.const.WIKI_PKG_URL}index.php?page_id={$gContent->mInfo.page_id}&amp;watch_event=wiki_page_changed&amp;watch_object={$gContent->mInfo.page_id}&amp;watch_action=remove">{biticon ipackage="icons" iname="weather-clear-night" iexplain="Stop monitoring"}</a>
+				<a title="{tr}stop monitoring this page{/tr}" href="{$smarty.const.WIKI_PKG_URL}index.php?page_id={$gContent->mInfo.page_id}&amp;watch_event=wiki_page_changed&amp;watch_object={$gContent->mInfo.page_id}&amp;watch_action=remove">{booticon ipackage="icons" iname="icon-eye-close" iexplain="Stop monitoring"}</a>
 			{else}
-				<a title="{tr}monitor this page{/tr}" href="{$smarty.const.WIKI_PKG_URL}index.php?page_id={$gContent->mInfo.page_id}&amp;watch_event=wiki_page_changed&amp;watch_object={$gContent->mInfo.page_id}&amp;watch_action=add">{biticon ipackage="icons" iname="weather-clear" iexplain="Monitor"}</a>
+				<a title="{tr}monitor this page{/tr}" href="{$smarty.const.WIKI_PKG_URL}index.php?page_id={$gContent->mInfo.page_id}&amp;watch_event=wiki_page_changed&amp;watch_object={$gContent->mInfo.page_id}&amp;watch_action=add">{booticon iname="icon-eye"  ipackage="icons"  iexplain="Monitor"}</a>
 			{/if}
 		{/if}
 
 		{if $gBitSystem->isFeatureActive( 'users_watches' ) and $gContent->hasUserPermission('p_users_admin')}
-			<a href="{$smarty.const.WIKI_PKG_URL}page_watches.php?page_id={$gContent->mInfo.page_id}">{biticon ipackage="icons" iname="system-search" iexplain="Watches"}</a>
+			<a href="{$smarty.const.WIKI_PKG_URL}page_watches.php?page_id={$gContent->mInfo.page_id}">{booticon ipackage="icons" iname="icon-user" iexplain="Watches"}</a>
 		{/if}
 
 {* seem to be broken
 		{if $gBitUser->hasPermission( 'p_wiki_admin' )}
-			<li><a href="{$smarty.const.WIKI_PKG_URL}export_wiki_pages.php?page_id={$gContent->mInfo.page_id}">{biticon ipackage="icons" iname="go-up" iexplain="Export"}</a></li>
+			<li><a href="{$smarty.const.WIKI_PKG_URL}export_wiki_pages.php?page_id={$gContent->mInfo.page_id}">{booticon iname="icon-cloud-upload" ipackage="icons" iexplain="Export"}</a></li>
 		{/if}
 *}
 
 		{if $gBitSystem->isFeatureActive( 'wiki_uses_slides' )}
 			{if $show_slideshow eq 'y'}
-				<a href="{$smarty.const.WIKI_PKG_URL}slideshow.php?page_id={$gContent->mInfo.page_id}">{biticon ipackage="icons" iname="x-office-presentation" iexplain="Slideshow"}</a>
+				<a href="{$smarty.const.WIKI_PKG_URL}slideshow.php?page_id={$gContent->mInfo.page_id}">{booticon ipackage="icons" iname="icon-facetime-video" iexplain="Slideshow"}</a>
 			{elseif $structure eq 'y'}
-				<a href="{$smarty.const.WIKI_PKG_URL}slideshow2.php?structure_id={$page_info.structure_id}">{biticon ipackage="icons" iname="x-office-presentation" iexplain="Slideshow"}</a>
+				<a href="{$smarty.const.WIKI_PKG_URL}slideshow2.php?structure_id={$page_info.structure_id}">{booticon ipackage="icons" iname="icon-facetime-video" iexplain="Slideshow"}</a>
 			{/if}
 		{/if}
 
 		{if $gContent->mInfo.title ne 'SandBox' && !$gContent->isLocked()}
 			{if $gContent->isOwner() || $gContent->hasUserPermission( 'p_wiki_remove_page' )}
-				<a title="{tr}remove this page{/tr}" href="{$smarty.const.WIKI_PKG_URL}remove_page.php?page_id={$gContent->mInfo.page_id}&amp;version=last">{biticon ipackage="icons" iname="edit-delete" iexplain="Delete"}</a>
+				<a title="{tr}remove this page{/tr}" href="{$smarty.const.WIKI_PKG_URL}remove_page.php?page_id={$gContent->mInfo.page_id}&amp;version=last">{booticon iname="icon-trash" ipackage="icons" iexplain="Delete"}</a>
 			{/if}
 		{/if}
 
 		{if $gBitSystem->isFeatureActive( 'wiki_backlinks' ) and $backlinks}
-			<select id="sel-backlinks" name="page" onchange="javascript:BitBase.go(this)">
-				<option value="{$smarty.const.WIKI_PKG_URL}index.php?page_id={$gContent->mInfo.page_id}">{tr}Backlinks{/tr} &hellip;</option>
-				{foreach key=contentId item=backPage from=$backlinks}
-					<option value="{$smarty.const.BIT_ROOT_URL}index.php?content_id={$contentId}">{$backPage|truncate:30:"&hellip":true}</option>
-				{/foreach}
-			</select>
+			<div class="btn-group">
+				<button class="btn btn-mini dropdown-toggle" data-toggle="dropdown">
+				  <i class="icon-link"></i>
+				  <span class="caret"></span>
+				</button>
+				<ul class="dropdown-menu pull-right">
+					{foreach key=contentId item=backPage from=$backlinks}
+						<li><a href="{$smarty.const.BIT_ROOT_URL}index.php?content_id={$contentId}">{$backPage|escape|truncate:30:"&hellip":true}</a></li>
+					{/foreach}
+				</ul>
+			  </div>
 		{/if}
 
 		{if count($showstructs) gt 0}
diff --git a/templates/page_permissions.tpl b/templates/page_permissions.tpl
index 9149de2..b34e267 100644
--- a/templates/page_permissions.tpl
+++ b/templates/page_permissions.tpl
@@ -11,7 +11,7 @@
 			<input type="hidden" name="page_id" value="{$gContent->mInfo.page_id}" />
 			<input type="hidden" name="tab" value="email" />
 
-			<div class="row">
+			<div class="control-group">
 				{formlabel label="Email"}
 				{forminput}
 					<input type="text" name="email" size="35" />
@@ -19,8 +19,8 @@
 				{/forminput}
 			</div>
 
-			<div class="row submit">
-				<input type="submit" name="addemail" value="{tr}Add email address{/tr}" />
+			<div class="control-group submit">
+				<input type="submit" class="btn" name="addemail" value="{tr}Add email address{/tr}" />
 			</div>
 		{/form}
 
@@ -28,7 +28,7 @@
 			<h2>{tr}Existing requests for email notification{/tr}</h2>
 			<ul>
 				{section name=ix loop=$emails}
-					<li>{$emails[ix]} <a href="{$smarty.const.WIKI_PKG_URL}page_permissions.php?page_id={$gContent->mInfo.page_id}&amp;removeemail={$emails[ix]}&amp;tab=email">{biticon ipackage="icons" iname="edit-delete" iexplain="delete"}</a></li>
+					<li>{$emails[ix]} <a href="{$smarty.const.WIKI_PKG_URL}page_permissions.php?page_id={$gContent->mInfo.page_id}&amp;removeemail={$emails[ix]}&amp;tab=email">{booticon iname="icon-trash" ipackage="icons" iexplain="delete"}</a></li>
 				{/section}
 			</ul>
 		{/if}
diff --git a/templates/print.tpl b/templates/print.tpl
index 49216e9..437ca37 100644
--- a/templates/print.tpl
+++ b/templates/print.tpl
@@ -5,7 +5,7 @@
 <div class="display wiki">
 	<div class="floaticon"> <!-- Actions -->
 		{if $gContent->hasUpdatePermission()}
-			<a href="{$smarty.const.WIKI_PKG_URL}edit.php?page_id={$gContent->mInfo.page_id}">{biticon ipackage="icons" iname="accessories-text-editor" iexplain="edit"}</a>
+			<a href="{$smarty.const.WIKI_PKG_URL}edit.php?page_id={$gContent->mInfo.page_id}">{booticon iname="icon-edit" ipackage="icons" iexplain="edit"}</a>
 		{/if}
 		{if $gBitSystem->isPackageActive( 'pdf' ) && $gContent->hasUserPermission( 'p_pdf_generation' )}
 			<a title="{tr}create PDF{/tr}" href="{$smarty.const.PDF_PKG_URL}?page_id={$gContent->mInfo.page_id}">{biticon ipackage="pdf" iname="pdf" iexplain="PDF"}</a>
diff --git a/templates/print_pages.tpl b/templates/print_pages.tpl
index 2d13255..8c8740f 100644
--- a/templates/print_pages.tpl
+++ b/templates/print_pages.tpl
@@ -9,7 +9,7 @@
 				<input type="hidden" name="sendarticles" value="{$form_sendarticles|escape}" />
 				<input type="hidden" name="printpages" value="{$form_printpages|escape}" />
 
-				<div class="row">
+				<div class="control-group">
 					{formlabel label="Wiki Pages" for="pages"}
 					{forminput}
 						<select name="title" id="pages">
@@ -21,25 +21,25 @@
 					{/forminput}
 				</div>
 
-				<div class="row">
+				<div class="control-group">
 					{formlabel label="Filter" for="find"}
 					{forminput}
 						<input type="text" name="find" id="find" value="{$find|escape}" />
-						&nbsp;<input type="submit" name="filter" value="{tr}filter{/tr}" />
+						&nbsp;<input type="submit" class="btn" name="filter" value="{tr}filter{/tr}" />
 						{formhelp note="To find specific pages more easily, you can apply a filter here."}
 					{/forminput}
 				</div>
 
-				<div class="row submit">
-					<input type="submit" name="addpage" value="{tr}add page{/tr}" />
-					&nbsp;<input type="submit" name="clearpages" value="{tr}clear pages{/tr}" />
+				<div class="control-group submit">
+					<input type="submit" class="btn" name="addpage" value="{tr}add page{/tr}" />
+					&nbsp;<input type="submit" class="btn" name="clearpages" value="{tr}clear pages{/tr}" />
 				</div>
 			{/form}
 
 			{form legend="Selected Wiki Pages" ipackage="wiki" ifile="print_multi_pages.php"}
 				<input type="hidden" name="printpages" value="{$form_printpages|escape}" />
 				
-				<div class="row">
+				<div class="control-group">
 					<ul>
 						{section name=ix loop=$printpages}
 							<li>{$printpages[ix]}</li>
@@ -47,8 +47,8 @@
 					</ul>
 				</div>
 				
-				<div class="row submit">
-					<input type="submit" name="print" value="{tr}print{/tr}" />
+				<div class="control-group submit">
+					<input type="submit" class="btn" name="print" value="{tr}print{/tr}" />
 				</div>
 			{/form}
 	</div><!-- end .body -->
diff --git a/templates/remove_page.tpl b/templates/remove_page.tpl
index 782e720..3e41a91 100644
--- a/templates/remove_page.tpl
+++ b/templates/remove_page.tpl
@@ -12,29 +12,29 @@
 
 			{formfeedback warning="These actions are permanent and cannot be undone"}
 
-			<div class="row">
+			<div class="control-group">
 				{formlabel label="Page to remove"}
 				{forminput}
 					{$page}
 				{/forminput}
 			</div>
 
-			<div class="row">
+			<div class="control-group">
 				{formlabel label="Version"}
 				{forminput}
 					{$version}
 				{/forminput}
 			</div>
 
-			<div class="row">
+			<div class="control-group">
 				{formlabel label="Remove all versions" for="all"}
 				{forminput}
 					<input type="checkbox" name="all" id="all" />
 				{/forminput}
 			</div>
 
-			<div class="row submit">
-				<input type="submit" name="remove" value="{tr}remove{/tr}" />
+			<div class="control-group submit">
+				<input type="submit" class="btn" name="remove" value="{tr}remove{/tr}" />
 			</div>
 		{/form}
 	</div> <!-- end .body -->
diff --git a/templates/rename_page.tpl b/templates/rename_page.tpl
index 7145cce..825bac2 100644
--- a/templates/rename_page.tpl
+++ b/templates/rename_page.tpl
@@ -11,7 +11,7 @@
 				<tr><td>
 						{tr}New name{/tr}:</td><td>
 						<input type="text" name="newpage" value="{$page|escape}" size="35" />
-						<input type="submit" name="rename" value="{tr}Rename{/tr}" />
+						<input type="submit" class="btn" name="rename" value="{tr}Rename{/tr}" />
 				</td></tr>
 			</table>
 		</form>
diff --git a/templates/rollback.tpl b/templates/rollback.tpl
index e04a10d..101aa02 100644
--- a/templates/rollback.tpl
+++ b/templates/rollback.tpl
@@ -4,6 +4,6 @@
 <form action="{$smarty.const.WIKI_PKG_URL}rollback.php" method="post">
 <input type="hidden"  name="content_id" value="{$gContent->mContentId}" />
 <input type="hidden" name="version" value="{$version|escape}" />
-<input type="submit" name="rollback" value="{tr}rollback{/tr}" />
+<input type="submit" class="btn" name="rollback" value="{tr}rollback{/tr}" />
 </form>
 </div>
diff --git a/templates/s5.tpl b/templates/s5.tpl
index 0ee7049..2b380e3 100644
--- a/templates/s5.tpl
+++ b/templates/s5.tpl
@@ -7,7 +7,7 @@
 	<title>{$gContent->mInfo.title|escape}</title>
 	<meta name="generator" content="S5" />
 	<meta name="version" content="S5 1.0" />
-	<meta name="author" content="{displayname user_id=`$gContent->mInfo.user_id` nolink='yes'}" />
+	<meta name="author" content="{displayname user_id=$gContent->mInfo.user_id nolink='yes'}" />
 	<meta name="company" content="" />
 	<meta name="defaultView" content="slideshow" />
 	<meta name="controlVis" content="hidden" />