diff --git a/Frontend/src/components/common/CodeEditorComponent.vue b/Frontend/src/components/common/CodeEditorComponent.vue
index bc233b7..5087942 100644
--- a/Frontend/src/components/common/CodeEditorComponent.vue
+++ b/Frontend/src/components/common/CodeEditorComponent.vue
@@ -2,7 +2,8 @@
 import { onBeforeUpdate, inject } from 'vue'
 import { Codemirror } from 'vue-codemirror'
 import { oneDark } from '@codemirror/theme-one-dark'
-import { espresso } from 'thememirror';
+import { createTheme} from 'thememirror';
+import {tags as t} from '@lezer/highlight';
 import {xml} from '@codemirror/lang-xml'
 import {json} from '@codemirror/lang-json'
 import {html} from '@codemirror/lang-html'
@@ -18,6 +19,47 @@ const props= defineProps({
     },
 })
 
+const lightTheme = createTheme({
+	variant: 'light',
+	settings: {
+		background: '#FFFFFF',
+		foreground: '#000000',
+		caret: '#000000',
+		selection: '#80C7FF',
+		gutterBackground: '#FFFFFF',
+		gutterForeground: '#00000070',
+		lineHighlight: '#C1E2F840',
+	},
+	styles: [
+		{
+			tag: t.comment,
+			color: '#AAAAAA',
+		},
+		{
+			tag: [t.keyword, t.operator, t.typeName, t.tagName, t.propertyName],
+			color: '#2F6F9F',
+			fontWeight: 'bold',
+		},
+		{
+			tag: [t.attributeName, t.definition(t.propertyName)],
+			color: '#4F9FD0',
+		},
+		{
+			tag: [t.className, t.string, t.special(t.brace)],
+			color: '#CF4F5F',
+		},
+		{
+			tag: t.number,
+			color: '#CF4F5F',
+			fontWeight: 'bold',
+		},
+		{
+			tag: t.variableName,
+			fontWeight: 'bold',
+		},
+	],
+});
+
 const emit = defineEmits(
   [
     'update:updatedCode'
@@ -37,7 +79,7 @@ function selectTheme() {
   if (isDarkModeSet())
     return oneDark;
   else
-    return espresso;
+    return lightTheme;
 }
 
 function isDarkModeSet(){
@@ -83,4 +125,4 @@ function parseLanguage(name: String){
       />
     
   </div>
-</template>
+</template>
\ No newline at end of file
diff --git a/issue_template/bug.md b/issue_template/bug.md
new file mode 100644
index 0000000..8b7acd0
--- /dev/null
+++ b/issue_template/bug.md
@@ -0,0 +1,21 @@
+---
+
+name: "Bug template"    
+about: "This template is for reporting bugs"  
+title: "Bug"    
+
+---
+
+## Description
+*A clear and concise description of the issue.*
+
+### Selected Fields
+- **Engine:** [Specify the engine used]
+- **Version:** [Specify the version]
+- **Tool:** [Specify the currently used tool]
+
+### Data: 
+*Paste used xml/xslt/json etc...*
+
+## Additional Context
+*Any other information that might help with this issue.*
diff --git a/issue_template/feature.md b/issue_template/feature.md
new file mode 100644
index 0000000..3c491d9
--- /dev/null
+++ b/issue_template/feature.md
@@ -0,0 +1,10 @@
+---
+
+name: "Feature request template"    
+about: "This template is for requesting features"    
+title: "Feature request" 
+
+---
+
+## Feature Request 
+*Describe the feature you’d like to see and why it’s useful.*