diff --git a/htdocs/application/config/codemirror_languages.php b/htdocs/application/config/codemirror_languages.php
index 9b0d4e2..084957f 100644
--- a/htdocs/application/config/codemirror_languages.php
+++ b/htdocs/application/config/codemirror_languages.php
@@ -70,10 +70,31 @@ $config['codemirror_languages'] = array(
 			) ,
 		) ,
 	) ,
-	'ruby' => 'Ruby',
+	'ruby' => array(
+		'mode' => 'ruby',
+		'js' => array(
+			array(
+				'codemirror/mode/ruby/ruby.js'
+			) ,
+		) ,
+	) ,
 	'bash' => 'Bash',
-	'c' => 'C',
-	'cpp' => 'C++',
+	'c' => array(
+		'mode' => 'text/x-csrc',
+		'js' => array(
+			array(
+				'codemirror/mode/clike/clike.js'
+			) ,
+		) ,
+	) ,
+	'cpp' => array(
+		'mode' => 'text/x-c++src',
+		'js' => array(
+			array(
+				'codemirror/mode/clike/clike.js'
+			) ,
+		) ,
+	) ,
 	'diff' => 'Diff',
 	'latex' => 'LaTeX',
 	'sql' => 'SQL',
@@ -95,7 +116,14 @@ $config['codemirror_languages'] = array(
 	'cfdg' => 'CFDG',
 	'cfm' => 'CFM',
 	'cpp-qt' => 'C++ QT',
-	'csharp' => 'C#',
+	'csharp' => array(
+		'mode' => 'text/x-csharp',
+		'js' => array(
+			array(
+				'codemirror/mode/clike/clike.js'
+			) ,
+		) ,
+	) ,
 	'd' => 'D',
 	'delphi' => 'Delphi',
 	'div' => 'DIV',
@@ -112,10 +140,31 @@ $config['codemirror_languages'] = array(
 	'ini' => 'INI',
 	'inno' => 'Inno Script',
 	'io' => 'Io',
-	'java' => 'Java',
-	'java5' => 'Java 5',
+	'java' => array(
+		'mode' => 'text/x-java',
+		'js' => array(
+			array(
+				'codemirror/mode/clike/clike.js'
+			) ,
+		) ,
+	) ,
+	'java5' => array(
+		'mode' => 'text/x-java',
+		'js' => array(
+			array(
+				'codemirror/mode/clike/clike.js'
+			) ,
+		) ,
+	) ,
 	'lisp' => 'Lisp',
-	'lua' => 'LUA',
+	'lua' => array(
+		'mode' => 'lua',
+		'js' => array(
+			array(
+				'codemirror/mode/lua/lua.js'
+			) ,
+		) ,
+	) ,
 	'm68k' => 'm68k',
 	'matlab' => 'Matlab',
 	'mirc' => 'mIRC',
diff --git a/htdocs/application/config/geshi_languages.php b/htdocs/application/config/geshi_languages.php
index 359dbdd..1f11cba 100644
--- a/htdocs/application/config/geshi_languages.php
+++ b/htdocs/application/config/geshi_languages.php
@@ -59,7 +59,7 @@ $config['geshi_languages'] = array(
 	'java' => 'Java',
 	'java5' => 'Java 5',
 	'lisp' => 'Lisp',
-	'lua' => 'LUA',
+	'lua' => 'Lua',
 	'm68k' => 'm68k',
 	'matlab' => 'Matlab',
 	'mirc' => 'mIRC',