diff --git a/src/_h5ai/client/js/inc/core/location.js b/src/_h5ai/client/js/inc/core/location.js
index 662e5736..e6691a9c 100644
--- a/src/_h5ai/client/js/inc/core/location.js
+++ b/src/_h5ai/client/js/inc/core/location.js
@@ -3,7 +3,7 @@ modulejs.define('core/location', ['_', 'modernizr', 'core/settings', 'core/event
 
 	var settings = _.extend({
 			smartBrowsing: true,
-			extInNewWindow: true
+			unmanagedInNewWindow: true
 		}, allsettings.view),
 
 		doc = document,
@@ -175,7 +175,7 @@ modulejs.define('core/location', ['_', 'modernizr', 'core/settings', 'core/event
 				});
 			}
 
-			if (settings.extInNewWindow && !item.isManaged) {
+			if (settings.unmanagedInNewWindow && !item.isManaged) {
 				$el.attr('target', '_blank');
 			}
 		};
diff --git a/src/_h5ai/conf/options.json b/src/_h5ai/conf/options.json
index 0455851c..00f977ae 100644
--- a/src/_h5ai/conf/options.json
+++ b/src/_h5ai/conf/options.json
@@ -24,12 +24,10 @@ Options
 	General view options.
 
 	- binaryPrefix: set to true uses 1024B=1KiB when formatting file sizes (see http://en.wikipedia.org/wiki/Binary_prefix)
-	- extInNewWindow: open non-{{pkg.name}} links in new window/tab
 	- hidden: don't list items matching these regular expressions
 	- hideFolders: hide all folders in the main view
 	- hideIf403: hide files and folders that are not readable by the server
 	- hideParentFolder: hide parent folder links in the main view
-	- indexFiles: consider folder with those files as non {{pkg.name}} folders
 	- modes: array, subset of ["details", "grid", "icons"]
 		the first value indicates the default view mode. If only one value
 		is given the view mode is fixed and the selector buttons are hidden.
@@ -43,22 +41,24 @@ Options
 		so that it will be persistent.
 	- smartBrowsing: use History API if available (no need to reload the whole page)
 	- theme: name of one of the folders in "_{{pkg.name}}/client/themes", defaults to "fallback"
+	- unmanaged: don't manage folders containing one of those files
+	- unmanagedInNewWindow: open unmanaged links in new window/tab
 	*/
 	"view": {
 		"binaryPrefix": false,
-		"extInNewWindow": false,
 		"hidden": ["^\\.", "^_{{pkg.name}}"],
 		"hideFolders": false,
 		"hideIf403": true,
 		"hideParentFolder": false,
-		"indexFiles": ["index.html", "index.htm", "index.php"],
 		"modes": ["details", "grid", "icons"],
 		"setParentFolderLabels": true,
 		"sizes": [48, 24, 96],
 		"smartBrowsing": true,
-		"theme": "evolvere"
-		// "theme": "faenza"
-		// "theme": "fallback"
+		// "theme": "fallback",
+		// "theme": "faenza",
+		"theme": "evolvere",
+		"unmanaged": ["index.html", "index.htm", "index.php"],
+		"unmanagedInNewWindow": false
 	},
 
 
diff --git a/src/_h5ai/server/php/inc/class-app.php b/src/_h5ai/server/php/inc/class-app.php
index c6bee860..9ed513c5 100644
--- a/src/_h5ai/server/php/inc/class-app.php
+++ b/src/_h5ai/server/php/inc/class-app.php
@@ -142,7 +142,7 @@ class App {
 			return false;
 		}
 
-		foreach ($this->options["view"]["indexFiles"] as $name) {
+		foreach ($this->options["view"]["unmanaged"] as $name) {
 			if (file_exists($path . "/" . $name)) {
 				return false;
 			}