diff --git a/default.php b/default.php
index 2251c44c7..0faa7d97b 100644
--- a/default.php
+++ b/default.php
@@ -16,14 +16,14 @@ require_once('view/theme/frio/php/frio_boot.php');
 $page_type = get_page_type($a->argv[0]);
 
 // This is uncommented because we don't need it anymore.
-// We try to to use links which resulting in $_GET["mode"] = "modal"
-//if($page_type === "modal") {
-//	$_GET["mode"] = "modal";
+// We try to to use links which resulting in $_GET["mode"] = "none"
+//if($page_type === "none") {
+//	$_GET["mode"] = "none";
 //}
 
-if((isset($_GET["mode"]) AND ($_GET["mode"] == "modal"))) {
+if((isset($_GET["mode"]) AND ($_GET["mode"] == "none"))) {
 
-	require "view/theme/frio/php/modes/modal.php";
+	require "view/theme/frio/php/modes/none.php";
 } elseif($page_type === "standard_page") {
 	require "view/theme/frio/php/modes/standard.php";
 } else {
diff --git a/js/filebrowser.js b/js/filebrowser.js
index 58d050a74..0fe501d54 100644
--- a/js/filebrowser.js
+++ b/js/filebrowser.js
@@ -95,7 +95,7 @@ var FileBrowser = {
 
 		$(".folders a, .path a").on("click", function(e){
 			e.preventDefault();
-			var url = baseurl + "/fbrowser/" + FileBrowser.type + "/" + this.dataset.folder + "?mode=modal";
+			var url = baseurl + "/fbrowser/" + FileBrowser.type + "/" + this.dataset.folder + "?mode=none";
 
 			// load new content to fbrowser window
 			$(".fbrowser").load(url,function(){
@@ -161,10 +161,10 @@ var FileBrowser = {
 							$('#profile-rotator').hide();
 							return;
 						}
-//						location = baseurl + "/fbrowser/image/?mode=modal"+location['hash'];
+//						location = baseurl + "/fbrowser/image/?mode=none"+location['hash'];
 //						location.reload(true);
 
-						var url = baseurl + "/fbrowser/" + FileBrowser.type + "?mode=modal"
+						var url = baseurl + "/fbrowser/" + FileBrowser.type + "?mode=none"
 						// load new content to fbrowser window
 						$(".fbrowser").load(url,function(){
 							$(function() {FileBrowser.init(nickname, type, hash);});
@@ -186,10 +186,10 @@ var FileBrowser = {
 							$('#profile-rotator').hide();
 							return;
 						}
-//						location = baseurl + "/fbrowser/file/?mode=modal"+location['hash'];
+//						location = baseurl + "/fbrowser/file/?mode=none"+location['hash'];
 //						location.reload(true);
 
-						var url = baseurl + "/fbrowser/" + FileBrowser.type + "?mode=modal"
+						var url = baseurl + "/fbrowser/" + FileBrowser.type + "?mode=none"
 						// load new content to fbrowser window
 						$(".fbrowser").load(url,function(){
 							$(function() {FileBrowser.init(nickname, type, hash);});
diff --git a/js/hovercard.js b/js/hovercard.js
index c40d6331e..93c87e7a8 100644
--- a/js/hovercard.js
+++ b/js/hovercard.js
@@ -126,7 +126,7 @@ function removeAllhoverCards(event,priorTo) {
 // Ajax request to get json contact data
 function getContactData(purl, url, actionOnSuccess) {
 	var postdata = {
-		mode		: 'modal',
+		mode		: 'none',
 		profileurl	: purl,
 		datatype	: 'json',
 	};
@@ -224,7 +224,7 @@ function getHoverCardContent(purl, url, callback) {
 // Ajax request to get the raw template content
 function getHoverCardTemplate (url, callback) {
 	var postdata = {
-		mode: 'modal',
+		mode: 'none',
 		datatype: 'tpl'
 	};
 
diff --git a/js/modal.js b/js/modal.js
index 8868e0640..354a5e11d 100644
--- a/js/modal.js
+++ b/js/modal.js
@@ -91,7 +91,7 @@ Dialog.show = function(url) {
 Dialog._get_url = function(type, name, id) {
 	var hash = name;
 	if (id !== undefined) hash = hash + "-" + id;
-	return "fbrowser/"+type+"/?mode=modal#"+hash;
+	return "fbrowser/"+type+"/?mode=none#"+hash;
 };
 
 // does load the filebrowser into the jot modal
@@ -119,7 +119,7 @@ Dialog._load = function(url) {
 	var type = $("#fb-type").attr("value");
 
 	// try to fetch the hash form the url
-	var match = url.match(/fbrowser\/[a-z]+\/\?mode=modal(.*)/);
+	var match = url.match(/fbrowser\/[a-z]+\/\?mode=none(.*)/);
 	var hash = match[1];
 
 	// initialize the filebrowser
@@ -157,7 +157,7 @@ function loadModalTitle() {
 function addToModal(url) {
 	var char = qOrAmp(url);
 
-	var url = url + char + 'mode=modal';
+	var url = url + char + 'mode=none';
 	var modal = $('#modal').modal();
 
 	modal
diff --git a/php/frio_boot.php b/php/frio_boot.php
index 4067a9e5e..827874d7e 100644
--- a/php/frio_boot.php
+++ b/php/frio_boot.php
@@ -16,8 +16,8 @@
 function load_page(&$a) {
 	if(isset($_GET["mode"]) AND ($_GET["mode"] == "minimal")) {
 		require "view/theme/frio/minimal.php";
-	} elseif((isset($_GET["mode"]) AND ($_GET["mode"] == "modal"))) {
-		require "view/theme/frio/modal.php";
+	} elseif((isset($_GET["mode"]) AND ($_GET["mode"] == "none"))) {
+		require "view/theme/frio/none.php";
 	} else {
 		$template = 'view/theme/' . current_theme() . '/'
 			. ((x($a->page,'template')) ? $a->page['template'] : 'default' ) . '.php';
diff --git a/php/modes/modal.php b/php/modes/modal.php
deleted file mode 100644
index 20291d4f0..000000000
--- a/php/modes/modal.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-/**
- * @file view/theme/frio/php/modes/modal.php
- * @brief The site template for Modals
- * 
- * This themplate is used for bs modals. So outputs
- * only the pure content
- */
-
-if(x($page,'content')) echo $page['content'];
-
diff --git a/php/modes/none.php b/php/modes/none.php
new file mode 100644
index 000000000..5b96e282e
--- /dev/null
+++ b/php/modes/none.php
@@ -0,0 +1,11 @@
+<?php
+/**
+ * @file view/theme/frio/php/modes/none.php
+ * @brief The site template for pure content (e.g. (modals)
+ * 
+ * This themplate is used e.g for bs modals. So outputs
+ * only the pure content
+ */
+
+if(x($page,'content')) echo $page['content'];
+
diff --git a/templates/nav.tpl b/templates/nav.tpl
index d6d5965e9..8eb13c1a4 100644
--- a/templates/nav.tpl
+++ b/templates/nav.tpl
@@ -242,7 +242,7 @@
 		<div class="hidden-sm hidden-xs">
 			<ul class="nav navbar-nav navbar-right">
 				<li><a href="register" data-toggle="tooltip" title="{{$register.title}}"><i class="fa fa-street-view fa-fw"></i> {{$register.desc}}</a></li>
-				<li><a href="login?mode=modal" data-toggle="tooltip" title="{{$login}}"><i class="fa fa-sign-in fa-fw"></i> {{$login}}</a></li>
+				<li><a href="login?mode=none" data-toggle="tooltip" title="{{$login}}"><i class="fa fa-sign-in fa-fw"></i> {{$login}}</a></li>
 			</ul>
 		</div>
 	</div>
diff --git a/templates/wall_thread.tpl b/templates/wall_thread.tpl
index b327470c5..d41d61a16 100644
--- a/templates/wall_thread.tpl
+++ b/templates/wall_thread.tpl
@@ -90,7 +90,7 @@ as the value of $top_child_total (this is done at the end of this file)
 
 					{{if $item.edpost}} {{* edit the posting *}}
 					<li role="menuitem">
-						<a href="#" onclick="editpost('{{$item.edpost.0}}?mode=modal'); return false;" title="{{$item.edpost.1}}" class="navicon pencil"><i class="fa fa-pencil"></i> {{$item.edpost.1}}</a>
+						<a href="#" onclick="editpost('{{$item.edpost.0}}?mode=none'); return false;" title="{{$item.edpost.1}}" class="navicon pencil"><i class="fa fa-pencil"></i> {{$item.edpost.1}}</a>
 					</li>
 					{{/if}}