diff --git a/Changelog b/Changelog
index 3e997328c..719107501 100755
--- a/Changelog
+++ b/Changelog
@@ -1,4 +1,5 @@
 2016-05-08 DariusIII
+	* Upd: Composer replace qtip2 with qtip2-main
 	* Fix: Fix missed table renames in scripts.
 	* Upd: Update nntmux_fi_schema.sql.
 2016-05-06 DariusIII
diff --git a/composer.json b/composer.json
index a4215fe9d..e2bf8949b 100755
--- a/composer.json
+++ b/composer.json
@@ -85,7 +85,7 @@
     "bower-asset/noty": "~2.3.8",
     "bower-asset/pace": "~1.0.2",
     "bower-asset/pnotify": "~3.0",
-    "bower-asset/qtip2": "~2.2.1",
+    "bower-asset/qtip2-main": "~3.0.2",
     "bower-asset/respond": "~1.4.2",
     "bower-asset/responsive-tables-js": "~1.0.6",
     "bower-asset/select2": "~4.0.2",
diff --git a/composer.lock b/composer.lock
index 12da880a7..e1905cb01 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,8 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "5a03bbb0aaebdf3ee21bad92191a5012",
-    "content-hash": "d3861f98671a69f7f1e54686955b1934",
+    "hash": "8673f797e28f190a443adc747b040a40",
+    "content-hash": "a6495a5790fde01decef45855de9affb",
     "packages": [
         {
             "name": "barracudanetworks/forkdaemon-php",
@@ -839,17 +839,17 @@
             "description": "JavaScript notification plugin."
         },
         {
-            "name": "bower-asset/qtip2",
-            "version": "v2.2.1",
+            "name": "bower-asset/qtip2-main",
+            "version": "v3.0.2",
             "source": {
                 "type": "git",
-                "url": "https://github.com/qTip2/bower.git",
-                "reference": "2f67997b5449bb4dea568e82966fb35dc11fb84e"
+                "url": "https://github.com/qTip2/qTip2.git",
+                "reference": "c25a530a431e78b3f7e7d955c953ffdca8d10b1a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/qTip2/bower/zipball/2f67997b5449bb4dea568e82966fb35dc11fb84e",
-                "reference": "2f67997b5449bb4dea568e82966fb35dc11fb84e",
+                "url": "https://api.github.com/repos/qTip2/qTip2/zipball/c25a530a431e78b3f7e7d955c953ffdca8d10b1a",
+                "reference": "c25a530a431e78b3f7e7d955c953ffdca8d10b1a",
                 "shasum": ""
             },
             "require": {
@@ -859,11 +859,8 @@
             "type": "bower-asset-library",
             "extra": {
                 "bower-asset-main": [
-                    "./jquery.qtip.js",
-                    "./basic/jquery.qtip.js"
-                ],
-                "bower-asset-ignore": [
-                    "bin"
+                    "./dist/jquery.qtip.js",
+                    "./dist/jquery.qtip.css"
                 ]
             },
             "license": [
@@ -876,6 +873,7 @@
                 "craig thompson",
                 "craigsworks",
                 "jquery",
+                "jquery-plugin",
                 "qtip",
                 "qtip2",
                 "simpletip",
diff --git a/www/themes/Charisma/templates/basepage.tpl b/www/themes/Charisma/templates/basepage.tpl
index d6260c570..6b6e2bace 100755
--- a/www/themes/Charisma/templates/basepage.tpl
+++ b/www/themes/Charisma/templates/basepage.tpl
@@ -41,6 +41,7 @@
 	<!-- Font Awesome Icons -->
 	<link href="{$smarty.const.WWW_THEMES}/shared/assets/font-awesome/css/font-awesome.min.css" rel="stylesheet"
 		  type="text/css"/>
+	<link href="{$smarty.const.WWW_THEMES}/shared/assets/qtip2-main/dist/jquery.qtip.min.css" type="text/css" media="screen"/>
 	<!-- Normalize.css -->
 	<link href="{$smarty.const.WWW_THEMES}/shared/css/normalize.css" rel="stylesheet" type="text/css">
 	<!-- The fav icon -->
@@ -247,7 +248,7 @@
 	<script type="text/javascript" src="{$smarty.const.WWW_THEMES}/{$theme}/js/functions.js"></script>
 	<!-- newznab default scripts, needed for stuff to work -->
 	<script type="text/javascript" src="{$smarty.const.WWW_THEMES}/shared/assets/autosize/dist/autosize.min.js"></script>
-	<script type="text/javascript" src="{$smarty.const.WWW_THEMES}/shared/assets/qtip2/jquery.qtip.min.js"></script>
+	<script type="text/javascript" src="{$smarty.const.WWW_THEMES}/shared/assets/qtip2-main/dist/jquery.qtip.min.js"></script>
 	<script type="text/javascript" src="{$smarty.const.WWW_THEMES}/{$theme}/scripts/sorttable.js"></script>
 	<!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
 	<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
diff --git a/www/themes/Gamma/templates/basepage.tpl b/www/themes/Gamma/templates/basepage.tpl
index 73ca15bb4..5aa5fbc90 100755
--- a/www/themes/Gamma/templates/basepage.tpl
+++ b/www/themes/Gamma/templates/basepage.tpl
@@ -25,6 +25,7 @@
 	<link href="{$smarty.const.WWW_THEMES}/{$theme}/styles/style.css" rel="stylesheet" type="text/css" media="screen" />
 	<link href="{$smarty.const.WWW_THEMES}/{$theme}/styles/bootstrap.cyborg.css" rel="stylesheet" type="text/css" media="screen" />
 	<link href="{$smarty.const.WWW_THEMES}/{$theme}/styles/bootstrap-fixes.css" rel="stylesheet" type="text/css" media="screen" />
+	<link href="{$smarty.const.WWW_THEMES}/shared/assets/qtip2-main/dist/jquery.qtip.min.css" type="text/css" media="screen"/>
 
 	<!-- FAVICON -->
 	<link rel="search" type="application/opensearchdescription+xml" href="/opensearch" title="{$site->title|escape}" />
@@ -34,7 +35,7 @@
 	<script type="text/javascript" src="{$smarty.const.WWW_THEMES}/shared/assets/jquery-2.2.x/dist/jquery.min.js"></script>
 	<script type="text/javascript" src="{$smarty.const.WWW_THEMES}/shared/assets/jquery-migrate/jquery-migrate.min.js"></script>
 	<script type="text/javascript" src="{$smarty.const.WWW_THEMES}/shared/assets/colorbox/jquery.colorbox-min.js"></script>
-	<script type="text/javascript" src="{$smarty.const.WWW_THEMES}/shared/assets/qtip2/jquery.qtip.min.js"></script>
+	<script type="text/javascript" src="{$smarty.const.WWW_THEMES}/shared/assets/qtip2-main/dist/jquery.qtip.min.js"></script>
 	<script type="text/javascript" src="{$smarty.const.WWW_THEMES}/{$theme}/scripts/utils.js"></script>
 	<script type="text/javascript" src="{$smarty.const.WWW_THEMES}/shared/assets/autosize/dist/autosize.min.js"></script>
 	<script type="text/javascript" src="{$smarty.const.WWW_THEMES}/{$theme}/scripts/sorttable.js"></script>
diff --git a/www/themes/Gentele/templates/basepage.tpl b/www/themes/Gentele/templates/basepage.tpl
index bfcde4933..e0344632a 100755
--- a/www/themes/Gentele/templates/basepage.tpl
+++ b/www/themes/Gentele/templates/basepage.tpl
@@ -34,6 +34,7 @@
 	<link href="{$smarty.const.WWW_THEMES}/shared/css/posterwall.css" rel="stylesheet" type="text/css" media="screen"/>
 	<link href="{$smarty.const.WWW_THEMES}/{$theme}/css/custom.css" rel="stylesheet">
 	<link href="{$smarty.const.WWW_THEMES}/shared/assets/icheck/skins/flat/green.css" rel="stylesheet">
+	<link href="{$smarty.const.WWW_THEMES}/shared/assets/qtip2-main/dist/jquery.qtip.min.css" type="text/css" media="screen"/>
 	<!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
 	<!--[if lt IE 9]>
 	<script src="{$smarty.const.WWW_THEMES}/shared/assets/html5shiv/dist/html5shiv.min.js"></script>
@@ -235,7 +236,7 @@
 <!-- newznab default scripts, needed for stuff to work -->
 <script type="text/javascript" src="{$smarty.const.WWW_THEMES}/shared/assets/colorbox/jquery.colorbox-min.js"></script>
 <script type="text/javascript" src="{$smarty.const.WWW_THEMES}/shared/assets/autosize/dist/autosize.min.js"></script>
-<script type="text/javascript" src="{$smarty.const.WWW_THEMES}/shared/assets/qtip2/jquery.qtip.min.js"></script>
+<script type="text/javascript" src="{$smarty.const.WWW_THEMES}/shared/assets/qtip2-main/dist/jquery.qtip.min.js"></script>
 <script type="text/javascript" src="{$smarty.const.WWW_THEMES}/{$theme}/scripts/sorttable.js"></script>
 <!-- Custom functions -->
 <script src="{$smarty.const.WWW_THEMES}/{$theme}/scripts/functions.js" type="text/javascript"></script>
diff --git a/www/themes/Omicron/templates/basepage.tpl b/www/themes/Omicron/templates/basepage.tpl
index c16cdf355..b12a833a2 100755
--- a/www/themes/Omicron/templates/basepage.tpl
+++ b/www/themes/Omicron/templates/basepage.tpl
@@ -38,6 +38,7 @@
 		  type="text/css"/>
 	<!-- Noty animation style -->
 	<link href="{$smarty.const.WWW_THEMES}/shared/assets/animate.css/animate.min.css" rel="stylesheet">
+	<link href="{$smarty.const.WWW_THEMES}/shared/assets/qtip2-main/dist/jquery.qtip.min.css" type="text/css" media="screen"/>
 	<!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
 	<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
 	<!--[if lt IE 9]>
@@ -292,7 +293,7 @@
 	<!-- newznab default scripts, needed for stuff to work -->
 	<script type="text/javascript" src="{$smarty.const.WWW_THEMES}/shared/assets/colorbox/jquery.colorbox-min.js"></script>
 	<script type="text/javascript" src="{$smarty.const.WWW_THEMES}/shared/assets/autosize/dist/autosize.min.js"></script>
-	<script type="text/javascript" src="{$smarty.const.WWW_THEMES}/shared/assets/qtip2/jquery.qtip.min.js"></script>
+	<script type="text/javascript" src="{$smarty.const.WWW_THEMES}/shared/assets/qtip2main/dist/jquery.qtip.min.js"></script>
 	<script type="text/javascript" src="{$smarty.const.WWW_THEMES}/{$theme}/scripts/sorttable.js"></script>
 	<!-- Custom functions -->
 	<script src="{$smarty.const.WWW_THEMES}/{$theme}/dist/js/functions.js" type="text/javascript"></script>