diff --git a/credits.php b/credits.php
new file mode 100644
index 000000000..e1e412546
--- /dev/null
+++ b/credits.php
@@ -0,0 +1,60 @@
+<?php
+
+if (!defined('e107_INIT'))
+{
+	require_once("class2.php");
+	define('e_IFRAME', true);
+
+	$css = "body 				{ background-color: rgb(55, 55, 55); padding:50px; color: white; text-align: left; font-size:16px; line-height:1.5em; font-weight:normal; font-family:Arial, Helvetica, sans-serif; }
+			p 					{ margin:0px 5px 10px 5px; }
+			a					{ color:#F6931E; text-decoration:none; }
+			a:hover				{ color:#fdce8a; text-decoration:none; }
+			.bold				{ font-weight:bold; }
+			.center				{ text-align:center; }
+			.wrapper			{ width:600px;  margin:0px auto 0px 0px; margin-left: auto; margin-right: auto; padding-bottom:10px;  }
+			.wrapper-middle		{ min-height:389px;  }
+			.logo				{ margin-bottom:20px }
+			.credits-content	{ padding:20px 40px;}
+        	.copyright			{ margin-top:30px}
+        	.well               { min-height: 20px; padding: 19px; border: 1px solid #0f0f0f; border-radius: 6px; -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.05);
+								  box-shadow: inset 0 1px 1px rgba(0,0,0,.05); color: #eee; background-color: #222; 
+	}  
+      ";
+
+	e107::css('inline',$css);
+	require_once(HEADERF);
+}
+
+
+ $text ='<div class="wrapper">
+        	<div class="wrapper-middle">
+                <div class="well credits-content">
+                	<img class="logo" src="'.e_IMAGE_ABS.'admin_images/credits_logo.png" alt="e107 Logo" />
+                	<div class="wrapper-text">
+	                    <h4 class="text-info">Developers</h4>
+	                    <p>
+	                        <a target="_blank" title="View Github profile" href="https://github.com/CaMer0n">CaMer0n</a>, <a target="_blank" title="View Github profile"  href="https://github.com/Moc">Moc</a>, <a target="_blank" title="View Github profile" href="https://github.com/Deltik">Deltik</a>.<br />
+	                        A complete list of the past and present contributors <a target="_blank" title="View all contributors on Github" href="https://github.com/e107inc/e107/graphs/contributors">can be found here</a>. 
+	                    </p>
+				
+	                     <h4 class="text-info">Third Party Code</h4>
+	                    <p>
+	                        jQuery, Twitter Bootstrap, FontAwesome, HybridAuth, PhpMailer, Intervention, Minify, MagpieRSS, PCLZip, PCLTar, TinyMCE, Nuvolo Icons, TCPDF, PHP UTF8
+	                    </p>
+                   		<h4 class="text-info">Sponsors</h4>
+	                    <p>
+	                        <a target="_blank" href="https://www.jetbrains.com/?from=e107" title="Visit JetBrains">JetBrains</a>, <a target="_blank" href="https://stemaidinstitute.com" title="Visit Stemaid Institute">Stemaid</a>.<br />
+	                    </p>
+                    	<div class="copyright">Copyright <a target="_blank" href="https://e107.org/community" title="e107 Team">e107.org</a> 2008-'.date('Y').'.<br />Released under the terms of the GNU GPL License.</div>
+               		 </div>
+			    </div>
+            </div>
+        	
+		</div>';
+
+e107::getRender()->tablerender("", $text);
+
+if(deftrue('e_IFRAME'))
+{
+	require_once(FOOTERF);
+}
diff --git a/e107_admin/credits.php b/e107_admin/credits.php
index 9d342dfef..54d09070b 100644
--- a/e107_admin/credits.php
+++ b/e107_admin/credits.php
@@ -16,7 +16,7 @@ $css = "body 				{ text-align: left; font-size:13px; line-height:1.5em; font-wei
 			p 					{ margin:0px 5px 10px 5px; }
 		
 			a					{ color:#F6931E; text-decoration:none; }
-			a:hover				{ color:#134B63; text-decoration:none; }
+			a:hover				{ color:#fdce8a; text-decoration:none; }
 			.bold				{ font-weight:bold; }
 			.center				{ text-align:center; }
 			.wrapper			{ width:600px;  margin:0px auto 0px 0px; padding-bottom:10px;  }
@@ -32,31 +32,6 @@ e107::css('inline',$css);
 
 require_once(e_ADMIN."auth.php");
 
-
- $text .='<div class="wrapper">
-        	<div class="wrapper-middle">
-                <div class="well credits-content">
-                	<img class="logo" src="'.e_IMAGE_ABS.'admin_images/credits_logo.png" alt="e107 Logo" />
-                	<div class="wrapper-text">
-	                    <h4 class="text-info">Developers</h4>
-	                    <p>
-	                        Senior Developers: Cameron Hanly, Miroslav Yovchev, Steven Davies <br />
-	                        Junior Developers: Tijn Kuyper, Henk Jongedijk <br />
-	                        Early Developers: Thom Michelbrink, James Currie, Martin Nicholls 
-	                    </p>
-	                     <h4 class="text-info">3rd Party</h4>
-	                    <p>
-	                        Twitter Bootstrap, MagpieRSS, PCLZip, PCLTar, TinyMCE,<br />
-	                        Nuvolo Icons, PHPMailer, TCPDF, PHP UTF8
-	                    </p>
-                   
-                    	<div class="copyright">Copyright <a target="_blank" href="https://e107.org/community" title="e107 Team">e107 Inc.</a> 2008-'.date('Y').'</div>
-               		 </div>
-			    </div>
-            </div>
-        	
-		</div>';
-
-$ns->tablerender("",$text);
+require_once(__DIR__."/../credits.php");
 
 require_once(e_ADMIN."footer.php");
diff --git a/e107_plugins/siteinfo/e_shortcode.php b/e107_plugins/siteinfo/e_shortcode.php
index 6f1fac023..90b9bf9d0 100644
--- a/e107_plugins/siteinfo/e_shortcode.php
+++ b/e107_plugins/siteinfo/e_shortcode.php
@@ -51,7 +51,7 @@ class siteinfo_shortcodes // must match the folder name of the plugin.
 	 */
 	function sc_sitedisclaimer()
 	{
-		$default = "Proudly powered by <a href='https://e107.org'>e107</a> which is released under the terms of the GNU GPL License.";
+		$default = "Proudly powered by <a href='https://e107.org'>e107</a> which is <a href='".e_HTTP."credits.php'>released</a> under the terms of the GNU GPL License.";
 
 		$text = deftrue('SITEDISCLAIMER',$default);