diff --git a/public/include/smarty_globals.inc.php b/public/include/smarty_globals.inc.php
index a3e16419..3befa0e5 100644
--- a/public/include/smarty_globals.inc.php
+++ b/public/include/smarty_globals.inc.php
@@ -182,6 +182,10 @@ if ($setting->getValue('maintenance'))
 if ($motd = $setting->getValue('system_motd'))
   $_SESSION['POPUP'][] = array('CONTENT' => $motd, 'DISMISS' => 'yes', 'ID' => 'motd', 'TYPE' => 'alert alert-info');
 
+// check for deprecated theme
+if ($setting->getValue('website_theme') == "mpos")
+  $_SESSION['POPUP'][] = array('CONTENT' => 'You are using an old Theme that will not be maintained in the future.', 'TYPE' => 'alert alert-warning');
+
 // So we can display additional info
 $smarty->assign('DEBUG', $config['DEBUG']);
 
diff --git a/public/site_assets/bootstrap/images/bubble.jpg b/public/site_assets/bootstrap/images/bubble.jpg
new file mode 100644
index 00000000..804fbc98
Binary files /dev/null and b/public/site_assets/bootstrap/images/bubble.jpg differ
diff --git a/public/site_assets/bootstrap/images/bullet.gif b/public/site_assets/bootstrap/images/bullet.gif
new file mode 100644
index 00000000..c236abd4
Binary files /dev/null and b/public/site_assets/bootstrap/images/bullet.gif differ
diff --git a/public/site_assets/bootstrap/images/loading.gif b/public/site_assets/bootstrap/images/loading.gif
new file mode 100644
index 00000000..4c10eb53
Binary files /dev/null and b/public/site_assets/bootstrap/images/loading.gif differ
diff --git a/public/site_assets/mpos/css/layout.css b/public/site_assets/mpos/css/layout.css
index ceb6ce40..acdf7c0b 100644
--- a/public/site_assets/mpos/css/layout.css
+++ b/public/site_assets/mpos/css/layout.css
@@ -796,7 +796,7 @@ line-height: 150%;
 
 /* Alerts */
 
-#main h4.info {
+#main h4.alert-info {
 display: block;
 width: 95%;
 margin: 20px 30px 0 30px;
@@ -812,7 +812,7 @@ padding: 10px 0;
 text-indent: 40px;
 font-size: 14px;}
 
-#main h4.warning {
+#main h4.alert-warning {
 display: block;
 width: 95%;
 margin: 20px 30px 0 30px;
@@ -828,7 +828,7 @@ padding: 10px 0;
 text-indent: 40px;
 font-size: 14px;}
 
-#main h4.errormsg {
+#main h4.alert-danger {
 display: block;
 width: 95%;
 margin: 20px 30px 0 30px;
@@ -844,7 +844,7 @@ padding: 10px 0;
 text-indent: 40px;
 font-size: 14px;}
 
-#main h4.success {
+#main h4.alert-success {
 display: block;
 width: 95%;
 margin: 20px 30px 0 30px;
diff --git a/public/templates/bootstrap/home/shoutbox.tpl b/public/templates/bootstrap/home/shoutbox.tpl
new file mode 100644
index 00000000..787f4a24
--- /dev/null
+++ b/public/templates/bootstrap/home/shoutbox.tpl
@@ -0,0 +1,39 @@
+<div class="row">
+  <div class="col-lg-4">
+    <div class="panel panel-info">
+      <div class="panel-heading"><i class="fa fa-comments-o fa-fw"></i> Shoutbox
+      </div>
+      <div class="panel-body">
+        <form method="post" id="form" role="form">
+          <input type="hidden" id="nick" value="{$GLOBAL.userdata.username|escape}">
+		  <div class="form-group">
+		    <label>Message</label>
+		    <input class="form-control" id="message" type="text" MAXLENGTH="255">
+		  </div>
+		    <input class="btn btn-success" id="send" type="submit" value="Shout it!">
+		  </div>
+	    </form>
+	    <div class="row">
+	      <div class="col-lg-12">
+	        <div class="panel panel-info">
+	          <div class="panel-heading"><i class="fa fa-comments-o fa-fw"></i> Latest Messages
+	        </div>
+	        <div class="panel-body">
+	          <div class="content">
+	            <div id="loading"><img src="{$PATH}/images/loading.gif" alt="Loading..."></div>
+	            <ul>
+	            <!--
+	            {section name=shoutbox loop=$SHOUTBOX}
+	              {$SHOUTBOX[shoutbox].user}
+	            {/section}
+	            -->
+	            <ul>
+	          </div>
+	        </div>
+	      </div>
+	    </div>
+	  </div>
+	</div>
+	<script type="text/javascript" src="{$PATH}/js/shoutbox.js"></script>
+  </div>
+</div>
\ No newline at end of file
diff --git a/sql/018_shoutbox_update.sql b/sql/018_shoutbox_update.sql
new file mode 100644
index 00000000..2d2c13bf
--- /dev/null
+++ b/sql/018_shoutbox_update.sql
@@ -0,0 +1,7 @@
+CREATE TABLE IF NOT EXISTS `shoutbox` (
+  `id` int(5) NOT NULL AUTO_INCREMENT,
+  `date` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `user` varchar(25) NOT NULL DEFAULT 'anonymous',
+  `message` varchar(255) NOT NULL DEFAULT '',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB  DEFAULT CHARSET=latin1 AUTO_INCREMENT=3 ;
\ No newline at end of file