Index: lams_central/web/qb/authoring/addessay.jsp
===================================================================
diff -u -r6bab11b98a1dfdcebfb7e11b8dcfab3128a2ff83 -rf5bcf9323324eb4d5add901d9e7a23c33050533a
--- lams_central/web/qb/authoring/addessay.jsp	(.../addessay.jsp)	(revision 6bab11b98a1dfdcebfb7e11b8dcfab3128a2ff83)
+++ lams_central/web/qb/authoring/addessay.jsp	(.../addessay.jsp)	(revision f5bcf9323324eb4d5add901d9e7a23c33050533a)
@@ -208,9 +208,15 @@
 					    <div class="col-sm-9">
 					    	<form:select path="codeStyle" cssClass="form-control">
 					    		<form:option value="0"><fmt:message key="label.code.style.none" /></form:option>
-					    		<form:option value="1">Java</form:option>
+					    		<form:option value="1">Python</form:option>
 					    		<form:option value="2">JavaScript</form:option>
-					    		<form:option value="3">Python</form:option>
+					    		<form:option value="3">Java</form:option>
+					    		<form:option value="4">Scala</form:option>
+					    		<form:option value="5">Kotlin</form:option>
+					    		<form:option value="6">C</form:option>
+					    		<form:option value="7">Objective C</form:option>
+					    		<form:option value="8">C++</form:option>
+					    		<form:option value="9">C#</form:option>
 					    	</form:select>
 					    </div>
 					</div>
Index: lams_common/src/java/org/lamsfoundation/lams/qb/model/QbQuestion.java
===================================================================
diff -u -r3b83454706f152d81a25b6c08444ceb3ce964638 -rf5bcf9323324eb4d5add901d9e7a23c33050533a
--- lams_common/src/java/org/lamsfoundation/lams/qb/model/QbQuestion.java	(.../QbQuestion.java)	(revision 3b83454706f152d81a25b6c08444ceb3ce964638)
+++ lams_common/src/java/org/lamsfoundation/lams/qb/model/QbQuestion.java	(.../QbQuestion.java)	(revision f5bcf9323324eb4d5add901d9e7a23c33050533a)
@@ -48,9 +48,15 @@
     public static final int TYPE_MARK_HEDGING = 8;
 
     // code styles
-    public static final int CODE_STYLE_JAVA = 1;
+    public static final int CODE_STYLE_PYTHON = 1;
     public static final int CODE_STYLE_JAVASCRIPT = 2;
-    public static final int CODE_STYLE_PYTHON = 3;
+    public static final int CODE_STYLE_JAVA = 3;
+    public static final int CODE_STYLE_SCALA = 4;
+    public static final int CODE_STYLE_KOTLIN = 5;
+    public static final int CODE_STYLE_C = 6;
+    public static final int CODE_STYLE_OBJECTIVE_C = 7;
+    public static final int CODE_STYLE_CPP = 8;
+    public static final int CODE_STYLE_CSHARP = 9;
 
     // primary key
     // another candidate is questionId + version, but single uid can be searched faster
@@ -492,18 +498,34 @@
 	this.codeStyle = codeStyle;
     }
 
-    public String getCodeStyleMime() {
+    public static String getCodeStyleMime(Integer codeStyle) {
 	switch (codeStyle) {
-	    case 1:
-		return "text/x-java";
-	    case 2:
-		return "text/javascript";
-	    case 3:
+	    case CODE_STYLE_PYTHON:
 		return "text/x-python";
+	    case CODE_STYLE_JAVASCRIPT:
+		return "text/javascript";
+	    case CODE_STYLE_JAVA:
+		return "text/x-java";
+	    case CODE_STYLE_SCALA:
+		return "text/x-scala";
+	    case CODE_STYLE_KOTLIN:
+		return "text/x-kotlin";
+	    case CODE_STYLE_C:
+		return "text/x-csrc";
+	    case CODE_STYLE_OBJECTIVE_C:
+		return "text/x-objectivec";
+	    case CODE_STYLE_CPP:
+		return "text/x-c++src";
+	    case CODE_STYLE_CSHARP:
+		return "text/x-csharp";
 	}
 	return null;
     }
 
+    public String getCodeStyleMime() {
+	return QbQuestion.getCodeStyleMime(codeStyle);
+    }
+
     public boolean isHedgingJustificationEnabled() {
 	return hedgingJustificationEnabled;
     }
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/QuestionDTO.java
===================================================================
diff -u -r3b83454706f152d81a25b6c08444ceb3ce964638 -rf5bcf9323324eb4d5add901d9e7a23c33050533a
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/QuestionDTO.java	(.../QuestionDTO.java)	(revision 3b83454706f152d81a25b6c08444ceb3ce964638)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/QuestionDTO.java	(.../QuestionDTO.java)	(revision f5bcf9323324eb4d5add901d9e7a23c33050533a)
@@ -343,15 +343,7 @@
     }
 
     public String getCodeStyleMime() {
-	switch (codeStyle) {
-	    case 1:
-		return "text/x-java";
-	    case 2:
-		return "text/javascript";
-	    case 3:
-		return "text/x-python";
-	}
-	return null;
+	return QbQuestion.getCodeStyleMime(codeStyle);
     }
 
     public boolean isHedgingJustificationEnabled() {
Index: lams_tool_assessment/web/pages/learning/learning.jsp
===================================================================
diff -u -rc4ba84a2f40772b7efb1f1d734d19d153d84feff -rf5bcf9323324eb4d5add901d9e7a23c33050533a
--- lams_tool_assessment/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision c4ba84a2f40772b7efb1f1d734d19d153d84feff)
+++ lams_tool_assessment/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision f5bcf9323324eb4d5add901d9e7a23c33050533a)
@@ -82,13 +82,13 @@
 	<c:forEach items="${codeStyles}" var="codeStyle">
 		<c:choose>
 			<c:when test="${codeStyle == 1}">
-				<script type="text/javascript" src="${lams}includes/javascript/codemirror/mode/clike.js"></script>
+				<script type="text/javascript" src="${lams}includes/javascript/codemirror/mode/python.js"></script>
 			</c:when>
 			<c:when test="${codeStyle == 2}">
 				<script type="text/javascript" src="${lams}includes/javascript/codemirror/mode/javascript.js"></script>
 			</c:when>
-			<c:when test="${codeStyle == 3}">
-				<script type="text/javascript" src="${lams}includes/javascript/codemirror/mode/python.js"></script>
+			<c:when test="${codeStyle >= 3}">
+				<script type="text/javascript" src="${lams}includes/javascript/codemirror/mode/clike.js"></script>
 			</c:when>
 		</c:choose>
 	</c:forEach>
Index: lams_tool_assessment/web/pages/learning/results.jsp
===================================================================
diff -u -r3b83454706f152d81a25b6c08444ceb3ce964638 -rf5bcf9323324eb4d5add901d9e7a23c33050533a
--- lams_tool_assessment/web/pages/learning/results.jsp	(.../results.jsp)	(revision 3b83454706f152d81a25b6c08444ceb3ce964638)
+++ lams_tool_assessment/web/pages/learning/results.jsp	(.../results.jsp)	(revision f5bcf9323324eb4d5add901d9e7a23c33050533a)
@@ -41,13 +41,13 @@
 	<c:forEach items="${codeStyles}" var="codeStyle">
 		<c:choose>
 			<c:when test="${codeStyle == 1}">
-				<script type="text/javascript" src="${lams}includes/javascript/codemirror/mode/clike.js"></script>
+				<script type="text/javascript" src="${lams}includes/javascript/codemirror/mode/python.js"></script>
 			</c:when>
 			<c:when test="${codeStyle == 2}">
 				<script type="text/javascript" src="${lams}includes/javascript/codemirror/mode/javascript.js"></script>
 			</c:when>
-			<c:when test="${codeStyle == 3}">
-				<script type="text/javascript" src="${lams}includes/javascript/codemirror/mode/python.js"></script>
+			<c:when test="${codeStyle >= 3}">
+				<script type="text/javascript" src="${lams}includes/javascript/codemirror/mode/clike.js"></script>
 			</c:when>
 		</c:choose>
 	</c:forEach>
Index: lams_tool_assessment/web/pages/learning/results/essay.jsp
===================================================================
diff -u -r3b83454706f152d81a25b6c08444ceb3ce964638 -rf5bcf9323324eb4d5add901d9e7a23c33050533a
--- lams_tool_assessment/web/pages/learning/results/essay.jsp	(.../essay.jsp)	(revision 3b83454706f152d81a25b6c08444ceb3ce964638)
+++ lams_tool_assessment/web/pages/learning/results/essay.jsp	(.../essay.jsp)	(revision f5bcf9323324eb4d5add901d9e7a23c33050533a)
@@ -88,15 +88,9 @@
 									<c:when test="${empty question.codeStyle}">
 										<c:out value="${answer}" escapeXml="false" /> 
 									</c:when>
-									<c:when test="${question.codeStyle == 1}">
-										<pre class="code-style" data-lang="text/x-java">${answer}</pre>
-									</c:when>
-									<c:when test="${question.codeStyle == 2}">
-										<pre class="code-style" data-lang="text/javascript">${answer}</pre>
-									</c:when>
-									<c:when test="${question.codeStyle == 3}">
-										<pre class="code-style" data-lang="text/x-python">${answer}</pre>
-									</c:when>
+									<c:otherwise>
+										<pre class="code-style" data-lang="${question.codeStyleMime}">${answer}</pre>
+									</c:otherwise>
 								</c:choose>
 							</td>
 						</tr>
Index: lams_tool_assessment/web/pages/monitoring/monitoring.jsp
===================================================================
diff -u -r3b83454706f152d81a25b6c08444ceb3ce964638 -rf5bcf9323324eb4d5add901d9e7a23c33050533a
--- lams_tool_assessment/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 3b83454706f152d81a25b6c08444ceb3ce964638)
+++ lams_tool_assessment/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision f5bcf9323324eb4d5add901d9e7a23c33050533a)
@@ -118,13 +118,13 @@
 		<c:forEach items="${codeStyles}" var="codeStyle">
 			<c:choose>
 				<c:when test="${codeStyle == 1}">
-					<script type="text/javascript" src="${lams}includes/javascript/codemirror/mode/clike.js"></script>
+					<script type="text/javascript" src="${lams}includes/javascript/codemirror/mode/python.js"></script>
 				</c:when>
 				<c:when test="${codeStyle == 2}">
 					<script type="text/javascript" src="${lams}includes/javascript/codemirror/mode/javascript.js"></script>
 				</c:when>
-				<c:when test="${codeStyle == 3}">
-					<script type="text/javascript" src="${lams}includes/javascript/codemirror/mode/python.js"></script>
+				<c:when test="${codeStyle >= 3}">
+					<script type="text/javascript" src="${lams}includes/javascript/codemirror/mode/clike.js"></script>
 				</c:when>
 			</c:choose>
 		</c:forEach>
Index: lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp
===================================================================
diff -u -r3b83454706f152d81a25b6c08444ceb3ce964638 -rf5bcf9323324eb4d5add901d9e7a23c33050533a
--- lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp	(.../questionsummary.jsp)	(revision 3b83454706f152d81a25b6c08444ceb3ce964638)
+++ lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp	(.../questionsummary.jsp)	(revision f5bcf9323324eb4d5add901d9e7a23c33050533a)
@@ -72,13 +72,13 @@
 			<script type="text/javascript" src="${lams}includes/javascript/codemirror/addon/runmode/colorize.js"></script>
 			<c:choose>
 				<c:when test="${questionDto.codeStyle == 1}">
-					<script type="text/javascript" src="${lams}includes/javascript/codemirror/mode/clike.js"></script>
+					<script type="text/javascript" src="${lams}includes/javascript/codemirror/mode/python.js"></script>
 				</c:when>
 				<c:when test="${questionDto.codeStyle == 2}">
 					<script type="text/javascript" src="${lams}includes/javascript/codemirror/mode/javascript.js"></script>
 				</c:when>
-				<c:when test="${questionDto.codeStyle == 3}">
-					<script type="text/javascript" src="${lams}includes/javascript/codemirror/mode/python.js"></script>
+				<c:when test="${questionDto.codeStyle >= 3}">
+					<script type="text/javascript" src="${lams}includes/javascript/codemirror/mode/clike.js"></script>
 				</c:when>
 			</c:choose>
 		</c:if>
Index: lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp
===================================================================
diff -u -r3b83454706f152d81a25b6c08444ceb3ce964638 -rf5bcf9323324eb4d5add901d9e7a23c33050533a
--- lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp	(.../usersummary.jsp)	(revision 3b83454706f152d81a25b6c08444ceb3ce964638)
+++ lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp	(.../usersummary.jsp)	(revision f5bcf9323324eb4d5add901d9e7a23c33050533a)
@@ -52,13 +52,13 @@
 		<c:forEach items="${codeStyles}" var="codeStyle">
 			<c:choose>
 				<c:when test="${codeStyle == 1}">
-					<script type="text/javascript" src="${lams}includes/javascript/codemirror/mode/clike.js"></script>
+					<script type="text/javascript" src="${lams}includes/javascript/codemirror/mode/python.js"></script>
 				</c:when>
 				<c:when test="${codeStyle == 2}">
 					<script type="text/javascript" src="${lams}includes/javascript/codemirror/mode/javascript.js"></script>
 				</c:when>
-				<c:when test="${codeStyle == 3}">
-					<script type="text/javascript" src="${lams}includes/javascript/codemirror/mode/python.js"></script>
+				<c:when test="${codeStyle >= 3}">
+					<script type="text/javascript" src="${lams}includes/javascript/codemirror/mode/clike.js"></script>
 				</c:when>
 			</c:choose>
 		</c:forEach>