diff --git a/composer.json b/composer.json
index 8d8f0da..13021fa 100755
--- a/composer.json
+++ b/composer.json
@@ -1,30 +1,35 @@
 {
-	"name": "phpbbmodders/holidayflare",
-	"type": "phpbb-extension",
-	"description": "Allows an admin to display various seasonal holiday flares to their default style. The images/javascript can be enable/disabled in the ACP via EXTENSIONS --> Holiday Flare --> Settings",
-	"version": "2.0.0",
-	"license": "GPL-2.0",
-	"authors": [
-		{
-			"name": "William (bonelifer)",
-			"role": "Developer"
-		},
-		{
-			"name": "Matt (VSE)",
-			"role": "Extension conversion"
-		}
-	],
-	"require": {
-		"php": ">=5.3.3",
-		"composer/installers": "~1.0"
-	},
-   "require-dev": {
-      "phpbb/epv": "dev-master"
-   },
-	"extra": {
-		"display-name": "Holiday Flare",
-		"soft-require": {
-			"phpbb/phpbb": ">=3.1.0-RC3,<3.2.*@dev"
-		}
-	}
-}
+    "name": "phpbbmodders/holidayflare",
+    "type": "phpbb-extension",
+    "description": "Allows an admin to display various seasonal holiday flares to their default style. The images/javascript can be enable/disabled in the ACP via EXTENSIONS --> Holiday Flare --> Settings",
+    "version": "2.0.1",
+    "license": "GPL-2.0",
+    "authors": [
+        {
+            "name": "William (bonelifer)",
+            "role": "Developer"
+        },
+        {
+            "name": "Matt (VSE)",
+            "role": "Extension conversion"
+        }
+    ],
+    "require": {
+        "php": ">=5.3.3",
+        "composer/installers": "~1.0"
+    },
+    "require-dev": {
+        "phpbb/epv": "dev-master"
+    },
+    "extra": {
+        "display-name": "Holiday Flare",
+        "soft-require": {
+            "phpbb/phpbb": ">=3.1.0-RC3,<3.3.*@dev"
+        },
+        "version-check": {
+            "host": "www.phpbb.com",
+            "directory": "/customise/db/extension/holiday_flare",
+            "filename": "version_check"
+        }
+    }
+}
\ No newline at end of file
diff --git a/config/services.yml b/config/services.yml
index fbfbf9f..6d153dc 100644
--- a/config/services.yml
+++ b/config/services.yml
@@ -2,7 +2,10 @@ services:
     phpbbmodders.holidayflare.listener:
         class: phpbbmodders\holidayflare\event\listener
         arguments:
-            - @config
-            - @template
+            - '@config'
+            - '@template'
         tags:
             - { name: event.listener }
+
+    _defaults:
+        public: true
diff --git a/styles/Green-Style-Slim/template/event/overall_footer_after.html b/styles/Green-Style-Slim/template/event/overall_footer_after.html
new file mode 100644
index 0000000..54b211d
--- /dev/null
+++ b/styles/Green-Style-Slim/template/event/overall_footer_after.html
@@ -0,0 +1,7 @@
+<!-- IF S_ENABLE_HOHOHATCORNER -->
+<script type="text/javascript">
+(function($) {
+	$('<div class="forum-xmas"></div>').insertBefore(".forabg, .forumbg");
+})(jQuery);
+</script>
+<!-- ENDIF -->
\ No newline at end of file
diff --git a/styles/Green-Style-Slim/template/event/overall_header_head_append.html b/styles/Green-Style-Slim/template/event/overall_header_head_append.html
new file mode 100644
index 0000000..85ce3ac
--- /dev/null
+++ b/styles/Green-Style-Slim/template/event/overall_header_head_append.html
@@ -0,0 +1,3 @@
+<!-- IF S_ENABLE_HOHOHATCORNER -->
+	<!-- INCLUDECSS @phpbbmodders_holidayflare/../theme/hohohatcorner.css -->
+<!-- ENDIF -->
diff --git a/styles/pro_ubuntu_lucid/template/event/overall_footer_after.html b/styles/pro_ubuntu_lucid/template/event/overall_footer_after.html
new file mode 100644
index 0000000..54b211d
--- /dev/null
+++ b/styles/pro_ubuntu_lucid/template/event/overall_footer_after.html
@@ -0,0 +1,7 @@
+<!-- IF S_ENABLE_HOHOHATCORNER -->
+<script type="text/javascript">
+(function($) {
+	$('<div class="forum-xmas"></div>').insertBefore(".forabg, .forumbg");
+})(jQuery);
+</script>
+<!-- ENDIF -->
\ No newline at end of file
diff --git a/styles/pro_ubuntu_lucid/template/event/overall_header_head_append.html b/styles/pro_ubuntu_lucid/template/event/overall_header_head_append.html
new file mode 100644
index 0000000..85ce3ac
--- /dev/null
+++ b/styles/pro_ubuntu_lucid/template/event/overall_header_head_append.html
@@ -0,0 +1,3 @@
+<!-- IF S_ENABLE_HOHOHATCORNER -->
+	<!-- INCLUDECSS @phpbbmodders_holidayflare/../theme/hohohatcorner.css -->
+<!-- ENDIF -->
diff --git a/styles/proflat/template/event/overall_footer_after.html b/styles/proflat/template/event/overall_footer_after.html
new file mode 100644
index 0000000..54b211d
--- /dev/null
+++ b/styles/proflat/template/event/overall_footer_after.html
@@ -0,0 +1,7 @@
+<!-- IF S_ENABLE_HOHOHATCORNER -->
+<script type="text/javascript">
+(function($) {
+	$('<div class="forum-xmas"></div>').insertBefore(".forabg, .forumbg");
+})(jQuery);
+</script>
+<!-- ENDIF -->
\ No newline at end of file
diff --git a/styles/proflat/template/event/overall_header_head_append.html b/styles/proflat/template/event/overall_header_head_append.html
new file mode 100644
index 0000000..85ce3ac
--- /dev/null
+++ b/styles/proflat/template/event/overall_header_head_append.html
@@ -0,0 +1,3 @@
+<!-- IF S_ENABLE_HOHOHATCORNER -->
+	<!-- INCLUDECSS @phpbbmodders_holidayflare/../theme/hohohatcorner.css -->
+<!-- ENDIF -->
diff --git a/styles/prosilver/template/event/overall_footer_after.html b/styles/prosilver/template/event/overall_footer_after.html
new file mode 100644
index 0000000..b3a45ca
--- /dev/null
+++ b/styles/prosilver/template/event/overall_footer_after.html
@@ -0,0 +1,8 @@
+<!-- IF S_ENABLE_HOHOHATCORNER -->
+<script type="text/javascript">
+(function($) {
+	$('<div id="banner-xmas"></div>').insertBefore("#page-header");
+	$('<div class="forum-xmas"></div>').insertBefore(".forabg, .forumbg");
+})(jQuery);
+</script>
+<!-- ENDIF -->
\ No newline at end of file
diff --git a/styles/prosilver/template/event/overall_header_page_body_before.html b/styles/prosilver/template/event/overall_header_page_body_before.html
deleted file mode 100644
index dc8e68d..0000000
--- a/styles/prosilver/template/event/overall_header_page_body_before.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<!-- IF S_ENABLE_HOHOHATCORNER -->
-	<div id="banner-xmas"></div>
-<!-- ENDIF -->
diff --git a/styles/prosilver/theme/hohohatcorner.css b/styles/prosilver/theme/hohohatcorner.css
index 08eb51f..9f23a05 100644
--- a/styles/prosilver/theme/hohohatcorner.css
+++ b/styles/prosilver/theme/hohohatcorner.css
@@ -2,22 +2,39 @@
 	float: left;
 	height: 96px;
 	width: 96px;
-	margin: -159px 0 0 -36px;
-    position: relative;
-	z-index: 900;
+	margin-top: -8px;
+	margin-left: -35px;
+    position: absolute;
+	z-index: 1;
 	background: transparent url(images/hohohat.png) 0 0 no-repeat; /* http://artdesigner.lv/licensing | http://artdesigner.lv/silent-night-10-christmas-icons */
 	display: block;
 }
 
 .rtl #banner-xmas {
 	float: right;
-	height: 96px;
-	width: 96px;
-	margin: -159px -36px 0 0;
-	position: relative;
-	z-index: 900;
-	background: transparent url(images/hohohat.png) 0 0 no-repeat;
+	margin-right: -35px;
+	-moz-transform: scaleX(-1);
+	-o-transform: scaleX(-1);
+	-webkit-transform: scaleX(-1);
+	transform: scaleX(-1);
+	filter: FlipH;
+	-ms-filter: "FlipH";
+}
+
+.forum-xmas {
+	background: transparent url("images/hohohatmini.png") 0 0 no-repeat;
+	position: absolute;
+	height: 50px;
+	width: 50px;
+	z-index: 1;
 	display: block;
+	margin-left: -18px;
+	margin-top: -4px;	
+}
+
+.rtl .forum-xmas {
+	float: right;
+	margin-right: -18px;
 	-moz-transform: scaleX(-1);
 	-o-transform: scaleX(-1);
 	-webkit-transform: scaleX(-1);
@@ -27,5 +44,5 @@
 }
 
 @media only screen and (max-width: 700px), only screen and (max-device-width: 700px) {
-	#banner-xmas { display: none }
-}
+	#banner-xmas, .forum-xmas { display: none; }
+}
\ No newline at end of file
diff --git a/styles/prosilver/theme/images/hohohatmini.png b/styles/prosilver/theme/images/hohohatmini.png
new file mode 100644
index 0000000..fd0e2d5
Binary files /dev/null and b/styles/prosilver/theme/images/hohohatmini.png differ