diff --git a/scripts/defaultScripts.js b/scripts/defaultScripts.js
index d9c84467a3..2d4e19f2e4 100644
--- a/scripts/defaultScripts.js
+++ b/scripts/defaultScripts.js
@@ -35,12 +35,12 @@ var DEFAULT_SCRIPTS_COMBINED = [
     "system/miniTablet.js",
     "system/audioMuteOverlay.js",
     "system/keyboardShortcuts/keyboardShortcuts.js",
-    "https://kasenvr.github.io/community-apps/more/app-more.js"
 ];
 var DEFAULT_SCRIPTS_SEPARATE = [
     "system/controllers/controllerScripts.js",
     "communityModules/notificationCore/notificationCore.js",
     "simplifiedUI/ui/simplifiedNametag/simplifiedNametag.js",
+    {"stable": "system/more/app-more.js", "beta": "https://kasenvr.github.io/community-apps/more/app-more.js"},
     {"stable": "communityModules/chat/FloofChat.js", "beta": "https://content.fluffy.ws/scripts/chat/FloofChat.js"}
     //"system/chat.js"
 ];
diff --git a/scripts/system/more/app-more.js b/scripts/system/more/app-more.js
new file mode 100644
index 0000000000..91e5508a6b
--- /dev/null
+++ b/scripts/system/more/app-more.js
@@ -0,0 +1,136 @@
+"use strict";
+
+//  app-more.js
+//  VERSION 1.0
+//
+//  Created by Keb Helion, February 2020.
+//  Copyright 2020 Project Athena and contributors.
+//
+//  This script adds a "More Apps" selector to "Project Athena" to allow the user to add optional functionalities to the tablet.
+//  This application has been designed to work directly from the Github repository.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//	
+(function() {
+	var ROOT = Script.resolvePath('').split("app-more.js")[0];
+	var APP_NAME = "MORE...";
+	var APP_URL = ROOT + "more.html";
+	var APP_ICON_INACTIVE = ROOT + "appicon_i.png";
+	var APP_ICON_ACTIVE = ROOT + "appicon_a.png";
+	var Appstatus = false;
+	var lastProcessing = {
+			"action": "",
+			"script": ""
+		};
+	
+	var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
+	tablet.screenChanged.connect(onScreenChanged);
+	var button = tablet.addButton({
+		text: APP_NAME,
+		icon: APP_ICON_INACTIVE,
+        activeIcon: APP_ICON_ACTIVE
+	});
+	
+	
+	function clicked() {
+		if (Appstatus == true) {
+			tablet.webEventReceived.disconnect(onMoreAppWebEventReceived);
+			tablet.gotoHomeScreen();
+			Appstatus = false;
+		} else {
+			tablet.gotoWebScreen(APP_URL);			
+			tablet.webEventReceived.connect(onMoreAppWebEventReceived);		
+			Appstatus = true;
+		}
+			
+		button.editProperties({
+			isActive: Appstatus
+		});
+
+	}
+	
+	button.clicked.connect(clicked);
+
+	function sendRunningScriptList() {
+		var currentlyRunningScripts = ScriptDiscoveryService.getRunning();
+		tablet.emitScriptEvent(JSON.stringify(currentlyRunningScripts));
+	}
+
+	function onMoreAppWebEventReceived(eventz) {
+        
+		if (typeof eventz === "string") {
+			eventzget = JSON.parse(eventz);
+			
+			//print("EVENT ACTION: " + eventzget.action);
+			//print("EVENT SCRIPT: " + eventzget.script);
+			
+			if (eventzget.action === "installScript") {
+				
+				if (lastProcessing.action == eventzget.action && lastProcessing.script == eventzget.script) {
+					return;
+				} else {
+					ScriptDiscoveryService.loadOneScript(eventzget.script);
+				
+					lastProcessing.action = eventzget.action;
+					lastProcessing.script = eventzget.script;
+					
+					Script.setTimeout(function() {
+						sendRunningScriptList(); 
+					}, 2000);
+				}
+			}
+
+			if (eventzget.action === "uninstallScript") {
+				
+				if (lastProcessing.action == eventzget.action && lastProcessing.script == eventzget.script) {
+					return;
+				} else {
+					ScriptDiscoveryService.stopScript(eventzget.script, false);
+					
+					lastProcessing.action = eventzget.action;
+					lastProcessing.script = eventzget.script;
+					
+					Script.setTimeout(function() {
+						sendRunningScriptList(); 
+					}, 2000);
+				}	
+			}			
+
+			if (eventzget.action === "requestRunningScriptData") {
+				sendRunningScriptList();
+			}	
+
+		}
+		
+	}
+
+
+	function onScreenChanged(type, url) {
+		if (type == "Web" && url.indexOf(APP_URL) != -1) {
+			//Active
+			//print("MORE... ACTIVE");
+			Appstatus = true;
+		} else {
+			//Inactive
+			//print("MORE... INACTIVE");
+			Appstatus = false;
+		}
+		
+		button.editProperties({
+			isActive: Appstatus
+		});
+	}
+	
+	
+	function cleanup() {
+		if (Appstatus) {
+			tablet.gotoHomeScreen();
+			tablet.webEventReceived.disconnect(onMoreAppWebEventReceived);
+		}
+		tablet.screenChanged.disconnect(onScreenChanged);
+		tablet.removeButton(button);
+	}
+	
+	Script.scriptEnding.connect(cleanup);
+}());
\ No newline at end of file
diff --git a/scripts/system/more/appicon_a.png b/scripts/system/more/appicon_a.png
new file mode 100644
index 0000000000..b62d597746
Binary files /dev/null and b/scripts/system/more/appicon_a.png differ
diff --git a/scripts/system/more/appicon_i.png b/scripts/system/more/appicon_i.png
new file mode 100644
index 0000000000..e765410b50
Binary files /dev/null and b/scripts/system/more/appicon_i.png differ
diff --git a/scripts/system/more/blank_minus-16.png b/scripts/system/more/blank_minus-16.png
new file mode 100644
index 0000000000..dfa1a82802
Binary files /dev/null and b/scripts/system/more/blank_minus-16.png differ
diff --git a/scripts/system/more/blank_plus-16.png b/scripts/system/more/blank_plus-16.png
new file mode 100644
index 0000000000..c40ab20443
Binary files /dev/null and b/scripts/system/more/blank_plus-16.png differ
diff --git a/scripts/system/more/css/styles.css b/scripts/system/more/css/styles.css
new file mode 100644
index 0000000000..54066b694b
--- /dev/null
+++ b/scripts/system/more/css/styles.css
@@ -0,0 +1,188 @@
+/*
+    styles.css
+
+    Created by Kalila L. on 23 Feb 2020.
+    Copyright 2020 Project Athena and contributors.
+    
+    Distributed under the Apache License, Version 2.0.
+    See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+*/
+
+body {
+    background: #27343B;
+    font-family: 'Merriweather', sans-serif;
+    font-size: 14px;
+    color: #FFFFFF;
+    font-weight: 600;
+    text-decoration: none;
+    font-style: normal;
+    font-variant: normal;
+    text-transform: none;
+}
+
+h1 {
+    font-family: 'Quicksand', sans-serif;
+    font-size: 28px;
+    color: #ffffff;
+    font-weight: 800;
+    text-decoration: none;
+    font-style: normal;
+    font-variant: normal;
+    text-transform: none;
+    text-shadow: 3px 3px 3px rgba(63,64,76,1);
+}
+
+h1.mainTitle {
+    
+}
+
+p.mainDesc {
+    font-size: 16px;
+}
+
+p a {
+    color: SteelBlue;
+}
+
+font.appname {
+    font-family: 'Merriweather', sans-serif;
+    font-size: 18px;
+    color: #CFB538;
+    font-weight: 800;
+    text-decoration: none;
+    font-style: normal;
+    font-variant: normal;
+    text-transform: none;
+    margin-bottom: 5px;
+    float: left;
+    clear: both;
+}
+
+font.appdesc {
+    font-family: 'Merriweather', sans-serif;
+    font-size: 15px;
+    color: #ffffff;
+    font-weight: 500;
+    text-decoration: none;
+    font-style: normal;
+    font-variant: normal;
+    text-transform: none;
+    margin-bottom: 5px;
+    float: left;
+    clear: both;
+}
+
+font.noresult {
+    font-family: Arial, Helvetica, sans-serif;
+    font-size: 18px;
+    color: #aaaaaa;
+    font-weight: 500;
+    text-decoration: none;
+    font-style: normal;
+    font-variant: normal;
+    text-transform: none;
+}
+
+font.caption {
+    font-family: Arial, Helvetica, sans-serif;
+    font-size: 12px;
+    color: #ffffff;
+    font-weight: 600;
+    text-decoration: none;
+    font-style: normal;
+    font-variant: normal;
+    text-transform: none;
+}
+
+font.pager {
+    font-family: 'Quicksand', sans-serif;
+    font-size: 14px;
+    color: #B2B5D9;
+    font-weight: 600;
+    text-decoration: none;
+    font-style: normal;
+    font-variant: normal;
+    text-transform: none;
+}
+
+div.iconContainer{
+    border-radius: 15px;
+    background: #000000;
+    padding: 5px;
+    width: 70px;
+    height: 70px;
+    text-align: center;
+}
+
+table.item {
+    background: #3E415E;
+}
+
+td {
+    vertical-align: top;
+    padding: 5px;
+}
+
+button.install {
+    font-family: Arial, Helvetica, sans-serif;
+    background-color: #008CBA;
+    font-size: 16px;
+    color: #ffffff;
+    font-weight: 600;
+    border-radius: 6px;
+    border: 2px solid #008CBA;
+    transition-duration: 0.3s;
+    float: right;
+}
+
+button.install:hover {
+  background-color: #10afe3; 
+  border: 2px solid #10afe3;
+}
+
+button.uninstall {
+    font-family: Arial, Helvetica, sans-serif;
+    background-color: #b34700;
+    font-size: 16px;
+    color: #ffffff;
+    font-weight: 600;
+    border-radius: 6px;
+    border: 2px solid #b34700;
+    transition-duration: 0.3s;
+    float: right;
+}
+
+button.uninstall:hover {
+  background-color: #e34c22; 
+  border: 2px solid #e34c22;
+}
+
+button.processing {
+    font-family: Arial, Helvetica, sans-serif;
+    background-color: #b59207;
+    font-size: 16px;
+    color: #ffffff;
+    font-weight: 600;
+    border-radius: 6px;
+    border: 2px solid #b59207;
+    transition-duration: 0.3s;
+    float: right;
+}
+
+div.searchbox {
+    border-radius: 6px;
+    background: #ffffff;
+    padding: 4px;
+    border: 0px;
+    vertical-align: middle;
+}
+
+input.searchtextbox{
+    font-family: Arial, Helvetica, sans-serif;
+    font-size: 14px;
+    color: #000000;
+    font-weight: 400;
+    text-decoration: none;
+    border: 0px;
+    outline-color: #ffffff;
+}
\ No newline at end of file
diff --git a/scripts/system/more/del-x-16.png b/scripts/system/more/del-x-16.png
new file mode 100644
index 0000000000..9a5153d26f
Binary files /dev/null and b/scripts/system/more/del-x-16.png differ
diff --git a/scripts/system/more/minus-16.png b/scripts/system/more/minus-16.png
new file mode 100644
index 0000000000..e5caf2615c
Binary files /dev/null and b/scripts/system/more/minus-16.png differ
diff --git a/scripts/system/more/more.html b/scripts/system/more/more.html
new file mode 100644
index 0000000000..dfb71244e6
--- /dev/null
+++ b/scripts/system/more/more.html
@@ -0,0 +1,225 @@
+<!--
+//  more.html
+//
+//  Created by Keb Helion, February 2020.
+//  Copyright 2020 Project Athena and contributors.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+-->
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta charset="UTF-8">
+		<script type="text/javascript" src="https://kasenvr.github.io/community-apps/applications/metadata.js"></script>
+		<script>
+			//Parameters
+			function findGetParameter(parameterName) {
+				var result = null,
+					tmp = [];
+				var items = location.search.substr(1).split("&");
+				for (var index = 0; index < items.length; index++) {
+					tmp = items[index].split("=");
+					if (tmp[0] === parameterName) result = decodeURIComponent(tmp[1]);
+				}
+				return result;
+			}
+	
+			var offset = findGetParameter("offset");
+			if(offset === null){offset = 0;}
+			offset = parseInt(offset);
+			
+			var perpage = findGetParameter("perpage");
+			if(perpage === null){perpage = 25;}
+			perpage = parseInt(perpage);
+			
+			var search = findGetParameter("search");
+			if(search === null){search = "";}			
+	
+			//Search
+			function doSearch(keyword){
+				location.href = "more.html?offset=0&search=" + encodeURI(keyword);
+			}
+
+			function clearSearch(){
+				location.href = "more.html?offset=0";
+			}
+			
+			//Paths
+			var currentPath = window.location.protocol + "//" + window.location.host + window.location.pathname;
+			var rootPath = "https://kasenvr.github.io/community-apps/applications/";
+			
+			//Running scripts 
+			var buttonList = [];
+			
+			function requestRunningScriptData() {
+				var readyEvent = {
+					"action": "requestRunningScriptData"
+				};
+				EventBridge.emitWebEvent(JSON.stringify(readyEvent));
+			}
+
+			EventBridge.scriptEventReceived.connect(function(message){
+				//update the buttons
+				buttonList.forEach(function(item){
+					var btn = "";
+					if (message.indexOf(item.url) != -1) {
+						//Means already running
+						btn = "<button class='uninstall' onclick='uninstall(" + '"' + item.url + '"' + ", " + '"' + item.id + '"' + ");'>Uninstall</button>";
+					} else {
+						//Means not already installed
+						btn = "<button class='install' onclick='install(" + '"' + item.url + '"' + ", " + '"' + item.id + '"' + ");'>Install</button>";
+					}
+					
+					document.getElementById(item.id).innerHTML = btn;
+				});
+            });
+
+			function install(script, btnId){
+				//then change btn appearence
+				var btn = "<button class='processing' >Processing...</button>";
+				document.getElementById(btnId).innerHTML = btn;
+
+				//Action
+				var readyEvent = {
+					"action": "installScript",
+					"script": script
+				};
+				
+				EventBridge.emitWebEvent(JSON.stringify(readyEvent));
+
+			}
+
+			function uninstall(script, btnId){
+				//then change btn appearence
+				var btn = "<button class='processing' >Processing...</button>";
+				document.getElementById(btnId).innerHTML = btn;
+				
+				//Action
+				var readyEvent = {
+					"action": "uninstallScript",
+					"script": script
+				};
+                
+				EventBridge.emitWebEvent(JSON.stringify(readyEvent));
+			}
+            
+		</script>    
+        
+        <link href="https://fonts.googleapis.com/css?family=Merriweather|Quicksand:400,700&display=swap" rel="stylesheet">
+        <link href="css/styles.css" rel="stylesheet">
+        
+	</head>
+	<body><form name = "searchbar">
+		<h1 class="mainTitle">Add more functionalities...</h1>
+		<p class="mainDesc">Want to add your own app? Read the <a href="../web/index.html">guide</a>!</p>
+		<table style = "width:100%;">
+			<tr >
+				<td style = "vertical-align:middle; text-align:left;">
+					<table>
+						<tr>
+							<td style = "vertical-align:middle; text-align:left;">
+								<div class = "searchbox">
+									<input class = "searchtextbox" name = "searchtextbox" size = "26" maxlength="32"> <a href="#" onclick='clearSearch();'><img src="del-x-16.png"></a>
+								</div>
+							</td>
+							<td style = "vertical-align:middle; text-align:left;">
+								<a href = "#" onclick = 'doSearch(document.searchbar.searchtextbox.value);'><img src="search-32.png"></a>
+							</td>
+						</tr>
+					</table>
+				</td>
+				<td style = "vertical-align:middle; text-align:right;">
+					<div id = 'pager_top'  style = "vertical-align: middle;"></div>
+				</td>				
+			</tr>
+		</table>
+		</form><br>
+		<div id = "data"></div>
+		<div style="width:98%; text-align:right;"><div style = "vertical-align: middle;" id = 'pager_footer'></div>		
+		
+		<script>
+			document.searchbar.searchtextbox.value = search;
+
+			function DisplayApp(item) {
+				pageContent = pageContent + "<a name = '" + window.btoa(item.name) + "'><table class='item'><tr>";
+				pageContent = pageContent + "<td><div class='iconContainer'><img src='" + rootPath + item.icon + "' style='width:50px;'><br><font class = 'caption'>" + item.caption + "</font></div></td>";
+				var btn = "";
+				var absoluteJsFile = rootPath + item.jsfile;
+			
+				var btn = "<button class='install' onclick = 'install(" + '"' + absoluteJsFile + " ," + window.btoa(item.name) + '"' + ");'>Install</button>";
+				var btndata = {
+					"url": absoluteJsFile,
+					"id": window.btoa(item.name)
+					};
+				buttonList.push(btndata);
+				
+				pageContent = pageContent + "<td><font class='appname'>" + item.name + "<br></font><font class = 'appdesc'>" + item.description + "<br></font><div id = '"+ window.btoa(item.name) +"' align='right'>" + btn + "</div></td>";
+				pageContent = pageContent + "</tr></table><br><br>";				
+			}
+
+			var counterDir = -1;
+			var counterDisp = 0;
+			var index = 0;
+			var lowItem = "";
+			var needNext = false;
+			var pageContent = "";
+			
+			for (index = 0; index < metadata.applications.length; index++){
+				lowItem = metadata.applications[index].name.toLowerCase();
+				if (lowItem.indexOf(search.toLowerCase()) != -1 && metadata.applications[index].isActive == true){ 
+					counterDir = counterDir + 1;
+					if ((counterDir >= offset) && (counterDir < (offset + perpage))){
+						DisplayApp(metadata.applications[index]);
+						counterDisp = counterDisp + 1;
+					}
+					if (counterDir >= (offset + perpage)){
+						needNext = true;
+						break;
+					}
+				}
+			}
+			
+			//pager
+            
+			function pagetoPrevious(){
+				offset = offset - perpage;
+				if (offset < 0){
+					offset = 0;
+				}
+				location.href = "more.html?offset=" + offset + "&perpage=" + perpage + "&search=" + encodeURI(search);			
+			}
+			
+			function pagetoNext(){
+				offset = offset + perpage;
+				location.href = "more.html?offset=" + offset + "&perpage=" + perpage + "&search=" + encodeURI(search);
+			}
+			
+			var pagerPrevious = "<a href='#' onclick='pagetoPrevious();'><img src='minus-16.png'></a>";
+			if (offset <= 0){
+				pagerPrevious = "<img src='blank_minus-16.png'>";
+			}
+			
+			var pagerNext = "<a href='#' onclick='pagetoNext();'><img src='plus-16.png'></a>";
+			if (needNext == false){
+				pagerNext = "<img src='blank_plus-16.png'>";
+			}			
+			
+			var countA = offset + 1;
+			
+			var countB = offset + counterDisp;
+			
+			var pagerHtml = pagerPrevious + "<font class='pager'>&nbsp;&nbsp;" + countA + " - " + countB  + "&nbsp;&nbsp;</font>" + pagerNext; 
+
+			if (counterDisp > 0 ){
+				document.getElementById("pager_top").innerHTML = pagerHtml;
+				document.getElementById("data").innerHTML = pageContent;
+				document.getElementById("pager_footer").innerHTML = pagerHtml;
+			}else{
+				document.getElementById("data").innerHTML = "<hr><div align='center'><font class='noresult'><br><br><br><br>Sorry, no result found.<br><br><br><br><br><br></font></div><hr>";
+			}
+			
+			requestRunningScriptData();
+		</script>
+	</body>
+</html>
\ No newline at end of file
diff --git a/scripts/system/more/plus-16.png b/scripts/system/more/plus-16.png
new file mode 100644
index 0000000000..6935847757
Binary files /dev/null and b/scripts/system/more/plus-16.png differ
diff --git a/scripts/system/more/search-32.png b/scripts/system/more/search-32.png
new file mode 100644
index 0000000000..8d4bb5daa2
Binary files /dev/null and b/scripts/system/more/search-32.png differ