diff --git a/components/editor/init.js b/components/editor/init.js
index 4475a56..9df0019 100755
--- a/components/editor/init.js
+++ b/components/editor/init.js
@@ -337,6 +337,8 @@
 
         rootContainer: null,
 
+        fileExtensionTextMode: {},
+        
         init: function(){
             this.createSplitMenu();
             this.createModeMenu();
@@ -747,58 +749,57 @@
 
         /////////////////////////////////////////////////////////////////
         //
-        // Select file mode by extension
+        // Select file mode by extension case insensitive
         //
         // Parameters:
-        //   e - {String} File extension
+        // e - {String} File extension
         //
         /////////////////////////////////////////////////////////////////
 
         selectMode: function(e) {
-            switch (e) {
-            case 'html':
-            case 'htm':
-            case 'tpl':
-                return 'html';
-            case 'js':
-                return 'javascript';
-            case 'css':
-                return 'css';
-            case 'scss':
-            case 'sass':
-                return 'scss';
-            case 'less':
-                return 'less';
-            case 'php':
-            case 'php5':
-            case 'phtml':
-                return 'php';
-            case 'json':
-                return 'json';
-            case 'xml':
-                return 'xml';
-            case 'sql':
-                return 'sql';
-            case 'md':
-                return 'markdown';
-            case 'c':
-            case 'cpp':
-            case 'h':
-            case 'hpp':
-                return 'c_cpp';
-            case 'py':
-                return 'python';
-            case 'rb':
-                return 'ruby';
-            case 'jade':
-                return 'jade';
-            case 'coffee':
-                return 'coffee';
-            default:
+            if(typeof(e) != 'string'){
+                return 'text';
+            }
+            e = e.toLowerCase();
+            
+            if(e in this.fileExtensionTextMode){
+                return this.fileExtensionTextMode[e];
+            }else{
                 return 'text';
             }
         },
 
+        /////////////////////////////////////////////////////////////////
+        //
+        // Add an text mode for an extension
+        //
+        // Parameters:
+        // extension - {String} File Extension
+        // mode - {String} TextMode for this extension
+        //
+        /////////////////////////////////////////////////////////////////
+        
+        addFileExtensionTextMode: function(extension, mode){
+            if(typeof(extension) != 'string' || typeof(mode) != 'string'){
+                if (console){
+                    console.warn('wrong usage of addFileExtensionTextMode, both parameters need to be string');
+                }
+                return;
+            }
+            mode = mode.toLowerCase();
+            this.fileExtensionTextMode[extension] = mode;
+        },
+        
+        /////////////////////////////////////////////////////////////////
+        //
+        // clear all extension-text mode joins
+        //
+        /////////////////////////////////////////////////////////////////
+        
+        clearFileExtensionTextMode: function(){
+            this.fileExtensionTextMode = {};
+        },
+        
         /////////////////////////////////////////////////////////////////
         //
         // Set the editor mode
diff --git a/components/fileExtTextMode/defaultValues.php b/components/fileExtTextMode/defaultValues.php
new file mode 100644
index 0000000..dcf71c2
--- /dev/null
+++ b/components/fileExtTextMode/defaultValues.php
@@ -0,0 +1,107 @@
+<?php
+
+define('PATH_TO_FILE_EXT_TEXT_MODE', 'components/FileExtTextMode/' );
+
+$defaultExtensions = array(
+		'html' => 'html',
+		'htm' => 'html',
+		'tpl' => 'html',
+		'js' => 'javascript',
+		'css' => 'css',
+		'scss' => 'scss',
+		'sass' => 'scss',
+		'less' => 'less',
+		'php' => 'php',
+		'php4' => 'php',
+		'php5' => 'php',
+		'phtml' => 'php',
+		'json' => 'json',
+		'xml' => 'xml',
+		'sql' => 'sql',
+		'md' => 'markdown',
+		'c' => 'c_cpp',
+		'cpp' => 'c_cpp',
+		'h' => 'c_cpp',
+		'hpp' => 'c_cpp',
+		'py' => 'python',
+		'rb' => 'ruby',
+		'jade' => 'jade',
+		'coffee' => 'coffee');
+
+$availiableTextModes = array(
+		'abap',
+		'asciidoc',
+		'c9search',
+		'c_cpp',
+		'clojure',
+		'coffee',
+		'coldfusion',
+		'csharp',
+		'css',
+		'curly',
+		'dart',
+		'diff',
+		'django',
+		'dot',
+		'ftl',
+		'glsl',
+		'golang',
+		'groovy',
+		'haml',
+		'haxe',
+		'html',
+		'jade',
+		'java',
+		'javascript',
+		'json',
+		'jsp',
+		'jsx',
+		'latex',
+		'less',
+		'liquid',
+		'lisp',
+		'livescript',
+		'logiql',
+		'lsl',
+		'lua',
+		'luapage',
+		'lucene',
+		'makefile',
+		'markdown',
+		'mushcode',
+		'objectivec',
+		'ocaml',
+		'pascal',
+		'perl',
+		'pgsql',
+		'php',
+		'powershell',
+		'python',
+		'r',
+		'rdoc',
+		'rhtml',
+		'ruby',
+		'sass',
+		'scad',
+		'scala',
+		'scheme',
+		'scss',
+		'sh',
+		'sql',
+		'stylus',
+		'svg',
+		'tcl',
+		'tex',
+		'text',
+		'textile',
+		'tmsnippet',
+		'toml',
+		'typescript',
+		'vbscript',
+		'velocity',
+		'xml',
+		'xquery',
+		'yaml'
+    );
+
+?>
\ No newline at end of file
diff --git a/components/fileExtTextMode/fileExtTextModeForm.php b/components/fileExtTextMode/fileExtTextModeForm.php
new file mode 100644
index 0000000..a4be119
--- /dev/null
+++ b/components/fileExtTextMode/fileExtTextModeForm.php
@@ -0,0 +1,56 @@
+<?php
+require_once '../../common.php';
+require_once 'defaultValues.php';
+
+Common::checkSession();
+
+//return a select-field with all availiable text modes, the one in the param is selected
+function getTextModeSelect($extension){
+	global $availiableTextModes;
+	$extension = trim(strtolower($extension));
+	$find = false;
+	$ret = '<select style="width: 100px; display: inline;" name="textMode[]" class="textMode">'."\n";
+	foreach($availiableTextModes as $textmode){
+		$ret .= '	<option';
+		if($textmode == $extension){
+			$ret .= ' selected="selected"';
+			$find = true;
+		}
+		$ret .='>'.$textmode.'</option>'."\n";
+	}
+	
+	if(!$find && $extension != ''){
+		$ret .= '	<option selected="selected">'.$textmode.'</option>'."\n";
+	}
+	
+	$ret .= '</select>'."\n";
+	
+	return $ret;
+}
+
+$ext = false;
+//ignore warnings
+$ext = @Common::getJSON('fileExtensions.php');
+
+if(!is_array($ext)){
+	//default extensions
+	$ext = $defaultExtensions;
+}
+
+if(!@ksort($ext) || !@ksort($availiableTextModes)){
+	die(json_encode(array('status' => 'error', 'msg' => 'Internal PHP error.') ));
+}
+
+//echo '<form onSubmit="return codiad.fileExtTextMode.sendForm();">'."\n";
+echo '	<div id="FileExtTextModeDiv" style="height: 300px; overflow-y: scroll; min-height: 300px;">';
+
+	foreach($ext as $ex => $mode){
+		echo '<input class="FileExtension" style="width: 100px; display: inline;" type="text" name="extension[]" value="'.$ex.'" /> &nbsp;&nbsp;';
+		echo getTextModeSelect($mode) . "<br/>\n";
+	}
+
+echo '	</div>';
+echo '<a onClick="codiad.fileExtTextMode.addFieldToForm()">add field... </a>'."<br/>\n";
+echo '<input type="submit" onClick="codiad.fileExtTextMode.sendForm();" />';
+//echo '</form>'."\n";
+?>
\ No newline at end of file
diff --git a/components/fileExtTextMode/getFileExtTextModes.php b/components/fileExtTextMode/getFileExtTextModes.php
new file mode 100644
index 0000000..20109a9
--- /dev/null
+++ b/components/fileExtTextMode/getFileExtTextModes.php
@@ -0,0 +1,19 @@
+<?php
+
+require_once '../../common.php';
+require_once 'defaultValues.php';
+
+Common::checkSession();
+
+$ext = false;
+//ignore warnings
+$ext = @Common::getJSON('fileExtensions.php');
+
+if(!is_array($ext)){
+	//default extensions
+	$ext = $defaultExtensions;
+}
+
+echo json_encode(array('status' => 'success', 'msg' => 'Extensions send', 'extensions' => $ext));
+
+?>
\ No newline at end of file
diff --git a/components/fileExtTextMode/init.js b/components/fileExtTextMode/init.js
new file mode 100644
index 0000000..b878a3c
--- /dev/null
+++ b/components/fileExtTextMode/init.js
@@ -0,0 +1,167 @@
+var debug;
+(function(global, $) {
+
+	$(function() {
+		codiad.fileExtTextMode.init();
+	});
+
+	global.codiad.fileExtTextMode = {
+
+		pluginDir:'components/FileExtTextMode/',
+		
+		availableTextModes :[
+		        'abap',
+		        'asciidoc',
+		        'c9search',
+		        'c_cpp',
+		        'clojure',
+		        'coffee',
+		        'coldfusion',
+		        'csharp',
+		        'css',
+		        'curly',
+		        'dart',
+		        'diff',
+		        'django',
+		        'dot',
+		        'ftl',
+		        'glsl',
+		        'golang',
+		        'groovy',
+		        'haml',
+		        'haxe',
+		        'html',
+		        'jade',
+		        'java',
+		        'javascript',
+		        'json',
+		        'jsp',
+		        'jsx',
+		        'latex',
+		        'less',
+		        'liquid',
+		        'lisp',
+		        'livescript',
+		        'logiql',
+		        'lsl',
+		        'lua',
+		        'luapage',
+		        'lucene',
+		        'makefile',
+		        'markdown',
+		        'mushcode',
+		        'objectivec',
+		        'ocaml',
+		        'pascal',
+		        'perl',
+		        'pgsql',
+		        'php',
+		        'powershell',
+		        'python',
+		        'r',
+		        'rdoc',
+		        'rhtml',
+		        'ruby',
+		        'sass',
+		        'scad',
+		        'scala',
+		        'scheme',
+		        'scss',
+		        'sh',
+		        'sql',
+		        'stylus',
+		        'svg',
+		        'tcl',
+		        'tex',
+		        'text',
+		        'textile',
+		        'tmsnippet',
+		        'toml',
+		        'typescript',
+		        'vbscript',
+		        'velocity',
+		        'xml',
+		        'xquery',
+		        'yaml'
+		    ],
+		
+		init : function() {
+			this.initEditorFileExtensionTextModes();
+		},
+
+		formWidth : 300,
+
+		open : function() {
+			codiad.modal.load(this.formWidth,
+					this.pluginDir+'fileExtTextModeForm.php');
+			codiad.modal.hideOverlay();
+		},
+		
+		sendForm : function(){
+			var $div = $('#FileExtTextModeDiv');
+			var extensions = $div.find('.FileExtension');
+			var formData = {'extension[]' : [], 'textMode[]' : []};
+			for(var i = 0; i <  extensions.size(); ++i){
+				formData['extension[]'].push(extensions[i].value);
+			}
+			
+			var textMode = $div.find('.textMode');
+			for(var i = 0; i <  textMode.size(); ++i){
+				formData['textMode[]'].push(textMode[i].value);
+			}
+			
+			$.post(this.pluginDir+'process.php', formData, codiad.fileExtTextMode.setEditorFileExtensionTextModes);
+			
+			codiad.modal.unload();
+		},
+		
+		addFieldToForm : function(){
+			var $div = $('#FileExtTextModeDiv');
+			
+			var code = '<input class="FileExtension" style="width: 100px; display: inline;" type="text" name="extension[]" value="" /> &nbsp;&nbsp;';
+			code += '<select style="width: 100px; display: inline;" name="textMode[]" class="textMode">';
+			for(var i = 0; i < this.availableTextModes.length; ++i){
+				code += '<option>'+ this.availableTextModes[i] +'</option>';
+			}
+			code += '</select><br/>';
+	
+			$div.append(code);
+			
+			//scroll as far down as possible
+			$div.scrollTop(1000000);
+		},
+		
+		showStatus : function(resp) {
+			resp = $.parseJSON(resp);
+			switch (resp.status) {
+			case 'success':
+				codiad.message.success(resp.msg);
+				break;
+			case 'error':
+				codiad.message.error(resp.msg);
+				break;
+			case 'notice':
+				codiad.message.notice(resp.msg);
+				break;
+			};
+		},
+		
+		initEditorFileExtensionTextModes : function(){
+			$.get(this.pluginDir+'getFileExtTextModes.php', {}, this.setEditorFileExtensionTextModes);
+		},
+		
+		setEditorFileExtensionTextModes : function(data){
+			resp = $.parseJSON(data);
+			if(resp.status != 'error' && resp.extensions != undefined){
+				codiad.editor.clearFileExtensionTextMode();
+				
+				for(i in resp.extensions){
+					codiad.editor.addFileExtensionTextMode(i, resp.extensions[i]);
+				}
+			}
+			codiad.fileExtTextMode.showStatus(data);
+		}
+		
+
+	};
+})(this, jQuery);
\ No newline at end of file
diff --git a/components/fileExtTextMode/plugin.json b/components/fileExtTextMode/plugin.json
new file mode 100644
index 0000000..0fe65d0
--- /dev/null
+++ b/components/fileExtTextMode/plugin.json
@@ -0,0 +1,14 @@
+[{
+    "author": "ccvca",
+    "version": "0.5",
+    "name": "FileExtentionTextMode",
+    "url": "",
+    "rightbar": [
+        {
+            "action": "codiad.fileExtTextMode.open();",
+            "icon": "icon-tools",
+            "title": "File extensions"
+        }
+    ],
+    "contextmenu": []
+}]
\ No newline at end of file
diff --git a/components/fileExtTextMode/process.php b/components/fileExtTextMode/process.php
new file mode 100644
index 0000000..d92ec3f
--- /dev/null
+++ b/components/fileExtTextMode/process.php
@@ -0,0 +1,65 @@
+<?php
+
+require_once '../../common.php';
+require_once 'defaultValues.php';
+
+Common::checkSession();
+
+//echo json_encode(array('status' => 'success', 'msg' => 'No Content.'));
+
+//Store Fileextensions and Textmodes in File:
+
+function validateExtension($extension){
+	return preg_match('#^[a-z0-9\_]+$#i', $extension);
+}
+
+function validTextMode($mode){
+	global $availiableTextModes;
+	return in_array($mode, $availiableTextModes);
+}
+
+if(!isset($_POST['extension']) || !is_array($_POST['extension']) 
+			|| !isset($_POST['textMode']) || !is_array($_POST['textMode'])){
+	die(json_encode(array('status' => 'error', 'msg' => 'incorrect data send')));
+}
+
+$exMap = array();
+
+$warning = '';
+
+foreach ($_POST['extension'] as $key => $extension){
+	if(trim($extension) == '' ){
+		continue;
+	}
+	
+	if(!isset($_POST["textMode"][$key])){
+		die(json_encode(array('status' => 'error', 'msg' => 'incorrect data send.')));
+	}
+	
+	$extension = strtolower(trim($extension));
+	$textMode =  strtolower(trim($_POST["textMode"][$key]));
+	
+	if(!validateExtension($extension)){
+		die(json_encode(array('status' => 'error', 'msg' => 'incorrect extension:'.htmlentities($extension))));
+	}
+	
+	if(!validTextMode($textMode)){
+		die(json_encode(array('status' => 'error', 'msg' => 'incorrect text mode:'.htmlentities($textMode))));
+	}
+	
+	if(isset($exMap[$extension])){
+		$warning =  htmlentities($extension).' is already set.<br/>';
+	}else{
+		$exMap[$extension] = $textMode;
+	}
+}
+
+
+Common::saveJSON('fileExtensions.php', $exMap);
+if($warning != ''){
+	echo json_encode(array('status' => 'warning', 'msg' => $warning, 'extensions' => $exMap ));
+}else{
+	echo json_encode(array('status' => 'success', 'msg' => 'File extensions are saved successfully.', 'extensions' => $exMap));
+}
+
+?>
\ No newline at end of file
diff --git a/components/right_bar.json b/components/right_bar.json
index a152c0b..735665b 100755
--- a/components/right_bar.json
+++ b/components/right_bar.json
@@ -39,6 +39,11 @@
         "icon": "icon-doc-text",
         "onclick": "codiad.modal.load(400, 'components/editor/dialog.php?action=settings');codiad.modal.hideOverlay();"
     },
+    {
+        "title": "File extensions",
+        "icon": "icon-tools",
+        "onclick": "codiad.fileExtTextMode.open();"
+    },
     {
         "title": "Plugins",
         "icon": "icon-tag",