diff --git a/.gitignore b/.gitignore
index 88e88391..2c433d6e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 /vendor/*
 /storage/*
 composer.lock
-.htaccess
\ No newline at end of file
+.htaccess
+favicon.ico
diff --git a/README.md b/README.md
index 82ff893f..d751f4ba 100644
--- a/README.md
+++ b/README.md
@@ -1,55 +1,8 @@
 # php-proxy-app
-Web Proxy Application built on [**php-proxy library**](https://github.com/Athlon1600/php-proxy) ready to be installed on your server
+Web Proxy Application built on [**php-proxy library**](https://github.com/Athlon1600/php-proxy) ready to be installed on your server. This is my personal fork of this project. The original can be found [here](https://github.com/Athlon1600/php-proxy-app).
 
-![alt text](http://i.imgur.com/KrtU5KE.png?1 "This is how PHP-Proxy looks when installed")
+# Installation
+Using this project is simple. Simply clone the repository in to your web root folder on your server, enable SSL (I use [Certbot](https://certbot.eff.org/)) and you're ready to go. If I was you I would change the page name, title and notice before making your version live.
 
-## To Do List
-
-As of **March 25**, 2018:
-
-* Plugin for facebook.com  
-* Plugin for dailymotion.com
-* Better support/documentation for Plugin Development
-* Better Javascript support
-
-## Web-Proxy vs Proxy Server
-
-Keep in mind that sites/pages that are too script-heavy or with too many "dynamic parts", may not work with this proxy script.
-That is a known limitation of web proxies. For such sites, you should use an actual proxy server to route your browser's HTTP requests through:  
-
-https://www.proxynova.com/proxy-software/
-
-
-## Installation
-
-Keep in mind that this is a **project** and not a library. Installing this via *require* would do you not good.
-A project such as this, should be installed straight into the public directory of your web server.
-
-```bash
-composer create-project athlon1600/php-proxy-app:dev-master /var/www/
-```
-
-If you do not have composer or trying to host this application on a **shared hosting**, then download a pre-installed version of this app as a ZIP archive from [**www.php-proxy.com**](https://www.php-proxy.com/).
-
-**Direct Link:**  
-https://www.php-proxy.com/download/php-proxy.zip
-
-## Keep it up-to-date
-
-Application itself rarely will change, vast majority of changes will be done to its requirement packages like php-proxy. Simply call this command once in a while to make sure your proxy is always using the latest versions.
-
-```
-composer update
-```
-
-#### config.php
-
-This file will be loaded into the global Config class.
-
-#### /templates/
-
-This should have been named "views", but for historic purposes we keep it named as templates for now.
-
-#### /plugins/
-
-PHP-Proxy provides many of its own native plugins, but users are free to write their own custom plugins, which could then be automatically loaded from this very folder. See /plugins/TestPlugin.php for an example.
+# Issues
+If there is an issue with the design of the proxy, make an issue here. If there is an issue with the proxy itself, head on over to Athlon1600's repo. This fork is (mostly) just a reskin.
diff --git a/config.php b/config.php
index 018e9bc2..21d37d55 100644
--- a/config.php
+++ b/config.php
@@ -1,55 +1,29 @@
-<?php
-
-// all possible options will be stored
-$config = array();
-
-// a unique key that identifies this application - DO NOT LEAVE THIS EMPTY!
-$config['app_key'] = '';
-
-// a secret key to be used during encryption
-$config['encryption_key'] = '';
-
-/*
-how unique is each URL that is generated by this proxy app?
-0 - no encoding of any sort. People can link to proxy pages directly: ?q=http://www.yahoo.com
-1 - Base64 encoding only, people can hotlink to your proxy
-2 - unique to the IP address that generated it. A person that generated that URL, can bookmark it and visit it and any point
-3 - unique to that session and IP address - URL no longer valid anywhere when that browser session that generated it ends
-*/
-
-$config['url_mode'] = 2;
-
-// plugins to load - plugins will be loaded in this exact order as in array
-$config['plugins'] = array(
-	'HeaderRewrite',
-	'Stream',
-	// ^^ do not disable any of the plugins above
-	'Cookie',
-	'Proxify',
-	'UrlForm',
-	// site specific plugins below
-	'Youtube',
-	'DailyMotion',
-	'RedTube',
-	'XHamster',
-	'XVideos',
-	'Twitter'
-);
-
-// additional curl options to go with each request
-$config['curl'] = array(
-	// CURLOPT_PROXY => '',
-	// CURLOPT_CONNECTTIMEOUT => 5
-);
-
-//$config['replace_title'] = 'Google Search';
-
-//$config['error_redirect'] = "https://unblockvideos.com/#error={error_msg}";
-//$config['index_redirect'] = 'https://unblockvideos.com/';
-
-// $config['replace_icon'] = 'icon_url';
-
-// this better be here other Config::load fails
-return $config;
-
-?>
\ No newline at end of file
+<?php
+
+$config = array();
+
+$config['app_key'] = '4d31697d9779a5c8cb2a552617a6b5d8';
+
+$config['encryption_key'] = '3V4z5nCXRFO5svJti1p2QZvK1RoPFERyKSqZafqDw6k';
+
+$config['url_mode'] = 3;
+
+// plugins to load - plugins will be loaded in this exact order as in array
+$config['plugins'] = array(
+	'HeaderRewrite',
+	'Stream',
+	// ^^ do not disable any of the plugins above
+	'Cookie',
+	'Proxify',
+	'UrlForm',
+	// site specific plugins below
+	'Youtube',
+	'Twitter'
+);
+$config['curl'] = array(
+	//
+);
+
+return $config;
+
+?>
diff --git a/index.php b/index.php
index 85b53871..81cfa63b 100644
--- a/index.php
+++ b/index.php
@@ -1,130 +1,117 @@
-<?php
-
-define('PROXY_START', microtime(true));
-
-require("vendor/autoload.php");
-
-use Proxy\Http\Request;
-use Proxy\Http\Response;
-use Proxy\Plugin\AbstractPlugin;
-use Proxy\Event\FilterEvent;
-use Proxy\Config;
-use Proxy\Proxy;
-
-// start the session
-session_start();
-
-// load config...
-Config::load('./config.php');
-
-// custom config file to be written to by a bash script or something
-Config::load('./custom_config.php');
-
-if(!Config::get('app_key')){
-	die("app_key inside config.php cannot be empty!");
-}
-
-if(!function_exists('curl_version')){
-	die("cURL extension is not loaded!");
-}
-
-// how are our URLs be generated from this point? this must be set here so the proxify_url function below can make use of it
-if(Config::get('url_mode') == 2){
-	Config::set('encryption_key', md5(Config::get('app_key').$_SERVER['REMOTE_ADDR']));
-} else if(Config::get('url_mode') == 3){
-	Config::set('encryption_key', md5(Config::get('app_key').session_id()));
-}
-
-// very important!!! otherwise requests are queued while waiting for session file to be unlocked
-session_write_close();
-
-// form submit in progress...
-if(isset($_POST['url'])){
-	
-	$url = $_POST['url'];
-	$url = add_http($url);
-	
-	header("HTTP/1.1 302 Found");
-	header('Location: '.proxify_url($url));
-	exit;
-	
-} else if(!isset($_GET['q'])){
-
-	// must be at homepage - should we redirect somewhere else?
-	if(Config::get('index_redirect')){
-		
-		// redirect to...
-		header("HTTP/1.1 302 Found"); 
-		header("Location: ".Config::get('index_redirect'));
-		
-	} else {
-		echo render_template("./templates/main.php", array('version' => Proxy::VERSION));
-	}
-
-	exit;
-}
-
-// decode q parameter to get the real URL
-$url = url_decrypt($_GET['q']);
-
-$proxy = new Proxy();
-
-// load plugins
-foreach(Config::get('plugins', array()) as $plugin){
-
-	$plugin_class = $plugin.'Plugin';
-	
-	if(file_exists('./plugins/'.$plugin_class.'.php')){
-	
-		// use user plugin from /plugins/
-		require_once('./plugins/'.$plugin_class.'.php');
-		
-	} else if(class_exists('\\Proxy\\Plugin\\'.$plugin_class)){
-	
-		// does the native plugin from php-proxy package with such name exist?
-		$plugin_class = '\\Proxy\\Plugin\\'.$plugin_class;
-	}
-	
-	// otherwise plugin_class better be loaded already through composer.json and match namespace exactly \\Vendor\\Plugin\\SuperPlugin
-	$proxy->getEventDispatcher()->addSubscriber(new $plugin_class());
-}
-
-try {
-
-	// request sent to index.php
-	$request = Request::createFromGlobals();
-	
-	// remove all GET parameters such as ?q=
-	$request->get->clear();
-	
-	// forward it to some other URL
-	$response = $proxy->forward($request, $url);
-	
-	// if that was a streaming response, then everything was already sent and script will be killed before it even reaches this line
-	$response->send();
-	
-} catch (Exception $ex){
-
-	// if the site is on server2.proxy.com then you may wish to redirect it back to proxy.com
-	if(Config::get("error_redirect")){
-	
-		$url = render_string(Config::get("error_redirect"), array(
-			'error_msg' => rawurlencode($ex->getMessage())
-		));
-		
-		// Cannot modify header information - headers already sent
-		header("HTTP/1.1 302 Found");
-		header("Location: {$url}");
-		
-	} else {
-	
-		echo render_template("./templates/main.php", array(
-			'url' => $url,
-			'error_msg' => $ex->getMessage(),
-			'version' => Proxy::VERSION
-		));
-		
-	}
-}
-
-?>
\ No newline at end of file
+<?php
+define('PROXY_START', microtime(true));
+require("vendor/autoload.php");
+use Proxy\Http\Request;
+use Proxy\Http\Response;
+use Proxy\Plugin\AbstractPlugin;
+use Proxy\Event\FilterEvent;
+use Proxy\Config;
+use Proxy\Proxy;
+use Proxy\plugin\YoutubePlugin;
+// start the session
+session_start();
+// load config...
+Config::load('./config.php');
+// custom config file to be written to by a bash script or something
+Config::load('./custom_config.php');
+if(!Config::get('app_key')){
+	die("app_key inside config.php cannot be empty!");
+}
+if(!function_exists('curl_version')){
+	die("cURL extension is not loaded!");
+}
+// how are our URLs be generated from this point? this must be set here so the proxify_url function below can make use of it
+if(Config::get('url_mode') == 2){
+	Config::set('encryption_key', md5(Config::get('app_key').$_SERVER['REMOTE_ADDR']));
+} else if(Config::get('url_mode') == 3){
+	Config::set('encryption_key', md5(Config::get('app_key').session_id()));
+}
+// very important!!! otherwise requests are queued while waiting for session file to be unlocked
+session_write_close();
+// form submit in progress...
+if(isset($_POST['url'])){
+	
+	$url = $_POST['url'];
+	if (strpos ($url, '.') !== false){
+		$url = add_http($url);
+		header("HTTP/1.1 302 Found");
+		header('Location: '.proxify_url($url));
+		exit;
+	}
+	else {
+		$url = 'https://www.google.com/search?q=' . urlencode($url);
+		$url = add_http($url);
+		header("HTTP/1.1 302 Found");
+		header('Location: '.proxify_url($url));
+		exit;
+	}
+} else if(!isset($_GET['q'])){
+	// must be at homepage - should we redirect somewhere else?
+	if(Config::get('index_redirect')){
+		
+		// redirect to...
+		header("HTTP/1.1 302 Found"); 
+		header("Location: ".Config::get('index_redirect'));
+		
+	} else {
+		echo render_template("./templates/main.php", array('version' => Proxy::VERSION));
+	}
+	exit;
+}
+// decode q parameter to get the real URL
+$url = url_decrypt($_GET['q']);
+$proxy = new Proxy();
+// load plugins
+foreach(Config::get('plugins', array()) as $plugin){
+	$plugin_class = $plugin.'Plugin';
+	
+	if(file_exists('./plugins/'.$plugin_class.'.php')){
+	
+		// use user plugin from /plugins/
+		require_once('./plugins/'.$plugin_class.'.php');
+		
+	} else if(class_exists('\\Proxy\\Plugin\\'.$plugin_class)){
+	
+		// does the native plugin from php-proxy package with such name exist?
+		$plugin_class = '\\Proxy\\Plugin\\'.$plugin_class;
+	}
+	
+	// otherwise plugin_class better be loaded already through composer.json and match namespace exactly \\Vendor\\Plugin\\SuperPlugin
+	$proxy->getEventDispatcher()->addSubscriber(new $plugin_class());
+}
+try {
+	// request sent to index.php
+	$request = Request::createFromGlobals();
+	
+	// remove all GET parameters such as ?q=
+	$request->get->clear();
+	
+	// forward it to some other URL
+	$response = $proxy->forward($request, $url);
+	
+	// if that was a streaming response, then everything was already sent and script will be killed before it even reaches this line
+	$response->send();
+	
+} catch (Exception $ex){
+	// if the site is on server2.proxy.com then you may wish to redirect it back to proxy.com
+	if(Config::get("error_redirect")){
+	
+		$url = render_string(Config::get("error_redirect"), array(
+			'error_msg' => rawurlencode($ex->getMessage())
+		));
+		
+		// Cannot modify header information - headers already sent
+		header("HTTP/1.1 302 Found");
+		header("Location: {$url}");
+		
+	} else {
+	
+		echo render_template("./templates/main.php", array(
+			'url' => $url,
+			'error_msg' => $ex->getMessage(),
+			'version' => Proxy::VERSION
+		));
+		
+	}
+}
+?>
diff --git a/setup.php b/setup.php
new file mode 100644
index 00000000..107e25ed
--- /dev/null
+++ b/setup.php
@@ -0,0 +1,34 @@
+<?php
+
+function generate_random_key(){
+
+	if(function_exists('openssl_random_pseudo_bytes')){
+		$random = openssl_random_pseudo_bytes(100);
+	} else {
+		$random = rand().microtime().rand();
+	}
+	
+	return md5($random);
+}
+
+$path_config = './config.php';
+
+// config.php won't be writable if ran from within web server
+if(!is_writable($path_config)){
+	exit;
+}
+
+$key = generate_random_key();
+
+// open config.php
+$config = file_get_contents($path_config);
+
+// replace blank app_key with new generated key
+$config = str_replace('$config[\'app_key\'] = \'\';', '$config[\'app_key\'] = \''.$key.'\';', $config);
+
+// write to config.php
+file_put_contents($path_config, $config);
+
+echo "New Key: {$key}\r\n";
+
+?>
\ No newline at end of file
diff --git a/templates/url_form.php b/templates/url_form.php
index 11bb6617..ee119daf 100644
--- a/templates/url_form.php
+++ b/templates/url_form.php
@@ -10,6 +10,7 @@
 	top:0;
 	left:0;
 	width: 100%;
+	transition: top 0.3s;
 	
 	margin:0;
 	
@@ -72,6 +73,20 @@ function smart_select(ele){
 	
 </div>
 
+// This part makes the top bar disappear when the user scrolls down the page. It shows again when they scroll up.
+<script>
+	var prevScrollpos = window.pageYOffset;
+	window.onscroll = function() {
+	var currentScrollPos = window.pageYOffset;
+  	if (prevScrollpos > currentScrollPos) {
+   	 	document.getElementById("top_form").style.top = "0";
+  	} else {
+   	 	document.getElementById("top_form").style.top = "-50px";
+  	}
+ 	 prevScrollpos = currentScrollPos;
+}
+</script>
+
 <script type="text/javascript">
 	smart_select(document.getElementsByName("url")[0]);
 </script>