diff --git a/applications/admin/settings.cfg b/applications/admin/settings.cfg
index 4127b27c..12505206 100644
--- a/applications/admin/settings.cfg
+++ b/applications/admin/settings.cfg
@@ -1,9 +1,12 @@
-[DEFAULT]
-
 [editor]
-theme = web2py
-editor = default
+theme = twilight
+editor = sublime
 closetag = true
+tabwidth = 4
+highlightline = true
+linenumbers = true
+codefolding = false
+indentwithtabs = false
 
 [editor_sessions]
 welcome = welcome/models/db.py,welcome/controllers/default.py,welcome/views/default/index.html
diff --git a/applications/admin/views/default/editor_settings.html b/applications/admin/views/default/editor_settings.html
index d0485231..c1f54235 100644
--- a/applications/admin/views/default/editor_settings.html
+++ b/applications/admin/views/default/editor_settings.html
@@ -6,7 +6,7 @@
       return files
 }}
 {{themes = [f[:-4] for f in listfiles('admin', "static/codemirror/theme", regexp='.*\.css$' )]}}
-{{editors = ['default', 'vim', 'emacs']}}
+{{editors = ['default', 'vim', 'emacs', 'sublime']}}
 
 <form id="editor_settings_form" class="form-horizontal" action="">
 	<div class="control-group">
@@ -27,7 +27,7 @@
 	</div>
 	<div class="control-group">
 		<label class="control-label" for="tabwidth">{{=T('Tab width (# characters)')}}</label>
-		<div class="controls">{{=SELECT(range(1,9, 1), value=editor_settings['tabwidth'], _name="tabwidth" )}}</div>
+		<div class="controls">{{=SELECT(list(range(1,9, 1)), value=editor_settings['tabwidth'], _name="tabwidth" )}}</div>
 	</div>
 	<div class="control-group">
 		<label class="control-label" for="indentwithtabs">{{=T('Indent with tabs')}}</label>