5 files changed, 52 insertions, 22 deletions
diff --git a/view/php/default.php b/view/php/default.php
index 80c8070b2..3573bf829 100644
--- a/view/php/default.php
+++ b/view/php/default.php
@@ -7,12 +7,12 @@
 </head>
 <body>
 	<?php if(x($page,'nav')) echo $page['nav']; ?>
-	<aside><?php if(x($page,'aside')) echo $page['aside']; ?></aside>
-	<section><?php if(x($page,'content')) echo $page['content']; ?>
+	<aside id="region_1"><?php if(x($page,'aside')) echo $page['aside']; ?></aside>
+	<section id="region_2"><?php if(x($page,'content')) echo $page['content']; ?>
 		<div id="page-footer"></div>
-		<div id="pause"></div>
-	</section>
-	<right_aside><?php if(x($page,'right_aside')) echo $page['right_aside']; ?></right_aside>
+		<div id="pause"></div>
+	</section>
+	<aside id="region_3"><?php if(x($page,'right_aside')) echo $page['right_aside']; ?></aside>
 	<footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer>
 </body>
 </html>
diff --git a/view/php/mod_new_channel.php b/view/php/mod_new_channel.php
deleted file mode 100644
index e7709cbd8..000000000
--- a/view/php/mod_new_channel.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-
-$a->page['template'] = 'full';
diff --git a/view/php/mod_register.php b/view/php/mod_register.php
deleted file mode 100644
index e7709cbd8..000000000
--- a/view/php/mod_register.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-
-$a->page['template'] = 'full';
diff --git a/view/php/none.php b/view/php/none.php
new file mode 100644
index 000000000..51d0e83dc
--- /dev/null
+++ b/view/php/none.php
@@ -0,0 +1 @@
+<?php if(x($page,'content')) echo $page['content']; ?>
diff --git a/view/php/theme_init.php b/view/php/theme_init.php
index 68d6e4cd1..a8edb0673 100644
--- a/view/php/theme_init.php
+++ b/view/php/theme_init.php
@@ -1,26 +1,61 @@
 <?php
 
-
 require_once('include/plugin.php');
 
-
+head_add_css('library/bootstrap/css/bootstrap-theme.min.css');
+head_add_css('library/bootstrap/css/bootstrap.min.css'); 
 head_add_css('library/fancybox/jquery.fancybox-1.3.4.css');
 head_add_css('library/tiptip/tipTip.css');
 head_add_css('library/jgrowl/jquery.jgrowl.css');
-head_add_css('library/jslider/bin/jquery.slider.min.css');
+head_add_css('library/jslider/css/jslider.css');
+head_add_css('library/prettyphoto/css/prettyPhoto.css');
+head_add_css('library/colorbox/colorbox.css');
+
+// head_add_css('library/font_awesome/css/font-awesome.min.css');
+head_add_css('view/css/conversation.css');
+head_add_css('view/css/bootstrap-red.css');
+head_add_css('view/css/widgets.css');
+head_add_css('library/bootstrap-datetimepicker/css/bootstrap-datetimepicker.min.css');
 
-head_add_js('js/jquery.js');
-head_add_js('js/jquery.textinputs.js');
-head_add_js('js/fk.autocomplete.js');
-head_add_js('library/fancybox/jquery.fancybox-1.3.4.pack.js');
+head_add_js('jquery.js');
+head_add_js('library/bootstrap/js/bootstrap.min.js');
+head_add_js('library/bootstrap/js/bootbox.min.js');
+head_add_js('jquery-migrate-1.1.1.js');
+//head_add_js('jquery-compat.js');
+head_add_js('spin.js');
+head_add_js('jquery.spin.js');
+head_add_js('jquery.textinputs.js');
+head_add_js('autocomplete.js');
+head_add_js('library/fancybox/jquery.fancybox-1.3.4.js');
 head_add_js('library/jquery.timeago.js');
 head_add_js('library/jquery.divgrow/jquery.divgrow-1.3.1.js');
 head_add_js('library/jquery_ac/friendica.complete.js');
 head_add_js('library/tiptip/jquery.tipTip.minified.js');
 head_add_js('library/jgrowl/jquery.jgrowl_minimized.js');
-head_add_js('library/tinymce/jscripts/tiny_mce/tiny_mce_src.js');
-head_add_js('js/acl.js');
-head_add_js('js/webtoolkit.base64.js');
-head_add_js('js/main.js');
+head_add_js('library/tinymce/jscripts/tiny_mce/tiny_mce.js');
+head_add_js('library/cryptojs/components/core-min.js');
+head_add_js('library/cryptojs/rollups/aes.js');
+head_add_js('library/cryptojs/rollups/rabbit.js');
+head_add_js('library/cryptojs/rollups/tripledes.js');
+head_add_js('acl.js');
+head_add_js('webtoolkit.base64.js');
+head_add_js('main.js');
+head_add_js('crypto.js');
 head_add_js('library/jslider/bin/jquery.slider.min.js');
 head_add_js('docready.js');
+head_add_js('library/prettyphoto/js/jquery.prettyPhoto.js');
+head_add_js('library/colorbox/jquery.colorbox-min.js');
+head_add_js('library/bootstrap-datetimepicker/js/moment.js');
+head_add_js('library/bootstrap-datetimepicker/js/bootstrap-datetimepicker.min.js');
+/**
+ * Those who require this feature will know what to do with it.
+ * Those who don't, won't.
+ * Eventually this functionality needs to be provided by a module
+ * such that permissions can be enforced. At the moment it's 
+ * more of a proof of concept; but sufficient for our immediate needs.  
+ */
+
+$channel = get_app()->get_channel();
+if($channel && file_exists($channel['channel_address'] . '.js'))
+	head_add_js('/' . $channel['channel_address'] . '.js');
+