UI fix for UHD monitors

Add tsc notes
More work on debugger
2025-12-13 22:59:02 +00:00 · 2020-09-14 20:33:09 -04:00 · 2020-09-14 20:32:49 -04:00 · 2020-08-09 21:18:30 -04:00 · 2020-08-09 20:26:42 -04:00 · 2020-08-01 21:22:13 -04:00
519 changed files with 14712 additions and 29662 deletions
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,5 +1,5 @@
-Server/src/main/resources/static/css/bootstrap4-neon-glow.min linguist-vendored
-Server/src/main/resources/static/css/bootstrap-grid.min linguist-vendored
-Server/src/main/resources/static/css/bootstrap-reboot.min linguist-vendored
-Server/src/main/resources/static/js/* linguist-vendored
-Server/src/main/resources/static/js/ace/* linguist-vendored
+src/main/resources/static/css/bootstrap4-neon-glow.min linguist-vendored
+src/main/resources/static/css/bootstrap-grid.min linguist-vendored
+src/main/resources/static/css/bootstrap-reboot.min linguist-vendored
+src/main/resources/static/js/* linguist-vendored
+src/main/resources/static/js/ace/* linguist-vendored
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,4 @@

-plugins/Plugin NPC.jar
-plugins/Plugin Misc HW.jar
-plugins/Plant.jar
-plugins/Cubot.jar
 .idea/*
 mar.log
 mar.log.lck
@@ -13,10 +9,10 @@ plugins/*.jar
 save.json
 Server/Server.iml
 target/*
-Server/Server.iml
-Server/src/main/java/META-INF/MANIFEST.MF
+src/main/java/META-INF/MANIFEST.MF
+src/main/resources/static/js/mar.js
 .settings
 .project
 .classpath
 # VSCode Workspace
-.vscode/
+.vscode/
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -8,12 +8,7 @@ Here small unordered list of guidelines to read before creating a pull request
 - Use java <= 1.8 features
 - Please follow [Google's Java style guide](https://google.github.io/styleguide/javaguide.html)
 - Constants (e.g. the energy cost of an in-game action) should be loaded from config.properties
- The project is separated into multiple modules, the `Server` module and its plugins. Plugins should 
-not depend on another plugin to compile or to run.
-(e.g. NPC plugin shouldn't import `net.simon987.biomassplugin` )
- Use `Logmanager.LOGGER` to log messages to the console. Use `.fine()` for debugging messages and `.info()` for 
+- Use `Logmanager.LOGGER` to log messages to the console. Use `.fine()` for debugging messages and `.info()` for 
 info for more important messages 
 that are not too frequently used.
- Do not submit a pull request for a new feature that has not been approved 
-by [simon987](https://github.com/simon987) in an Issue beforehand
 - Please state what tests have been performed in the pull request
--- a/2
+++ b/2
@@ -3,4 +3,4 @@ COPY /. /app/
 WORKDIR /app
 RUN mvn package
 WORKDIR /app/target
-CMD ["java", "-jar", "/app/target/server-1.4a.jar"]
+CMD ["java", "-jar", "/app/target/server-1.6a.jar"]
--- a/Cubot/Plugin
+++ b/Cubot/Plugin
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="Spring" name="Spring">
-      <configuration />
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="Server" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-text:1.6" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.8.1" level="project" />
-    <orderEntry type="library" name="Maven: org.mongodb:mongodb-driver-sync:3.9.1" level="project" />
-    <orderEntry type="library" name="Maven: org.mongodb:bson:3.9.1" level="project" />
-    <orderEntry type="library" name="Maven: org.mongodb:mongodb-driver-core:3.9.1" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-core:5.1.5.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.1.6.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.1.6.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.1.6.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.1.6.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.1.6.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.1.6.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.sparkjava:spark-core:2.8.0" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-server:9.4.12.v20180830" level="project" />
-    <orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:3.1.0" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-http:9.4.12.v20180830" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-util:9.4.12.v20180830" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-io:9.4.12.v20180830" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-webapp:9.4.12.v20180830" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-xml:9.4.12.v20180830" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-servlet:9.4.12.v20180830" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-security:9.4.12.v20180830" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-server:9.4.12.v20180830" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-common:9.4.12.v20180830" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-client:9.4.12.v20180830" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-client:9.4.12.v20180830" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-servlet:9.4.12.v20180830" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-api:9.4.12.v20180830" level="project" />
-    <orderEntry type="library" name="Maven: com.sparkjava:spark-template-velocity:2.7.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.velocity:velocity:1.7" level="project" />
-    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" />
-    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.4" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-simple:1.7.25" level="project" />
-    <orderEntry type="library" name="Maven: com.googlecode.json-simple:json-simple:1.1.1" level="project" />
-    <orderEntry type="library" name="Maven: junit:junit:4.10" level="project" />
-    <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />
-  </component>
-</module>
--- a/Cubot/pom.xml
+++ b/Cubot/pom.xml
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-	
-	<parent>
-		<groupId>net.simon987.server</groupId>
-		<artifactId>server_root</artifactId>
-        <version>1.4a</version>
-    </parent>
-	
-    <groupId>net.simon987.plugincubot</groupId>
-    <artifactId>plugin-cubot</artifactId>
-    <version>1.4a</version>
-
-
-    <dependencies>
-        <dependency>
-            <groupId>net.simon987.server</groupId>
-            <artifactId>server</artifactId>
-            <version>1.4a</version>
-        </dependency>
-
-
-        <dependency>
-            <groupId>com.googlecode.json-simple</groupId>
-            <artifactId>json-simple</artifactId>
-            <version>1.1.1</version>
-        </dependency>
-    </dependencies>
-
-
-</project>
--- a/Cubot/src/main/java/net/simon987/cubotplugin/CubotPlugin.java
+++ b/Cubot/src/main/java/net/simon987/cubotplugin/CubotPlugin.java
@@ -1,44 +0,0 @@
-package net.simon987.cubotplugin;
-
-import net.simon987.cubotplugin.event.*;
-import net.simon987.server.GameServer;
-import net.simon987.server.game.objects.GameRegistry;
-import net.simon987.server.logging.LogManager;
-import net.simon987.server.plugin.ServerPlugin;
-
-public class CubotPlugin extends ServerPlugin {
-
-
-    @Override
-    public void init(GameServer gameServer) {
-        listeners.add(new CpuInitialisationListener());
-        listeners.add(new UserCreationListener());
-        //Debug commands
-        listeners.add(new ChargeShieldCommandListener());
-        listeners.add(new SetInventoryPosition());
-        listeners.add(new PutItemCommandListener());
-        listeners.add(new PopItemCommandListener());
-        //Leaderboard
-        listeners.add(new DeathListener());
-        listeners.add(new WalkListener());
-
-        GameRegistry registry = gameServer.getRegistry();
-
-        registry.registerGameObject(Cubot.class);
-
-        registry.registerHardware(CubotLeg.class);
-        registry.registerHardware(CubotLaser.class);
-        registry.registerHardware(CubotLidar.class);
-        registry.registerHardware(CubotDrill.class);
-        registry.registerHardware(CubotInventory.class);
-        registry.registerHardware(CubotKeyboard.class);
-        registry.registerHardware(CubotHologram.class);
-        registry.registerHardware(CubotBattery.class);
-        registry.registerHardware(CubotFloppyDrive.class);
-        registry.registerHardware(CubotComPort.class);
-        registry.registerHardware(CubotShield.class);
-        registry.registerHardware(CubotCore.class);
-
-        LogManager.LOGGER.info("(Cubot Plugin) Initialised Cubot plugin");
-    }
-}
--- a/Cubot/src/main/resources/plugin.properties
+++ b/Cubot/src/main/resources/plugin.properties
@@ -1,3 +0,0 @@
-classpath=net.simon987.cubotplugin.CubotPlugin
-name=Cubot Plugin
-version=1.0
--- a/Cubot/test/net/simon987/cubotplugin/CubotTest.java
+++ b/Cubot/test/net/simon987/cubotplugin/CubotTest.java
@@ -1,12 +0,0 @@
-package net.simon987.cubotplugin;
-
-
-import org.junit.Test;
-
-public class CubotTest {
-
-    @Test
-    public void test(){
-
-    }
-}
--- a/HW/Plugin
+++ b/HW/Plugin
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="Spring" name="Spring">
-      <configuration />
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="Server" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-text:1.6" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.8.1" level="project" />
-    <orderEntry type="library" name="Maven: org.mongodb:mongodb-driver-sync:3.9.1" level="project" />
-    <orderEntry type="library" name="Maven: org.mongodb:bson:3.9.1" level="project" />
-    <orderEntry type="library" name="Maven: org.mongodb:mongodb-driver-core:3.9.1" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-core:5.1.5.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.1.6.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.1.6.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.1.6.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.1.6.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.1.6.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.1.6.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.sparkjava:spark-core:2.8.0" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-server:9.4.12.v20180830" level="project" />
-    <orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:3.1.0" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-http:9.4.12.v20180830" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-util:9.4.12.v20180830" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-io:9.4.12.v20180830" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-webapp:9.4.12.v20180830" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-xml:9.4.12.v20180830" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-servlet:9.4.12.v20180830" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-security:9.4.12.v20180830" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-server:9.4.12.v20180830" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-common:9.4.12.v20180830" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-client:9.4.12.v20180830" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-client:9.4.12.v20180830" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-servlet:9.4.12.v20180830" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-api:9.4.12.v20180830" level="project" />
-    <orderEntry type="library" name="Maven: com.sparkjava:spark-template-velocity:2.7.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.velocity:velocity:1.7" level="project" />
-    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" />
-    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.4" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-simple:1.7.25" level="project" />
-    <orderEntry type="library" name="Maven: com.googlecode.json-simple:json-simple:1.1.1" level="project" />
-    <orderEntry type="library" name="Maven: junit:junit:4.10" level="project" />
-    <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />
-  </component>
-</module>
--- a/HW/pom.xml
+++ b/HW/pom.xml
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-	<parent>
-		<groupId>net.simon987.server</groupId>
-		<artifactId>server_root</artifactId>
-        <version>1.4a</version>
-    </parent>
-	
-    <groupId>net.simon987.pluginmischw</groupId>
-    <artifactId>plugin-misc-hw</artifactId>
-    <version>1.4a</version>
-
-    <dependencies>
-        <dependency>
-            <groupId>net.simon987.server</groupId>
-            <artifactId>server</artifactId>
-            <version>1.4a</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.googlecode.json-simple</groupId>
-            <artifactId>json-simple</artifactId>
-            <version>1.1.1</version>
-        </dependency>
-
-    </dependencies>
-
-</project>
--- a/HW/src/main/java/net/simon987/mischwplugin/MiscHWPlugin.java
+++ b/HW/src/main/java/net/simon987/mischwplugin/MiscHWPlugin.java
@@ -1,26 +0,0 @@
-package net.simon987.mischwplugin;
-
-import net.simon987.mischwplugin.event.CpuInitialisationListener;
-import net.simon987.server.GameServer;
-import net.simon987.server.game.objects.GameRegistry;
-import net.simon987.server.logging.LogManager;
-import net.simon987.server.plugin.ServerPlugin;
-
-/**
- * Plugin that adds miscellaneous hardware to the game
- */
-public class MiscHWPlugin extends ServerPlugin {
-
-
-    @Override
-    public void init(GameServer gameServer) {
-        listeners.add(new CpuInitialisationListener());
-
-        GameRegistry registry = gameServer.getRegistry();
-
-        registry.registerHardware(RandomNumberGenerator.class);
-        registry.registerHardware(Clock.class);
-
-        LogManager.LOGGER.info("(Mist HW Plugin) Initialised Misc Hardware Plugin");
-    }
-}
--- a/HW/src/main/java/net/simon987/mischwplugin/event/CpuInitialisationListener.java
+++ b/HW/src/main/java/net/simon987/mischwplugin/event/CpuInitialisationListener.java
@@ -1,33 +0,0 @@
-package net.simon987.mischwplugin.event;
-
-import net.simon987.mischwplugin.Clock;
-import net.simon987.mischwplugin.RandomNumberGenerator;
-import net.simon987.server.assembly.CPU;
-import net.simon987.server.event.CpuInitialisationEvent;
-import net.simon987.server.event.GameEvent;
-import net.simon987.server.event.GameEventListener;
-import net.simon987.server.game.objects.HardwareHost;
-
-public class CpuInitialisationListener implements GameEventListener {
-
-    @Override
-    public Class getListenedEventType() {
-        return CpuInitialisationEvent.class;
-    }
-
-    @Override
-    public void handle(GameEvent event) {
-
-        CPU cpu = (CPU) event.getSource();
-        HardwareHost cubot = (HardwareHost) ((CpuInitialisationEvent) event).getUnit();
-        cpu.setHardwareHost(cubot);
-
-        RandomNumberGenerator rngHW = new RandomNumberGenerator();
-        rngHW.setCpu(cpu);
-        Clock clock = new Clock();
-        clock.setCpu(cpu);
-
-        cpu.getHardwareHost().attachHardware(rngHW, RandomNumberGenerator.DEFAULT_ADDRESS);
-        cpu.getHardwareHost().attachHardware(clock, Clock.DEFAULT_ADDRESS);
-    }
-}
--- a/HW/src/main/resources/plugin.properties
+++ b/HW/src/main/resources/plugin.properties
@@ -1,3 +0,0 @@
-classpath=net.simon987.mischwplugin.MiscHWPlugin
-name=Misc HW Plugin
-version=1.0
--- a/NPC/Plugin
+++ b/NPC/Plugin
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="Spring" name="Spring">
-      <configuration />
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Maven: com.googlecode.json-simple:json-simple:1.1.1" level="project" />
-    <orderEntry type="library" name="Maven: junit:junit:4.10" level="project" />
-    <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />
-    <orderEntry type="module" module-name="Server" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-text:1.6" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.8.1" level="project" />
-    <orderEntry type="library" name="Maven: org.mongodb:mongodb-driver-sync:3.9.1" level="project" />
-    <orderEntry type="library" name="Maven: org.mongodb:bson:3.9.1" level="project" />
-    <orderEntry type="library" name="Maven: org.mongodb:mongodb-driver-core:3.9.1" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-core:5.1.5.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.1.6.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.1.6.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.1.6.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.1.6.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.1.6.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.1.6.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.sparkjava:spark-core:2.8.0" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-server:9.4.12.v20180830" level="project" />
-    <orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:3.1.0" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-http:9.4.12.v20180830" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-util:9.4.12.v20180830" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-io:9.4.12.v20180830" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-webapp:9.4.12.v20180830" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-xml:9.4.12.v20180830" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-servlet:9.4.12.v20180830" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-security:9.4.12.v20180830" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-server:9.4.12.v20180830" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-common:9.4.12.v20180830" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-client:9.4.12.v20180830" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-client:9.4.12.v20180830" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-servlet:9.4.12.v20180830" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-api:9.4.12.v20180830" level="project" />
-    <orderEntry type="library" name="Maven: com.sparkjava:spark-template-velocity:2.7.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.velocity:velocity:1.7" level="project" />
-    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" />
-    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.4" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-simple:1.7.25" level="project" />
-  </component>
-</module>
--- a/NPC/pom.xml
+++ b/NPC/pom.xml
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-	
-	<parent>
-		<groupId>net.simon987.server</groupId>
-		<artifactId>server_root</artifactId>
-        <version>1.4a</version>
-    </parent>
-
-    <groupId>net.simon987.pluginnpc</groupId>
-    <artifactId>plugin-npc</artifactId>
-    <version>1.4a</version>
-
-
-    <dependencies>
-        <dependency>
-            <groupId>com.googlecode.json-simple</groupId>
-            <artifactId>json-simple</artifactId>
-            <version>1.1.1</version>
-        </dependency>
-
-        <dependency>
-            <groupId>net.simon987.server</groupId>
-            <artifactId>server</artifactId>
-            <version>1.4a</version>
-        </dependency>
-    </dependencies>
-</project>
--- a/NPC/src/main/java/net/simon987/npcplugin/NpcPlugin.java
+++ b/NPC/src/main/java/net/simon987/npcplugin/NpcPlugin.java
@@ -1,93 +0,0 @@
-package net.simon987.npcplugin;
-
-import net.simon987.npcplugin.event.CpuInitialisationListener;
-import net.simon987.npcplugin.event.VaultCompleteListener;
-import net.simon987.npcplugin.event.VaultWorldUpdateListener;
-import net.simon987.npcplugin.event.WorldCreationListener;
-import net.simon987.npcplugin.world.TileVaultFloor;
-import net.simon987.npcplugin.world.TileVaultWall;
-import net.simon987.server.GameServer;
-import net.simon987.server.IServerConfiguration;
-import net.simon987.server.game.objects.GameRegistry;
-import net.simon987.server.logging.LogManager;
-import net.simon987.server.plugin.ServerPlugin;
-import org.bson.Document;
-
-import java.io.InputStream;
-import java.util.Map;
-import java.util.Scanner;
-import java.util.concurrent.ConcurrentHashMap;
-
-public class NpcPlugin extends ServerPlugin {
-
-    public static Map<String, Settlement> settlementMap;
-
-    public static Document DEFAULT_HACKED_NPC;
-
-    @Override
-    public void init(GameServer gameServer) {
-
-        IServerConfiguration configuration = gameServer.getConfig();
-        GameRegistry registry = gameServer.getRegistry();
-
-        listeners.add(new WorldCreationListener(configuration.getInt("settlement_spawn_rate")));
-        listeners.add(new CpuInitialisationListener());
-        listeners.add(new VaultWorldUpdateListener(configuration));
-        listeners.add(new VaultCompleteListener());
-
-        registry.registerGameObject(HarvesterNPC.class);
-        registry.registerGameObject(Factory.class);
-        registry.registerGameObject(RadioTower.class);
-        registry.registerGameObject(VaultDoor.class);
-        registry.registerGameObject(Obstacle.class);
-        registry.registerGameObject(ElectricBox.class);
-        registry.registerGameObject(Portal.class);
-        registry.registerGameObject(VaultExitPortal.class);
-        registry.registerGameObject(HackedNPC.class);
-
-        registry.registerHardware(RadioReceiverHardware.class);
-        registry.registerHardware(NpcBattery.class);
-        registry.registerHardware(NpcInventory.class);
-
-        registry.registerTile(TileVaultFloor.ID, TileVaultFloor.class);
-        registry.registerTile(TileVaultWall.ID, TileVaultWall.class);
-
-        settlementMap = new ConcurrentHashMap<>();
-
-        LogManager.LOGGER.fine("(NPC Plugin) Loading default HackedNPC settings from" +
-                " defaultHackedCubotHardware.json");
-        InputStream is = getClass().getClassLoader().getResourceAsStream("defaultHackedCubotHardware.json");
-        Scanner scanner = new Scanner(is).useDelimiter("\\A");
-        String json = scanner.next();
-        DEFAULT_HACKED_NPC = Document.parse(json);
-
-        LogManager.LOGGER.info("(NPC Plugin) Initialised NPC plugin");
-    }
-
-    @Override
-    public Document mongoSerialise() {
-        Document document = super.mongoSerialise();
-
-        Document settlements = new Document();
-        for (String world : settlementMap.keySet()) {
-            settlements.put(world, settlementMap.get(world).mongoSerialise());
-        }
-
-        document.put("settlement_map", settlements);
-
-        return document;
-    }
-
-    @Override
-    public void load(Document document) {
-        super.load(document);
-
-        Document settlements = (Document) document.get("settlement_map");
-
-        for (String world : settlements.keySet()) {
-            settlementMap.put(world, new Settlement((Document) settlements.get(world)));
-        }
-
-        LogManager.LOGGER.fine(String.format("(%s) Loaded %d settlements", name, settlementMap.size()));
-    }
-}
--- a/NPC/src/main/resources/plugin.properties
+++ b/NPC/src/main/resources/plugin.properties
@@ -1,4 +0,0 @@
-classpath=net.simon987.npcplugin.NpcPlugin
-name=NPC Plugin
-version=1.1
-depend=Cubot Plugin
--- a/Plant/Plugin
+++ b/Plant/Plugin
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="Spring" name="Spring">
-      <configuration />
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Maven: com.googlecode.json-simple:json-simple:1.1.1" level="project" />
-    <orderEntry type="library" name="Maven: junit:junit:4.10" level="project" />
-    <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />
-    <orderEntry type="module" module-name="Server" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-text:1.6" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.8.1" level="project" />
-    <orderEntry type="library" name="Maven: org.mongodb:mongodb-driver-sync:3.9.1" level="project" />
-    <orderEntry type="library" name="Maven: org.mongodb:bson:3.9.1" level="project" />
-    <orderEntry type="library" name="Maven: org.mongodb:mongodb-driver-core:3.9.1" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-core:5.1.5.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.1.6.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.1.6.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.1.6.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.1.6.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.1.6.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.1.6.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.sparkjava:spark-core:2.8.0" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-server:9.4.12.v20180830" level="project" />
-    <orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:3.1.0" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-http:9.4.12.v20180830" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-util:9.4.12.v20180830" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-io:9.4.12.v20180830" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-webapp:9.4.12.v20180830" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-xml:9.4.12.v20180830" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-servlet:9.4.12.v20180830" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-security:9.4.12.v20180830" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-server:9.4.12.v20180830" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-common:9.4.12.v20180830" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-client:9.4.12.v20180830" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-client:9.4.12.v20180830" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-servlet:9.4.12.v20180830" level="project" />
-    <orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-api:9.4.12.v20180830" level="project" />
-    <orderEntry type="library" name="Maven: com.sparkjava:spark-template-velocity:2.7.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.velocity:velocity:1.7" level="project" />
-    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" />
-    <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.4" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-simple:1.7.25" level="project" />
-  </component>
-</module>
--- a/Plant/pom.xml
+++ b/Plant/pom.xml
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>net.simon987.server</groupId>
-        <artifactId>server_root</artifactId>
-        <version>1.4a</version>
-    </parent>
-
-    <groupId>net.simon987.pluginplant</groupId>
-    <artifactId>plugin-biomassBlob</artifactId>
-    <version>1.4a</version>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.googlecode.json-simple</groupId>
-            <artifactId>json-simple</artifactId>
-            <version>1.1.1</version>
-        </dependency>
-
-        <dependency>
-            <groupId>net.simon987.server</groupId>
-            <artifactId>server</artifactId>
-            <version>1.4a</version>
-        </dependency>
-    </dependencies>
-</project>
--- a/Plant/src/main/java/net/simon987/biomassplugin/BiomassPlugin.java
+++ b/Plant/src/main/java/net/simon987/biomassplugin/BiomassPlugin.java
@@ -1,31 +0,0 @@
-package net.simon987.biomassplugin;
-
-import net.simon987.biomassplugin.event.ObjectDeathListener;
-import net.simon987.biomassplugin.event.WorldCreationListener;
-import net.simon987.biomassplugin.event.WorldUpdateListener;
-import net.simon987.server.GameServer;
-import net.simon987.server.IServerConfiguration;
-import net.simon987.server.game.objects.GameRegistry;
-import net.simon987.server.logging.LogManager;
-import net.simon987.server.plugin.ServerPlugin;
-
-
-public class BiomassPlugin extends ServerPlugin {
-
-
-    @Override
-    public void init(GameServer gameServer) {
-
-        IServerConfiguration config = gameServer.getConfig();
-        GameRegistry registry = gameServer.getRegistry();
-
-        listeners.add(new WorldCreationListener());
-        listeners.add(new WorldUpdateListener(config));
-        listeners.add(new ObjectDeathListener(config));
-
-        registry.registerGameObject(BiomassBlob.class);
-        registry.registerItem(ItemBiomass.ID, ItemBiomass.class);
-
-        LogManager.LOGGER.info("(BiomassPlugin) Initialised Biomass plugin");
-    }
-}
--- a/Plant/src/main/resources/plugin.properties
+++ b/Plant/src/main/resources/plugin.properties
@@ -1,4 +0,0 @@
-classpath=net.simon987.biomassplugin.BiomassPlugin
-name=Biomass Plugin
-version=1.0
-depend=NPC Plugin
--- a/Cloud/pom.xml
+++ b/Cloud/pom.xml
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>net.simon987.server</groupId>
-        <artifactId>server_root</artifactId>
-        <version>1.4a</version>
-    </parent>
-
-    <groupId>net.simon987.pluginradioactivecloud</groupId>
-    <artifactId>plugin-radioactiveCloud</artifactId>
-    <version>1.4a</version>
-
-
-    <dependencies>
-        <dependency>
-            <groupId>com.googlecode.json-simple</groupId>
-            <artifactId>json-simple</artifactId>
-            <version>1.1.1</version>
-        </dependency>
-
-        <dependency>
-            <groupId>net.simon987.server</groupId>
-            <artifactId>server</artifactId>
-            <version>1.4a</version>
-        </dependency>
-    </dependencies>
-</project>
--- a/Cloud/src/main/java/net/simon987/pluginradioactivecloud/RadioactiveCloudPlugin.java
+++ b/Cloud/src/main/java/net/simon987/pluginradioactivecloud/RadioactiveCloudPlugin.java
@@ -1,14 +0,0 @@
-package net.simon987.pluginradioactivecloud;
-
-import net.simon987.server.GameServer;
-import net.simon987.server.logging.LogManager;
-import net.simon987.server.plugin.ServerPlugin;
-
-public class RadioactiveCloudPlugin extends ServerPlugin {
-
-    @Override
-    public void init(GameServer gameServer) {
-
-        LogManager.LOGGER.info("(Radioactive cloud Plugin) Initialised Radioactive cloud plugin.");
-    }
-}
--- a/Cloud/src/main/resources/plugin.properties
+++ b/Cloud/src/main/resources/plugin.properties
@@ -1,3 +0,0 @@
-classpath=net.simon987.pluginradioactivecloud.RadioactiveCloudPlugin
-name=Radioactive cloud Plugin
-version=1.4
--- a/README.md
+++ b/README.md
@@ -1,9 +1,10 @@
-# Much-Assembly-Required
+### [Official website](https://muchassemblyrequired.com)

 [![CodeFactor](https://www.codefactor.io/repository/github/simon987/much-assembly-required/badge)](https://www.codefactor.io/repository/github/simon987/much-assembly-required)
 [![Build Status](https://ci.simon987.net/buildStatus/icon?job=Much-Assembly-Required)](https://ci.simon987.net/job/Much-Assembly-Required/)

-**Much Assembly Required** allows you to program the 8086-like microprocessor of a robot in a grid-based multiplayer world. The game is web based so no installation is required. In its current state, players can walk around the game universe and collect Biomass blobs and Iron/copper ore using the online code editor.
+Program the 8086-like microprocessor of a robot in a grid-based multiplayer world. The game is web based so no installation is required.
+In its current state, players can walk around the game universe and collect Biomass blobs & Iron/copper ore using the online code editor.

 ![screenshot from 2017-11-12 13-01-43](https://user-images.githubusercontent.com/7120851/32701793-e5d07e98-c7a9-11e7-9931-f8db7b287994.png)

@@ -19,18 +20,19 @@ Chat: [Slack](https://join.slack.com/t/muchassemblyrequired/shared_invite/enQtMj
 On Ubuntu 16.04:
 ```bash
 sudo apt install git maven openjdk-8-jdk mongodb
+sudo npm install -g typescript
 ```

 On Arch:
 ``` bash
-sudo pacman -S git maven jdk8-opendjk
-yay -S mongodb-bin
+sudo pacman -S git maven mongodb jdk8-opendjk
+sudo npm install -g typescript

 # Don't forget to start mongodb
 sudo systemctl start mongodb.service
 ```

-*If needed, visit [yay installation](https://github.com/Jguer/yay#installation) and [troubleshooting mongodb](https://wiki.archlinux.org/index.php/MongoDB#Troubleshooting).*
+*If needed, visit [troubleshooting mongodb](https://wiki.archlinux.org/index.php/MongoDB#Troubleshooting).*

 **Deploying server**

@@ -44,19 +46,19 @@ mvn package

 # Run
 cd target
-java -jar server-1.4a.jar
+java -jar muchassemblyrequired-*.jar
 ```

 ## Windows (tested on Windows 10)

 Installation instructions:
 1. Download the JDK from [here](http://www.oracle.com/technetwork/java/javase/downloads/index.html).
-Install the JDK and update your PATH and JAVA_HOME environment variables.
+Install the JDK and update your PATH and JAVA_HOME enviroment variables.
 2. Download Maven from [here](https://maven.apache.org/).
-Install Maven (following the README) and update your PATH environment variable.
+Install Maven (following the README) and update your PATH enviroment variable.
 3. Download Mongo DB Community from [here](https://www.mongodb.com/download-center#community).
 Install Mongo DB following the instructions [here](https://docs.mongodb.com/manual/tutorial/install-mongodb-on-windows/).
-Update your PATH environment variable.
+Update your PATH enviroment variable.

 Building instructions:
 ```batch
@@ -75,7 +77,7 @@ mongod
 ```batch
 :: Runs the MAR server
 cd Much-Assembly-Required\target
-java -jar server-1.4a.jar
+java -jar muchassemblyrequired-*.jar
 ```

 ## macOS (tested on Sierra 10.12.6)
@@ -136,7 +138,7 @@ If you do not wish to use the default data directory (/data/db), follow the step

   # Run
   cd target
-   java -jar server-1.4a.jar
+   java -jar muchassemblyrequired-*.jar
   ```

 ## Docker
@@ -155,18 +157,6 @@ application's directory:
 Make sure to change `mongo_address` in `config.properties` to `mongodb`.


-## Vagrant
-### Requirements
-1. [Vagrant](https://www.vagrantup.com/downloads.html)
-2. [VirtualBox](https://www.virtualbox.org/wiki/Downloads)
-
-### Installation
-
-When vagrant is installed, you can build and start this application by running the following
-command inside this application's directory:
-
-`vagrant up`
-
 # Running

 Once the server is running, you should be able to connect to `http://localhost:4567` with your browser
--- a/Server/pom.xml
+++ b/Server/pom.xml
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-
-    <build>
-
-        <plugins>
-            <plugin>
-                <artifactId>maven-resources-plugin</artifactId>
-                <version>3.0.2</version>
-                <executions>
-                    <execution>
-                        <id>default-resources</id>
-                        <!-- here the phase you need -->
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>resources</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>../target/</outputDirectory>
-                            <resources>
-                                <resource>
-                                    <directory>../Server/src/main/resources</directory>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <version>3.6.2</version>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>copy-dependencies</id>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>copy-dependencies</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>../target/libs</outputDirectory>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>3.0.2</version>
-                <configuration>
-                    <outputDirectory>../target</outputDirectory>
-                    <archive>
-                        <manifest>
-                            <mainClass>net.simon987.server.Main</mainClass>
-                            <addClasspath>true</addClasspath>
-                            <classpathPrefix>libs/</classpathPrefix>
-                        </manifest>
-                    </archive>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.7.2</version>
-                <configuration>
-                    <forkMode>never</forkMode>
-                    <workingDirectory>./src/main/resources</workingDirectory>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-    <groupId>net.simon987.server</groupId>
-    <artifactId>server</artifactId>
-    <version>1.4a</version>
-
-    <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.13.1</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.googlecode.json-simple</groupId>
-            <artifactId>json-simple</artifactId>
-            <version>1.1.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-text</artifactId>
-            <version>1.6</version>
-        </dependency>
-        <dependency>
-            <groupId>org.mongodb</groupId>
-            <artifactId>mongodb-driver-sync</artifactId>
-            <version>3.9.1</version>
-        </dependency>
-        <!-- https://mvnrepository.com/artifact/org.springframework.security/spring-security-core -->
-        <dependency>
-            <groupId>org.springframework.security</groupId>
-            <artifactId>spring-security-core</artifactId>
-            <version>5.1.11.RELEASE</version>
-        </dependency>
-        <dependency>
-            <groupId>com.sparkjava</groupId>
-            <artifactId>spark-core</artifactId>
-            <version>2.8.0</version>
-        </dependency>
-        <dependency>
-            <groupId>com.sparkjava</groupId>
-            <artifactId>spark-template-velocity</artifactId>
-            <version>2.7.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-simple</artifactId>
-            <version>1.7.25</version>
-        </dependency>
-
-    </dependencies>
-
-    <properties>
-        <!-- explicitly set build encoding so not altered by build platform defaults -->
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-
-</project>
--- a/Server/src/main/java/net/simon987/server/GameServer.java
+++ b/Server/src/main/java/net/simon987/server/GameServer.java
@@ -1,350 +0,0 @@
-package net.simon987.server;
-
-import com.mongodb.MongoClientException;
-import com.mongodb.client.*;
-import com.mongodb.client.model.ReplaceOptions;
-import net.simon987.server.crypto.CryptoProvider;
-import net.simon987.server.crypto.SecretKeyGenerator;
-import net.simon987.server.event.GameEvent;
-import net.simon987.server.event.GameEventDispatcher;
-import net.simon987.server.event.TickEvent;
-import net.simon987.server.game.GameUniverse;
-import net.simon987.server.game.debug.*;
-import net.simon987.server.game.item.ItemCopper;
-import net.simon987.server.game.item.ItemIron;
-import net.simon987.server.game.objects.GameRegistry;
-import net.simon987.server.game.world.*;
-import net.simon987.server.logging.LogManager;
-import net.simon987.server.plugin.PluginManager;
-import net.simon987.server.plugin.ServerPlugin;
-import net.simon987.server.user.User;
-import net.simon987.server.user.UserManager;
-import net.simon987.server.user.UserStatsHelper;
-import net.simon987.server.websocket.SocketServer;
-import org.bson.Document;
-
-import java.util.ArrayList;
-
-public class GameServer implements Runnable {
-
-    public final static GameServer INSTANCE = new GameServer();
-
-    private GameUniverse gameUniverse;
-    private GameEventDispatcher eventDispatcher;
-    private PluginManager pluginManager;
-
-    private IServerConfiguration config;
-
-    private SocketServer socketServer;
-
-    private int maxExecutionTime;
-
-    private DayNightCycle dayNightCycle;
-
-    private CryptoProvider cryptoProvider;
-
-    private MongoClient mongo;
-
-    private UserManager userManager;
-
-    private UserStatsHelper userStatsHelper;
-
-    private GameRegistry gameRegistry;
-
-    private String secretKey;
-
-    public GameServer() {
-        this.config = new ServerConfiguration("config.properties");
-
-        String connString = String.format("mongodb://%s:%d",
-                config.getString("mongo_address"), config.getInt("mongo_port"));
-        mongo = MongoClients.create(connString);
-        MongoDatabase db = mongo.getDatabase(config.getString("mongo_dbname"));
-
-        MongoCollection<Document> userCollection = db.getCollection("user");
-
-        userManager = new UserManager(userCollection);
-        userStatsHelper = new UserStatsHelper(userCollection);
-
-        gameUniverse = new GameUniverse(config);
-        gameUniverse.setMongo(mongo);
-        gameRegistry = new GameRegistry();
-        pluginManager = new PluginManager(this);
-
-        maxExecutionTime = config.getInt("user_timeout");
-
-        cryptoProvider = new CryptoProvider();
-
-        dayNightCycle = new DayNightCycle();
-
-        SecretKeyGenerator keyGenerator = new SecretKeyGenerator();
-        secretKey = config.getString("secret_key");
-        if (secretKey == null) {
-            secretKey = keyGenerator.generate();
-            config.setString("secret_key", secretKey);
-        }
-
-        if (!pluginManager.loadInFolder("plugins/")) {
-            System.exit(-1);
-        }
-
-        eventDispatcher = new GameEventDispatcher(pluginManager);
-        eventDispatcher.getListeners().add(dayNightCycle);
-
-        //Debug command Listeners
-        eventDispatcher.getListeners().add(new ComPortMsgCommandListener());
-        eventDispatcher.getListeners().add(new CreateWorldCommandListener());
-        eventDispatcher.getListeners().add(new KillAllCommandListener());
-        eventDispatcher.getListeners().add(new MoveObjCommandListener());
-        eventDispatcher.getListeners().add(new ObjInfoCommandListener());
-        eventDispatcher.getListeners().add(new SetTileAtCommandListener());
-        eventDispatcher.getListeners().add(new SpawnObjCommandListener());
-        eventDispatcher.getListeners().add(new TpObjectCommandListener());
-        eventDispatcher.getListeners().add(new UserInfoCommandListener());
-        eventDispatcher.getListeners().add(new HealObjCommandListener());
-        eventDispatcher.getListeners().add(new DamageObjCommandListener());
-        eventDispatcher.getListeners().add(new SetEnergyCommandListener());
-        eventDispatcher.getListeners().add(new SaveGameCommandListener());
-
-        gameRegistry.registerItem(ItemCopper.ID, ItemCopper.class);
-        gameRegistry.registerItem(ItemIron.ID, ItemIron.class);
-
-        gameRegistry.registerTile(TileVoid.ID, TileVoid.class);
-        gameRegistry.registerTile(TilePlain.ID, TilePlain.class);
-        gameRegistry.registerTile(TileWall.ID, TileWall.class);
-        gameRegistry.registerTile(TileCopper.ID, TileCopper.class);
-        gameRegistry.registerTile(TileIron.ID, TileIron.class);
-        gameRegistry.registerTile(TileFluid.ID, TileFluid.class);
-    }
-
-    public GameUniverse getGameUniverse() {
-        return gameUniverse;
-    }
-
-    public GameEventDispatcher getEventDispatcher() {
-        return eventDispatcher;
-    }
-
-    public CryptoProvider getCryptoProvider() {
-        return cryptoProvider;
-    }
-
-    @Override
-    public void run() {
-        LogManager.LOGGER.info("(G) Started game loop");
-
-        long startTime; //Start time of the loop
-        long uTime;     //update time
-        long waitTime;  //time to wait
-
-        boolean running = true;
-
-        while (running) {
-
-            startTime = System.currentTimeMillis();
-
-            tick();
-
-            uTime = System.currentTimeMillis() - startTime;
-            waitTime = config.getInt("tick_length") - uTime;
-
-            try {
-                if (waitTime >= 0) {
-                    Thread.sleep(waitTime);
-                }
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-            }
-        }
-    }
-
-    private void tick() {
-        gameUniverse.incrementTime();
-
-        //Dispatch tick event
-        GameEvent event = new TickEvent(gameUniverse.getTime());
-        eventDispatcher.dispatch(event); //Ignore cancellation
-
-        //Process user code
-        for (User user : gameUniverse.getUsers()) {
-
-            if (user.getControlledUnit() != null && user.getControlledUnit().getCpu() != null) {
-                try {
-
-                    int timeout = Math.min(user.getControlledUnit().getEnergy(), maxExecutionTime);
-
-                    user.getControlledUnit().getCpu().reset();
-                    int cost = user.getControlledUnit().getCpu().execute(timeout);
-                    user.getControlledUnit().spendEnergy(cost);
-                    user.addTime(cost);
-
-                } catch (Exception e) {
-                    LogManager.LOGGER.severe("Error executing " + user.getUsername() + "'s code");
-                    e.printStackTrace();
-                }
-            }
-        }
-
-        //Process each worlds
-        for (World world : gameUniverse.getWorlds()) {
-            if (world.shouldUpdate()) {
-                world.update();
-            }
-        }
-
-        //Save
-        if (gameUniverse.getTime() % config.getInt("save_interval") == 0) {
-            save();
-        }
-
-        socketServer.tick();
-    }
-
-    void load() {
-
-        LogManager.LOGGER.info("Loading all data from MongoDB");
-
-        MongoDatabase db = mongo.getDatabase(config.getString("mongo_dbname"));
-
-        MongoCollection<Document> worlds = db.getCollection("world");
-        MongoCollection<Document> server = db.getCollection("server");
-
-        Document whereQuery = new Document();
-        whereQuery.put("shouldUpdate", true);
-        MongoCursor<Document> cursor = worlds.find(whereQuery).iterator();
-        GameUniverse universe = GameServer.INSTANCE.getGameUniverse();
-        while (cursor.hasNext()) {
-            World w = World.deserialize(cursor.next());
-            universe.addWorld(w);
-        }
-
-        //Load users
-        ArrayList<User> userList = userManager.getUsers();
-        for (User user : userList) {
-            universe.addUser(user);
-        }
-
-        //Load server & plugin data
-        cursor = server.find().iterator();
-        if (cursor.hasNext()) {
-            Document serverObj = cursor.next();
-            gameUniverse.setTime((long) serverObj.get("time"));
-
-            Document plugins = (Document) serverObj.get("plugins");
-
-            for (String pluginName : plugins.keySet()) {
-                ServerPlugin plugin = pluginManager.getPluginByName(pluginName);
-                plugin.load((Document) plugins.get(pluginName));
-            }
-        }
-
-        LogManager.LOGGER.info("Done loading! W:" + GameServer.INSTANCE.getGameUniverse().getWorldCount() +
-                " | U:" + GameServer.INSTANCE.getGameUniverse().getUserCount());
-    }
-
-    public void save() {
-
-        LogManager.LOGGER.info("Saving to MongoDB | W:" + gameUniverse.getWorldCount() + " | U:" + gameUniverse.getUserCount());
-
-        ClientSession session = null;
-        try {
-            try {
-                session = mongo.startSession();
-                session.startTransaction();
-            } catch (MongoClientException e) {
-                LogManager.LOGGER.fine("Could not create mongoDB session, will not use transaction feature. " +
-                        "(This message can be safely ignored)");
-            }
-
-            MongoDatabase db = mongo.getDatabase(config.getString("mongo_dbname"));
-            ReplaceOptions updateOptions = new ReplaceOptions();
-            updateOptions.upsert(true);
-
-            int unloaded_worlds = 0;
-
-            MongoCollection<Document> worlds = db.getCollection("world");
-            MongoCollection<Document> users = db.getCollection("user");
-            MongoCollection<Document> server = db.getCollection("server");
-
-            int insertedWorlds = 0;
-            GameUniverse universe = GameServer.INSTANCE.getGameUniverse();
-            for (World w : universe.getWorlds()) {
-                insertedWorlds++;
-                worlds.replaceOne(new Document("_id", w.getId()), w.mongoSerialise(), updateOptions);
-
-                //If the world should unload, it is removed from the Universe after having been saved.
-                if (w.shouldUnload()) {
-                    unloaded_worlds++;
-                    universe.removeWorld(w);
-                }
-            }
-
-            for (User u : GameServer.INSTANCE.getGameUniverse().getUsers()) {
-                if (!u.isGuest()) {
-                    users.replaceOne(new Document("_id", u.getUsername()), u.mongoSerialise(), updateOptions);
-                }
-            }
-
-            Document serverObj = new Document();
-            serverObj.put("time", gameUniverse.getTime());
-
-            Document plugins = new Document();
-            for (ServerPlugin plugin : pluginManager.getPlugins()) {
-                plugins.put(plugin.getName(), plugin.mongoSerialise());
-            }
-            serverObj.put("plugins", plugins);
-
-            //A constant id ensures only one entry is kept and updated, instead of a new entry created every save.
-            server.replaceOne(new Document("_id", "serverinfo"), serverObj, updateOptions);
-            if (session != null) {
-                session.commitTransaction();
-            }
-
-            LogManager.LOGGER.info("" + insertedWorlds + " worlds saved, " + unloaded_worlds + " unloaded");
-        } catch (Exception e) {
-            LogManager.LOGGER.severe("Problem happened during save function");
-            e.printStackTrace();
-
-            if (session != null) {
-                session.commitTransaction();
-            }
-        }
-    }
-
-    public IServerConfiguration getConfig() {
-        return config;
-    }
-
-    public PluginManager getPluginManager() {
-        return pluginManager;
-    }
-
-    public void setSocketServer(SocketServer socketServer) {
-        this.socketServer = socketServer;
-    }
-
-    public DayNightCycle getDayNightCycle() {
-        return dayNightCycle;
-    }
-
-    public UserManager getUserManager() {
-        return userManager;
-    }
-
-    public UserStatsHelper getUserStatsHelper() {
-        return userStatsHelper;
-    }
-
-    public GameRegistry getRegistry() {
-        return gameRegistry;
-    }
-
-    public String getSecretKey() {
-        return secretKey;
-    }
-
-    public void setSecretKey(String secretKey) {
-        this.secretKey = secretKey;
-        config.setString("secret_key", secretKey);
-    }
-}
--- a/Server/src/main/java/net/simon987/server/assembly/DefaultRegisterSet.java
+++ b/Server/src/main/java/net/simon987/server/assembly/DefaultRegisterSet.java
@@ -1,22 +0,0 @@
-package net.simon987.server.assembly;
-
-/**
- * RegisterSet with default values
- */
-class DefaultRegisterSet extends RegisterSet {
-
-
-    DefaultRegisterSet() {
-        super();
-
-        addRegister(1, new Register("A"));
-        addRegister(2, new Register("B"));
-        addRegister(3, new Register("C"));
-        addRegister(4, new Register("D"));
-        addRegister(5, new Register("X"));
-        addRegister(6, new Register("Y"));
-        addRegister(7, new Register("SP"));
-        addRegister(8, new Register("BP"));
-
-    }
-}
--- a/Server/src/main/java/net/simon987/server/event/GameEventDispatcher.java
+++ b/Server/src/main/java/net/simon987/server/event/GameEventDispatcher.java
@@ -1,43 +0,0 @@
-package net.simon987.server.event;
-
-import net.simon987.server.plugin.PluginManager;
-import net.simon987.server.plugin.ServerPlugin;
-
-import java.util.ArrayList;
-
-
-public class GameEventDispatcher {
-
-    private PluginManager pluginManager;
-
-    private ArrayList<GameEventListener> listeners;
-
-    public GameEventDispatcher(PluginManager pluginManager) {
-        this.pluginManager = pluginManager;
-        listeners = new ArrayList<>(5);
-    }
-
-    public void dispatch(GameEvent event) {
-
-        //Dispatch to 'local' listeners
-        for (GameEventListener listener : listeners) {
-            if (event.getClass().equals(listener.getListenedEventType())) {
-                listener.handle(event);
-            }
-        }
-
-        //Dispatch to plugins
-        for (ServerPlugin plugin : pluginManager.getPlugins()) {
-            for (GameEventListener listener : plugin.getListeners()) {
-                if (event.getClass().equals(listener.getListenedEventType())) {
-                    listener.handle(event);
-                }
-            }
-        }
-
-    }
-
-    public ArrayList<GameEventListener> getListeners() {
-        return listeners;
-    }
-}
--- a/Server/src/main/java/net/simon987/server/plugin/PluginManager.java
+++ b/Server/src/main/java/net/simon987/server/plugin/PluginManager.java
@@ -1,173 +0,0 @@
-package net.simon987.server.plugin;
-
-import net.simon987.server.GameServer;
-import net.simon987.server.logging.LogManager;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.lang.reflect.Constructor;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Properties;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
-
-public class PluginManager {
-
-    private ArrayList<ServerPlugin> loadedPlugins;
-    private ArrayList<ServerPlugin> toLoadPlugins;
-
-    private GameServer gameServer;
-
-    public PluginManager(GameServer gameServer) {
-        this.gameServer = gameServer;
-        this.toLoadPlugins = new ArrayList<>(10);
-        this.loadedPlugins = new ArrayList<>(10);
-    }
-
-    private ServerPlugin load(File pluginFile) {
-
-        LogManager.LOGGER.info("Loading plugin file " + pluginFile.getName());
-
-        ZipFile zipFile = null;
-        try {
-            //Get the plugin config file from the archive
-            zipFile = new ZipFile(pluginFile);
-
-            ZipEntry configEntry = zipFile.getEntry("plugin.properties");
-
-            if (configEntry != null) {
-
-                InputStream stream = zipFile.getInputStream(configEntry);
-                Properties pluginConfig = new Properties();
-                pluginConfig.load(stream);
-
-                ClassLoader loader = URLClassLoader.newInstance(new URL[]{pluginFile.toURI().toURL()});
-                Class<?> aClass = Class.forName(pluginConfig.getProperty("classpath"), true, loader);
-                Class<? extends ServerPlugin> pluginClass = aClass.asSubclass(ServerPlugin.class);
-                Constructor<? extends ServerPlugin> constructor = pluginClass.getConstructor();
-
-                ServerPlugin plugin = constructor.newInstance();
-                plugin.setName(pluginConfig.getProperty("name"));
-                plugin.setVersion(pluginConfig.getProperty("version"));
-
-                String dependStr = pluginConfig.getProperty("depend");
-                if (dependStr != null) {
-                    for (String dep : dependStr.split(",")) {
-                        plugin.dependencies.add(dep.trim());
-                    }
-                }
-
-                return plugin;
-
-            } else {
-                LogManager.LOGGER.severe("Couldn't find plugin.properties in " + pluginFile.getName());
-            }
-
-        } catch (Exception e) {
-            e.printStackTrace();
-
-        } finally {
-            try {
-                if (zipFile != null) {
-                    zipFile.close();
-                }
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * Load all plugins in plugins folder, if it doesn't exist, create it
-     *
-     * @return true if all the plugins could be loaded
-     */
-    public boolean loadInFolder(String dir) {
-
-        File pluginDir = new File(dir);
-        File[] pluginDirListing = pluginDir.listFiles();
-
-        if (pluginDirListing == null) {
-            if (!pluginDir.mkdir()) {
-                LogManager.LOGGER.severe("Couldn't create plugin directory");
-            }
-            return false;
-        }
-
-        for (File pluginFile : pluginDirListing) {
-            if (pluginFile.getName().endsWith(".jar")) {
-                toLoadPlugins.add(load(pluginFile));
-            }
-        }
-
-        while (toLoadPlugins.size() > 0) {
-
-            ServerPlugin plugin = toLoadPlugins.get(0);
-
-            if (!initWithDependencies(plugin)) {
-                LogManager.LOGGER.severe("Plugin " + plugin.name + " has unmet dependencies: " +
-                        Arrays.toString(plugin.dependencies.toArray()));
-                return false;
-            }
-        }
-
-        toLoadPlugins.clear();
-        return true;
-    }
-
-    private boolean initWithDependencies(ServerPlugin plugin) {
-
-        for (String depName : plugin.dependencies) {
-
-            if (!isLoaded(depName)) {
-                ServerPlugin dep = getPluginByName(depName, toLoadPlugins);
-
-                if (dep != null) {
-                    initWithDependencies(dep);
-                } else {
-                    return false;
-                }
-            }
-        }
-
-        initPlugin(plugin);
-        return true;
-    }
-
-    private static ServerPlugin getPluginByName(String name, List<ServerPlugin> plugins) {
-
-        for (ServerPlugin p : plugins) {
-            if (p.name.equals(name)) {
-                return p;
-            }
-        }
-
-        return null;
-    }
-
-    public ServerPlugin getPluginByName(String name) {
-        return PluginManager.getPluginByName(name, loadedPlugins);
-    }
-
-    private boolean isLoaded(String name) {
-        return getPluginByName(name, loadedPlugins) != null;
-    }
-
-    private void initPlugin(ServerPlugin plugin) {
-
-        toLoadPlugins.remove(plugin);
-        loadedPlugins.add(plugin);
-        plugin.init(gameServer);
-    }
-
-    public ArrayList<ServerPlugin> getPlugins() {
-        return loadedPlugins;
-    }
-}
--- a/Server/src/main/java/net/simon987/server/plugin/ServerPlugin.java
+++ b/Server/src/main/java/net/simon987/server/plugin/ServerPlugin.java
@@ -1,73 +0,0 @@
-package net.simon987.server.plugin;
-
-import net.simon987.server.GameServer;
-import net.simon987.server.event.GameEventListener;
-import net.simon987.server.io.MongoSerializable;
-import net.simon987.server.logging.LogManager;
-import org.bson.Document;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public abstract class ServerPlugin implements MongoSerializable {
-
-    /**
-     * Name of the plugin
-     */
-    protected String name;
-
-    /**
-     * Version of the plugin
-     */
-    protected String version;
-
-    /**
-     * List of event listeners
-     */
-    protected List<GameEventListener> listeners = new ArrayList<>(5);
-
-    protected List<String> dependencies = new ArrayList<>();
-
-    /**
-     * Called when the plugin is loaded
-     */
-    public abstract void init(GameServer gameServer);
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getVersion() {
-        return version;
-    }
-
-    public void setVersion(String version) {
-        this.version = version;
-    }
-
-    public List<GameEventListener> getListeners() {
-        return listeners;
-    }
-
-    @Override
-    public Document mongoSerialise() {
-        Document document = new Document();
-
-        document.put("version", version);
-
-        return document;
-    }
-
-    public void load(Document document) {
-
-        LogManager.LOGGER.fine(String.format("(%s) Loading from database", name));
-        if (!version.equals(document.getString("version"))) {
-            LogManager.LOGGER.warning(String.format("(%s) Version mismatch with database!" +
-                    " This could cause problems. %s!=%s", name, version, document.getString("version")));
-        }
-    }
-}
--- a/Server/src/main/resources/static/js/ace/ace.js
+++ b/Server/src/main/resources/static/js/ace/ace.js
--- a/Server/src/main/resources/static/js/ace/ext-searchbox.js
+++ b/Server/src/main/resources/static/js/ace/ext-searchbox.js
@@ -1,511 +0,0 @@
-define("ace/ext/searchbox", ["require", "exports", "module", "ace/lib/dom", "ace/lib/lang", "ace/lib/event", "ace/keyboard/hash_handler", "ace/lib/keys"], function (require, exports, module) {
-    "use strict";
-
-    var dom = require("../lib/dom");
-    var lang = require("../lib/lang");
-    var event = require("../lib/event");
-    var searchboxCss = "\
-.ace_search {\
-background-color: #ddd;\
-color: #666;\
-border: 1px solid #cbcbcb;\
-border-top: 0 none;\
-overflow: hidden;\
-margin: 0;\
-padding: 4px 6px 0 4px;\
-position: absolute;\
-top: 0;\
-z-index: 99;\
-white-space: normal;\
-}\
-.ace_search.left {\
-border-left: 0 none;\
-border-radius: 0px 0px 5px 0px;\
-left: 0;\
-}\
-.ace_search.right {\
-border-radius: 0px 0px 0px 5px;\
-border-right: 0 none;\
-right: 0;\
-}\
-.ace_search_form, .ace_replace_form {\
-margin: 0 20px 4px 0;\
-overflow: hidden;\
-line-height: 1.9;\
-}\
-.ace_replace_form {\
-margin-right: 0;\
-}\
-.ace_search_form.ace_nomatch {\
-outline: 1px solid red;\
-}\
-.ace_search_field {\
-border-radius: 3px 0 0 3px;\
-background-color: white;\
-color: black;\
-border: 1px solid #cbcbcb;\
-border-right: 0 none;\
-box-sizing: border-box!important;\
-outline: 0;\
-padding: 0;\
-font-size: inherit;\
-margin: 0;\
-line-height: inherit;\
-padding: 0 6px;\
-min-width: 17em;\
-vertical-align: top;\
-}\
-.ace_searchbtn {\
-border: 1px solid #cbcbcb;\
-line-height: inherit;\
-display: inline-block;\
-padding: 0 6px;\
-background: #fff;\
-border-right: 0 none;\
-border-left: 1px solid #dcdcdc;\
-cursor: pointer;\
-margin: 0;\
-position: relative;\
-box-sizing: content-box!important;\
-color: #666;\
-}\
-.ace_searchbtn:last-child {\
-border-radius: 0 3px 3px 0;\
-border-right: 1px solid #cbcbcb;\
-}\
-.ace_searchbtn:disabled {\
-background: none;\
-cursor: default;\
-}\
-.ace_searchbtn:hover {\
-background-color: #eef1f6;\
-}\
-.ace_searchbtn.prev, .ace_searchbtn.next {\
-padding: 0px 0.7em\
-}\
-.ace_searchbtn.prev:after, .ace_searchbtn.next:after {\
-content: \"\";\
-border: solid 2px #888;\
-width: 0.5em;\
-height: 0.5em;\
-border-width:  2px 0 0 2px;\
-display:inline-block;\
-transform: rotate(-45deg);\
-}\
-.ace_searchbtn.next:after {\
-border-width: 0 2px 2px 0 ;\
-}\
-.ace_searchbtn_close {\
-background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAcCAYAAABRVo5BAAAAZ0lEQVR42u2SUQrAMAhDvazn8OjZBilCkYVVxiis8H4CT0VrAJb4WHT3C5xU2a2IQZXJjiQIRMdkEoJ5Q2yMqpfDIo+XY4k6h+YXOyKqTIj5REaxloNAd0xiKmAtsTHqW8sR2W5f7gCu5nWFUpVjZwAAAABJRU5ErkJggg==) no-repeat 50% 0;\
-border-radius: 50%;\
-border: 0 none;\
-color: #656565;\
-cursor: pointer;\
-font: 16px/16px Arial;\
-padding: 0;\
-height: 14px;\
-width: 14px;\
-top: 9px;\
-right: 7px;\
-position: absolute;\
-}\
-.ace_searchbtn_close:hover {\
-background-color: #656565;\
-background-position: 50% 100%;\
-color: white;\
-}\
-.ace_button {\
-margin-left: 2px;\
-cursor: pointer;\
-webkit-user-select: none;\
-moz-user-select: none;\
-o-user-select: none;\
-ms-user-select: none;\
-user-select: none;\
-overflow: hidden;\
-opacity: 0.7;\
-border: 1px solid rgba(100,100,100,0.23);\
-padding: 1px;\
-box-sizing:    border-box!important;\
-color: black;\
-}\
-.ace_button:hover {\
-background-color: #eee;\
-opacity:1;\
-}\
-.ace_button:active {\
-background-color: #ddd;\
-}\
-.ace_button.checked {\
-border-color: #3399ff;\
-opacity:1;\
-}\
-.ace_search_options{\
-margin-bottom: 3px;\
-text-align: right;\
-webkit-user-select: none;\
-moz-user-select: none;\
-o-user-select: none;\
-ms-user-select: none;\
-user-select: none;\
-clear: both;\
-}\
-.ace_search_counter {\
-float: left;\
-font-family: arial;\
-padding: 0 8px;\
-}";
-    var HashHandler = require("../keyboard/hash_handler").HashHandler;
-    var keyUtil = require("../lib/keys");
-
-    var MAX_COUNT = 999;
-
-    dom.importCssString(searchboxCss, "ace_searchbox");
-
-    var html = '<div class="ace_search right">\
-    <span action="hide" class="ace_searchbtn_close"></span>\
-    <div class="ace_search_form">\
-        <input class="ace_search_field" placeholder="Search for" spellcheck="false"></input>\
-        <span action="findPrev" class="ace_searchbtn prev"></span>\
-        <span action="findNext" class="ace_searchbtn next"></span>\
-        <span action="findAll" class="ace_searchbtn" title="Alt-Enter">All</span>\
-    </div>\
-    <div class="ace_replace_form">\
-        <input class="ace_search_field" placeholder="Replace with" spellcheck="false"></input>\
-        <span action="replaceAndFindNext" class="ace_searchbtn">Replace</span>\
-        <span action="replaceAll" class="ace_searchbtn">All</span>\
-    </div>\
-    <div class="ace_search_options">\
-        <span action="toggleReplace" class="ace_button" title="Toggle Replace mode"\
-            style="float:left;margin-top:-2px;padding:0 5px;">+</span>\
-        <span class="ace_search_counter"></span>\
-        <span action="toggleRegexpMode" class="ace_button" title="RegExp Search">.*</span>\
-        <span action="toggleCaseSensitive" class="ace_button" title="CaseSensitive Search">Aa</span>\
-        <span action="toggleWholeWords" class="ace_button" title="Whole Word Search">\\b</span>\
-        <span action="searchInSelection" class="ace_button" title="Search In Selection">S</span>\
-    </div>\
-</div>'.replace(/> +/g, ">");
-
-    var SearchBox = function (editor, range, showReplaceForm) {
-        var div = dom.createElement("div");
-        div.innerHTML = html;
-        this.element = div.firstChild;
-
-        this.setSession = this.setSession.bind(this);
-
-        this.$init();
-        this.setEditor(editor);
-    };
-
-    (function () {
-        this.setEditor = function (editor) {
-            editor.searchBox = this;
-            editor.renderer.scroller.appendChild(this.element);
-            this.editor = editor;
-        };
-
-        this.setSession = function (e) {
-            this.searchRange = null;
-            this.$syncOptions(true);
-        };
-
-        this.$initElements = function (sb) {
-            this.searchBox = sb.querySelector(".ace_search_form");
-            this.replaceBox = sb.querySelector(".ace_replace_form");
-            this.searchOption = sb.querySelector("[action=searchInSelection]");
-            this.replaceOption = sb.querySelector("[action=toggleReplace]");
-            this.regExpOption = sb.querySelector("[action=toggleRegexpMode]");
-            this.caseSensitiveOption = sb.querySelector("[action=toggleCaseSensitive]");
-            this.wholeWordOption = sb.querySelector("[action=toggleWholeWords]");
-            this.searchInput = this.searchBox.querySelector(".ace_search_field");
-            this.replaceInput = this.replaceBox.querySelector(".ace_search_field");
-            this.searchCounter = sb.querySelector(".ace_search_counter");
-        };
-
-        this.$init = function () {
-            var sb = this.element;
-
-            this.$initElements(sb);
-
-            var _this = this;
-            event.addListener(sb, "mousedown", function (e) {
-                setTimeout(function () {
-                    _this.activeInput.focus();
-                }, 0);
-                event.stopPropagation(e);
-            });
-            event.addListener(sb, "click", function (e) {
-                var t = e.target || e.srcElement;
-                var action = t.getAttribute("action");
-                if (action && _this[action])
-                    _this[action]();
-                else if (_this.$searchBarKb.commands[action])
-                    _this.$searchBarKb.commands[action].exec(_this);
-                event.stopPropagation(e);
-            });
-
-            event.addCommandKeyListener(sb, function (e, hashId, keyCode) {
-                var keyString = keyUtil.keyCodeToString(keyCode);
-                var command = _this.$searchBarKb.findKeyCommand(hashId, keyString);
-                if (command && command.exec) {
-                    command.exec(_this);
-                    event.stopEvent(e);
-                }
-            });
-
-            this.$onChange = lang.delayedCall(function () {
-                _this.find(false, false);
-            });
-
-            event.addListener(this.searchInput, "input", function () {
-                _this.$onChange.schedule(20);
-            });
-            event.addListener(this.searchInput, "focus", function () {
-                _this.activeInput = _this.searchInput;
-                _this.searchInput.value && _this.highlight();
-            });
-            event.addListener(this.replaceInput, "focus", function () {
-                _this.activeInput = _this.replaceInput;
-                _this.searchInput.value && _this.highlight();
-            });
-        };
-        this.$closeSearchBarKb = new HashHandler([{
-            bindKey: "Esc",
-            name: "closeSearchBar",
-            exec: function (editor) {
-                editor.searchBox.hide();
-            }
-        }]);
-        this.$searchBarKb = new HashHandler();
-        this.$searchBarKb.bindKeys({
-            "Ctrl-f|Command-f": function (sb) {
-                var isReplace = sb.isReplace = !sb.isReplace;
-                sb.replaceBox.style.display = isReplace ? "" : "none";
-                sb.replaceOption.checked = false;
-                sb.$syncOptions();
-                sb.searchInput.focus();
-            },
-            "Ctrl-H|Command-Option-F": function (sb) {
-                sb.replaceOption.checked = true;
-                sb.$syncOptions();
-                sb.replaceInput.focus();
-            },
-            "Ctrl-G|Command-G": function (sb) {
-                sb.findNext();
-            },
-            "Ctrl-Shift-G|Command-Shift-G": function (sb) {
-                sb.findPrev();
-            },
-            "esc": function (sb) {
-                setTimeout(function () {
-                    sb.hide();
-                });
-            },
-            "Return": function (sb) {
-                if (sb.activeInput == sb.replaceInput)
-                    sb.replace();
-                sb.findNext();
-            },
-            "Shift-Return": function (sb) {
-                if (sb.activeInput == sb.replaceInput)
-                    sb.replace();
-                sb.findPrev();
-            },
-            "Alt-Return": function (sb) {
-                if (sb.activeInput == sb.replaceInput)
-                    sb.replaceAll();
-                sb.findAll();
-            },
-            "Tab": function (sb) {
-                (sb.activeInput == sb.replaceInput ? sb.searchInput : sb.replaceInput).focus();
-            }
-        });
-
-        this.$searchBarKb.addCommands([{
-            name: "toggleRegexpMode",
-            bindKey: {win: "Alt-R|Alt-/", mac: "Ctrl-Alt-R|Ctrl-Alt-/"},
-            exec: function (sb) {
-                sb.regExpOption.checked = !sb.regExpOption.checked;
-                sb.$syncOptions();
-            }
-        }, {
-            name: "toggleCaseSensitive",
-            bindKey: {win: "Alt-C|Alt-I", mac: "Ctrl-Alt-R|Ctrl-Alt-I"},
-            exec: function (sb) {
-                sb.caseSensitiveOption.checked = !sb.caseSensitiveOption.checked;
-                sb.$syncOptions();
-            }
-        }, {
-            name: "toggleWholeWords",
-            bindKey: {win: "Alt-B|Alt-W", mac: "Ctrl-Alt-B|Ctrl-Alt-W"},
-            exec: function (sb) {
-                sb.wholeWordOption.checked = !sb.wholeWordOption.checked;
-                sb.$syncOptions();
-            }
-        }, {
-            name: "toggleReplace",
-            exec: function (sb) {
-                sb.replaceOption.checked = !sb.replaceOption.checked;
-                sb.$syncOptions();
-            }
-        }, {
-            name: "searchInSelection",
-            exec: function (sb) {
-                sb.searchOption.checked = !sb.searchRange;
-                sb.setSearchRange(sb.searchOption.checked && sb.editor.getSelectionRange());
-                sb.$syncOptions();
-            }
-        }]);
-
-        this.setSearchRange = function (range) {
-            this.searchRange = range;
-            if (range) {
-                this.searchRangeMarker = this.editor.session.addMarker(range, "ace_active-line");
-            } else if (this.searchRangeMarker) {
-                this.editor.session.removeMarker(this.searchRangeMarker);
-                this.searchRangeMarker = null;
-            }
-        };
-
-        this.$syncOptions = function (preventScroll) {
-            dom.setCssClass(this.replaceOption, "checked", this.searchRange);
-            dom.setCssClass(this.searchOption, "checked", this.searchOption.checked);
-            this.replaceOption.textContent = this.replaceOption.checked ? "-" : "+";
-            dom.setCssClass(this.regExpOption, "checked", this.regExpOption.checked);
-            dom.setCssClass(this.wholeWordOption, "checked", this.wholeWordOption.checked);
-            dom.setCssClass(this.caseSensitiveOption, "checked", this.caseSensitiveOption.checked);
-            this.replaceBox.style.display = this.replaceOption.checked ? "" : "none";
-            this.find(false, false, preventScroll);
-        };
-
-        this.highlight = function (re) {
-            this.editor.session.highlight(re || this.editor.$search.$options.re);
-            this.editor.renderer.updateBackMarkers();
-        };
-        this.find = function (skipCurrent, backwards, preventScroll) {
-            var range = this.editor.find(this.searchInput.value, {
-                skipCurrent: skipCurrent,
-                backwards: backwards,
-                wrap: true,
-                regExp: this.regExpOption.checked,
-                caseSensitive: this.caseSensitiveOption.checked,
-                wholeWord: this.wholeWordOption.checked,
-                preventScroll: preventScroll,
-                range: this.searchRange
-            });
-            var noMatch = !range && this.searchInput.value;
-            dom.setCssClass(this.searchBox, "ace_nomatch", noMatch);
-            this.editor._emit("findSearchBox", {match: !noMatch});
-            this.highlight();
-            this.updateCounter();
-        };
-        this.updateCounter = function () {
-            var editor = this.editor;
-            var regex = editor.$search.$options.re;
-            var all = 0;
-            var before = 0;
-            if (regex) {
-                var value = this.searchRange
-                    ? editor.session.getTextRange(this.searchRange)
-                    : editor.getValue();
-
-                var offset = editor.session.doc.positionToIndex(editor.selection.anchor);
-                if (this.searchRange)
-                    offset -= editor.session.doc.positionToIndex(this.searchRange.start);
-
-                var last = regex.lastIndex = 0;
-                var m;
-                while ((m = regex.exec(value))) {
-                    all++;
-                    last = m.index;
-                    if (last <= offset)
-                        before++;
-                    if (all > MAX_COUNT)
-                        break;
-                    if (!m[0]) {
-                        regex.lastIndex = last += 1;
-                        if (last >= value.length)
-                            break;
-                    }
-                }
-            }
-            this.searchCounter.textContent = before + " of " + (all > MAX_COUNT ? MAX_COUNT + "+" : all);
-        };
-        this.findNext = function () {
-            this.find(true, false);
-        };
-        this.findPrev = function () {
-            this.find(true, true);
-        };
-        this.findAll = function () {
-            var range = this.editor.findAll(this.searchInput.value, {
-                regExp: this.regExpOption.checked,
-                caseSensitive: this.caseSensitiveOption.checked,
-                wholeWord: this.wholeWordOption.checked
-            });
-            var noMatch = !range && this.searchInput.value;
-            dom.setCssClass(this.searchBox, "ace_nomatch", noMatch);
-            this.editor._emit("findSearchBox", {match: !noMatch});
-            this.highlight();
-            this.hide();
-        };
-        this.replace = function () {
-            if (!this.editor.getReadOnly())
-                this.editor.replace(this.replaceInput.value);
-        };
-        this.replaceAndFindNext = function () {
-            if (!this.editor.getReadOnly()) {
-                this.editor.replace(this.replaceInput.value);
-                this.findNext();
-            }
-        };
-        this.replaceAll = function () {
-            if (!this.editor.getReadOnly())
-                this.editor.replaceAll(this.replaceInput.value);
-        };
-
-        this.hide = function () {
-            this.active = false;
-            this.setSearchRange(null);
-            this.editor.off("changeSession", this.setSession);
-
-            this.element.style.display = "none";
-            this.editor.keyBinding.removeKeyboardHandler(this.$closeSearchBarKb);
-            this.editor.focus();
-        };
-        this.show = function (value, isReplace) {
-            this.active = true;
-            this.editor.on("changeSession", this.setSession);
-            this.element.style.display = "";
-            this.replaceOption.checked = isReplace;
-
-            if (value)
-                this.searchInput.value = value;
-
-            this.searchInput.focus();
-            this.searchInput.select();
-
-            this.editor.keyBinding.addKeyboardHandler(this.$closeSearchBarKb);
-
-            this.$syncOptions(true);
-        };
-
-        this.isFocused = function () {
-            var el = document.activeElement;
-            return el == this.searchInput || el == this.replaceInput;
-        };
-    }).call(SearchBox.prototype);
-
-    exports.SearchBox = SearchBox;
-
-    exports.Search = function (editor, isReplace) {
-        var sb = editor.searchBox || new SearchBox(editor);
-        sb.show(editor.session.getTextRange(), isReplace);
-    };
-
-});
-(function () {
-    window.require(["ace/ext/searchbox"], function () {
-    });
-})();
-            
--- a/Server/src/main/resources/static/js/ace/theme-ambiance.js
+++ b/Server/src/main/resources/static/js/ace/theme-ambiance.js
--- a/Server/src/main/resources/static/js/ace/theme-chaos.js
+++ b/Server/src/main/resources/static/js/ace/theme-chaos.js
@@ -1,156 +0,0 @@
-define("ace/theme/chaos", ["require", "exports", "ace/lib/dom"], function (require, exports) {
-
-    exports.isDark = true;
-    exports.cssClass = "ace-chaos";
-    exports.cssText = ".ace-chaos .ace_gutter {\
-background: #141414;\
-color: #595959;\
-border-right: 1px solid #282828;\
-}\
-.ace-chaos .ace_gutter-cell.ace_warning {\
-background-image: none;\
-background: #FC0;\
-border-left: none;\
-padding-left: 0;\
-color: #000;\
-}\
-.ace-chaos .ace_gutter-cell.ace_error {\
-background-position: -6px center;\
-background-image: none;\
-background: #F10;\
-border-left: none;\
-padding-left: 0;\
-color: #000;\
-}\
-.ace-chaos .ace_print-margin {\
-border-left: 1px solid #555;\
-right: 0;\
-background: #1D1D1D;\
-}\
-.ace-chaos {\
-background-color: #161616;\
-color: #E6E1DC;\
-}\
-.ace-chaos .ace_cursor {\
-border-left: 2px solid #FFFFFF;\
-}\
-.ace-chaos .ace_cursor.ace_overwrite {\
-border-left: 0px;\
-border-bottom: 1px solid #FFFFFF;\
-}\
-.ace-chaos .ace_marker-layer .ace_selection {\
-background: #494836;\
-}\
-.ace-chaos .ace_marker-layer .ace_step {\
-background: rgb(198, 219, 174);\
-}\
-.ace-chaos .ace_marker-layer .ace_bracket {\
-margin: -1px 0 0 -1px;\
-border: 1px solid #FCE94F;\
-}\
-.ace-chaos .ace_marker-layer .ace_active-line {\
-background: #333;\
-}\
-.ace-chaos .ace_gutter-active-line {\
-background-color: #222;\
-}\
-.ace-chaos .ace_invisible {\
-color: #404040;\
-}\
-.ace-chaos .ace_keyword {\
-color:#00698F;\
-}\
-.ace-chaos .ace_keyword.ace_operator {\
-color:#FF308F;\
-}\
-.ace-chaos .ace_constant {\
-color:#1EDAFB;\
-}\
-.ace-chaos .ace_constant.ace_language {\
-color:#FDC251;\
-}\
-.ace-chaos .ace_constant.ace_library {\
-color:#8DFF0A;\
-}\
-.ace-chaos .ace_constant.ace_numeric {\
-color:#58C554;\
-}\
-.ace-chaos .ace_invalid {\
-color:#FFFFFF;\
-background-color:#990000;\
-}\
-.ace-chaos .ace_invalid.ace_deprecated {\
-color:#FFFFFF;\
-background-color:#990000;\
-}\
-.ace-chaos .ace_support {\
-color: #999;\
-}\
-.ace-chaos .ace_support.ace_function {\
-color:#00AEEF;\
-}\
-.ace-chaos .ace_function {\
-color:#00AEEF;\
-}\
-.ace-chaos .ace_string {\
-color:#58C554;\
-}\
-.ace-chaos .ace_comment {\
-color:#555;\
-font-style:italic;\
-padding-bottom: 0px;\
-}\
-.ace-chaos .ace_variable {\
-color:#997744;\
-}\
-.ace-chaos .ace_meta.ace_tag {\
-color:#BE53E6;\
-}\
-.ace-chaos .ace_entity.ace_other.ace_attribute-name {\
-color:#FFFF89;\
-}\
-.ace-chaos .ace_markup.ace_underline {\
-text-decoration: underline;\
-}\
-.ace-chaos .ace_fold-widget {\
-text-align: center;\
-}\
-.ace-chaos .ace_fold-widget:hover {\
-color: #777;\
-}\
-.ace-chaos .ace_fold-widget.ace_start,\
-.ace-chaos .ace_fold-widget.ace_end,\
-.ace-chaos .ace_fold-widget.ace_closed{\
-background: none;\
-border: none;\
-box-shadow: none;\
-}\
-.ace-chaos .ace_fold-widget.ace_start:after {\
-content: '▾'\
-}\
-.ace-chaos .ace_fold-widget.ace_end:after {\
-content: '▴'\
-}\
-.ace-chaos .ace_fold-widget.ace_closed:after {\
-content: '‣'\
-}\
-.ace-chaos .ace_indent-guide {\
-border-right:1px dotted #333;\
-margin-right:-1px;\
-}\
-.ace-chaos .ace_fold { \
-background: #222; \
-border-radius: 3px; \
-color: #7AF; \
-border: none; \
-}\
-.ace-chaos .ace_fold:hover {\
-background: #CCC; \
-color: #000;\
-}\
-";
-
-    var dom = require("../lib/dom");
-    dom.importCssString(exports.cssText, exports.cssClass);
-
-});
--- a/Server/src/main/resources/static/js/ace/theme-chrome.js
+++ b/Server/src/main/resources/static/js/ace/theme-chrome.js
@@ -1,128 +0,0 @@
-define("ace/theme/chrome", ["require", "exports", "ace/lib/dom"], function (require, exports) {
-
-    exports.isDark = false;
-    exports.cssClass = "ace-chrome";
-    exports.cssText = ".ace-chrome .ace_gutter {\
-background: #ebebeb;\
-color: #333;\
-overflow : hidden;\
-}\
-.ace-chrome .ace_print-margin {\
-width: 1px;\
-background: #e8e8e8;\
-}\
-.ace-chrome {\
-background-color: #FFFFFF;\
-color: black;\
-}\
-.ace-chrome .ace_cursor {\
-color: black;\
-}\
-.ace-chrome .ace_invisible {\
-color: rgb(191, 191, 191);\
-}\
-.ace-chrome .ace_constant.ace_buildin {\
-color: rgb(88, 72, 246);\
-}\
-.ace-chrome .ace_constant.ace_language {\
-color: rgb(88, 92, 246);\
-}\
-.ace-chrome .ace_constant.ace_library {\
-color: rgb(6, 150, 14);\
-}\
-.ace-chrome .ace_invalid {\
-background-color: rgb(153, 0, 0);\
-color: white;\
-}\
-.ace-chrome .ace_fold {\
-}\
-.ace-chrome .ace_support.ace_function {\
-color: rgb(60, 76, 114);\
-}\
-.ace-chrome .ace_support.ace_constant {\
-color: rgb(6, 150, 14);\
-}\
-.ace-chrome .ace_support.ace_type,\
-.ace-chrome .ace_support.ace_class\
-.ace-chrome .ace_support.ace_other {\
-color: rgb(109, 121, 222);\
-}\
-.ace-chrome .ace_variable.ace_parameter {\
-font-style:italic;\
-color:#FD971F;\
-}\
-.ace-chrome .ace_keyword.ace_operator {\
-color: rgb(104, 118, 135);\
-}\
-.ace-chrome .ace_comment {\
-color: #236e24;\
-}\
-.ace-chrome .ace_comment.ace_doc {\
-color: #236e24;\
-}\
-.ace-chrome .ace_comment.ace_doc.ace_tag {\
-color: #236e24;\
-}\
-.ace-chrome .ace_constant.ace_numeric {\
-color: rgb(0, 0, 205);\
-}\
-.ace-chrome .ace_variable {\
-color: rgb(49, 132, 149);\
-}\
-.ace-chrome .ace_xml-pe {\
-color: rgb(104, 104, 91);\
-}\
-.ace-chrome .ace_entity.ace_name.ace_function {\
-color: #0000A2;\
-}\
-.ace-chrome .ace_heading {\
-color: rgb(12, 7, 255);\
-}\
-.ace-chrome .ace_list {\
-color:rgb(185, 6, 144);\
-}\
-.ace-chrome .ace_marker-layer .ace_selection {\
-background: rgb(181, 213, 255);\
-}\
-.ace-chrome .ace_marker-layer .ace_step {\
-background: rgb(252, 255, 0);\
-}\
-.ace-chrome .ace_marker-layer .ace_stack {\
-background: rgb(164, 229, 101);\
-}\
-.ace-chrome .ace_marker-layer .ace_bracket {\
-margin: -1px 0 0 -1px;\
-border: 1px solid rgb(192, 192, 192);\
-}\
-.ace-chrome .ace_marker-layer .ace_active-line {\
-background: rgba(0, 0, 0, 0.07);\
-}\
-.ace-chrome .ace_gutter-active-line {\
-background-color : #dcdcdc;\
-}\
-.ace-chrome .ace_marker-layer .ace_selected-word {\
-background: rgb(250, 250, 255);\
-border: 1px solid rgb(200, 200, 250);\
-}\
-.ace-chrome .ace_storage,\
-.ace-chrome .ace_keyword,\
-.ace-chrome .ace_meta.ace_tag {\
-color: rgb(147, 15, 128);\
-}\
-.ace-chrome .ace_string.ace_regex {\
-color: rgb(255, 0, 0)\
-}\
-.ace-chrome .ace_string {\
-color: #1A1AA6;\
-}\
-.ace-chrome .ace_entity.ace_other.ace_attribute-name {\
-color: #994409;\
-}\
-.ace-chrome .ace_indent-guide {\
-background: url(\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAE0lEQVQImWP4////f4bLly//BwAmVgd1/w11/gAAAABJRU5ErkJggg==\") right repeat-y;\
-}\
-";
-
-    var dom = require("../lib/dom");
-    dom.importCssString(exports.cssText, exports.cssClass);
-});
--- a/Server/src/main/resources/static/js/ace/theme-clouds.js
+++ b/Server/src/main/resources/static/js/ace/theme-clouds.js
@@ -1,95 +0,0 @@
-define("ace/theme/clouds", ["require", "exports", "ace/lib/dom"], function (require, exports) {
-
-    exports.isDark = false;
-    exports.cssClass = "ace-clouds";
-    exports.cssText = ".ace-clouds .ace_gutter {\
-background: #ebebeb;\
-color: #333\
-}\
-.ace-clouds .ace_print-margin {\
-width: 1px;\
-background: #e8e8e8\
-}\
-.ace-clouds {\
-background-color: #FFFFFF;\
-color: #000000\
-}\
-.ace-clouds .ace_cursor {\
-color: #000000\
-}\
-.ace-clouds .ace_marker-layer .ace_selection {\
-background: #BDD5FC\
-}\
-.ace-clouds.ace_multiselect .ace_selection.ace_start {\
-box-shadow: 0 0 3px 0px #FFFFFF;\
-}\
-.ace-clouds .ace_marker-layer .ace_step {\
-background: rgb(255, 255, 0)\
-}\
-.ace-clouds .ace_marker-layer .ace_bracket {\
-margin: -1px 0 0 -1px;\
-border: 1px solid #BFBFBF\
-}\
-.ace-clouds .ace_marker-layer .ace_active-line {\
-background: #FFFBD1\
-}\
-.ace-clouds .ace_gutter-active-line {\
-background-color : #dcdcdc\
-}\
-.ace-clouds .ace_marker-layer .ace_selected-word {\
-border: 1px solid #BDD5FC\
-}\
-.ace-clouds .ace_invisible {\
-color: #BFBFBF\
-}\
-.ace-clouds .ace_keyword,\
-.ace-clouds .ace_meta,\
-.ace-clouds .ace_support.ace_constant.ace_property-value {\
-color: #AF956F\
-}\
-.ace-clouds .ace_keyword.ace_operator {\
-color: #484848\
-}\
-.ace-clouds .ace_keyword.ace_other.ace_unit {\
-color: #96DC5F\
-}\
-.ace-clouds .ace_constant.ace_language {\
-color: #39946A\
-}\
-.ace-clouds .ace_constant.ace_numeric {\
-color: #46A609\
-}\
-.ace-clouds .ace_constant.ace_character.ace_entity {\
-color: #BF78CC\
-}\
-.ace-clouds .ace_invalid {\
-background-color: #FF002A\
-}\
-.ace-clouds .ace_fold {\
-background-color: #AF956F;\
-border-color: #000000\
-}\
-.ace-clouds .ace_storage,\
-.ace-clouds .ace_support.ace_class,\
-.ace-clouds .ace_support.ace_function,\
-.ace-clouds .ace_support.ace_other,\
-.ace-clouds .ace_support.ace_type {\
-color: #C52727\
-}\
-.ace-clouds .ace_string {\
-color: #5D90CD\
-}\
-.ace-clouds .ace_comment {\
-color: #BCC8BA\
-}\
-.ace-clouds .ace_entity.ace_name.ace_tag,\
-.ace-clouds .ace_entity.ace_other.ace_attribute-name {\
-color: #606060\
-}\
-.ace-clouds .ace_indent-guide {\
-background: url(\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAE0lEQVQImWP4////f4bLly//BwAmVgd1/w11/gAAAABJRU5ErkJggg==\") right repeat-y\
-}";
-
-    var dom = require("../lib/dom");
-    dom.importCssString(exports.cssText, exports.cssClass);
-});
--- a/Server/src/main/resources/static/js/ace/theme-clouds_midnight.js
+++ b/Server/src/main/resources/static/js/ace/theme-clouds_midnight.js
@@ -1,96 +0,0 @@
-define("ace/theme/clouds_midnight", ["require", "exports", "module", "ace/lib/dom"], function (require, exports, module) {
-
-    exports.isDark = true;
-    exports.cssClass = "ace-clouds-midnight";
-    exports.cssText = ".ace-clouds-midnight .ace_gutter {\
-background: #232323;\
-color: #929292\
-}\
-.ace-clouds-midnight .ace_print-margin {\
-width: 1px;\
-background: #232323\
-}\
-.ace-clouds-midnight {\
-background-color: #191919;\
-color: #929292\
-}\
-.ace-clouds-midnight .ace_cursor {\
-color: #7DA5DC\
-}\
-.ace-clouds-midnight .ace_marker-layer .ace_selection {\
-background: #000000\
-}\
-.ace-clouds-midnight.ace_multiselect .ace_selection.ace_start {\
-box-shadow: 0 0 3px 0px #191919;\
-}\
-.ace-clouds-midnight .ace_marker-layer .ace_step {\
-background: rgb(102, 82, 0)\
-}\
-.ace-clouds-midnight .ace_marker-layer .ace_bracket {\
-margin: -1px 0 0 -1px;\
-border: 1px solid #BFBFBF\
-}\
-.ace-clouds-midnight .ace_marker-layer .ace_active-line {\
-background: rgba(215, 215, 215, 0.031)\
-}\
-.ace-clouds-midnight .ace_gutter-active-line {\
-background-color: rgba(215, 215, 215, 0.031)\
-}\
-.ace-clouds-midnight .ace_marker-layer .ace_selected-word {\
-border: 1px solid #000000\
-}\
-.ace-clouds-midnight .ace_invisible {\
-color: #666\
-}\
-.ace-clouds-midnight .ace_keyword,\
-.ace-clouds-midnight .ace_meta,\
-.ace-clouds-midnight .ace_support.ace_constant.ace_property-value {\
-color: #927C5D\
-}\
-.ace-clouds-midnight .ace_keyword.ace_operator {\
-color: #4B4B4B\
-}\
-.ace-clouds-midnight .ace_keyword.ace_other.ace_unit {\
-color: #366F1A\
-}\
-.ace-clouds-midnight .ace_constant.ace_language {\
-color: #39946A\
-}\
-.ace-clouds-midnight .ace_constant.ace_numeric {\
-color: #46A609\
-}\
-.ace-clouds-midnight .ace_constant.ace_character.ace_entity {\
-color: #A165AC\
-}\
-.ace-clouds-midnight .ace_invalid {\
-color: #FFFFFF;\
-background-color: #E92E2E\
-}\
-.ace-clouds-midnight .ace_fold {\
-background-color: #927C5D;\
-border-color: #929292\
-}\
-.ace-clouds-midnight .ace_storage,\
-.ace-clouds-midnight .ace_support.ace_class,\
-.ace-clouds-midnight .ace_support.ace_function,\
-.ace-clouds-midnight .ace_support.ace_other,\
-.ace-clouds-midnight .ace_support.ace_type {\
-color: #E92E2E\
-}\
-.ace-clouds-midnight .ace_string {\
-color: #5D90CD\
-}\
-.ace-clouds-midnight .ace_comment {\
-color: #3C403B\
-}\
-.ace-clouds-midnight .ace_entity.ace_name.ace_tag,\
-.ace-clouds-midnight .ace_entity.ace_other.ace_attribute-name {\
-color: #606060\
-}\
-.ace-clouds-midnight .ace_indent-guide {\
-background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWNgYGBgYHB3d/8PAAOIAdULw8qMAAAAAElFTkSuQmCC) right repeat-y\
-}";
-
-    var dom = require("../lib/dom");
-    dom.importCssString(exports.cssText, exports.cssClass);
-});
--- a/Server/src/main/resources/static/js/ace/theme-cobalt.js
+++ b/Server/src/main/resources/static/js/ace/theme-cobalt.js
@@ -1,113 +0,0 @@
-define("ace/theme/cobalt", ["require", "exports", "ace/lib/dom"], function (require, exports) {
-
-    exports.isDark = true;
-    exports.cssClass = "ace-cobalt";
-    exports.cssText = ".ace-cobalt .ace_gutter {\
-background: #011e3a;\
-color: rgb(128,145,160)\
-}\
-.ace-cobalt .ace_print-margin {\
-width: 1px;\
-background: #555555\
-}\
-.ace-cobalt {\
-background-color: #002240;\
-color: #FFFFFF\
-}\
-.ace-cobalt .ace_cursor {\
-color: #FFFFFF\
-}\
-.ace-cobalt .ace_marker-layer .ace_selection {\
-background: rgba(179, 101, 57, 0.75)\
-}\
-.ace-cobalt.ace_multiselect .ace_selection.ace_start {\
-box-shadow: 0 0 3px 0px #002240;\
-}\
-.ace-cobalt .ace_marker-layer .ace_step {\
-background: rgb(127, 111, 19)\
-}\
-.ace-cobalt .ace_marker-layer .ace_bracket {\
-margin: -1px 0 0 -1px;\
-border: 1px solid rgba(255, 255, 255, 0.15)\
-}\
-.ace-cobalt .ace_marker-layer .ace_active-line {\
-background: rgba(0, 0, 0, 0.35)\
-}\
-.ace-cobalt .ace_gutter-active-line {\
-background-color: rgba(0, 0, 0, 0.35)\
-}\
-.ace-cobalt .ace_marker-layer .ace_selected-word {\
-border: 1px solid rgba(179, 101, 57, 0.75)\
-}\
-.ace-cobalt .ace_invisible {\
-color: rgba(255, 255, 255, 0.15)\
-}\
-.ace-cobalt .ace_keyword,\
-.ace-cobalt .ace_meta {\
-color: #FF9D00\
-}\
-.ace-cobalt .ace_constant,\
-.ace-cobalt .ace_constant.ace_character,\
-.ace-cobalt .ace_constant.ace_character.ace_escape,\
-.ace-cobalt .ace_constant.ace_other {\
-color: #FF628C\
-}\
-.ace-cobalt .ace_invalid {\
-color: #F8F8F8;\
-background-color: #800F00\
-}\
-.ace-cobalt .ace_support {\
-color: #80FFBB\
-}\
-.ace-cobalt .ace_support.ace_constant {\
-color: #EB939A\
-}\
-.ace-cobalt .ace_fold {\
-background-color: #FF9D00;\
-border-color: #FFFFFF\
-}\
-.ace-cobalt .ace_support.ace_function {\
-color: #FFB054\
-}\
-.ace-cobalt .ace_storage {\
-color: #FFEE80\
-}\
-.ace-cobalt .ace_entity {\
-color: #FFDD00\
-}\
-.ace-cobalt .ace_string {\
-color: #3AD900\
-}\
-.ace-cobalt .ace_string.ace_regexp {\
-color: #80FFC2\
-}\
-.ace-cobalt .ace_comment {\
-font-style: italic;\
-color: #0088FF\
-}\
-.ace-cobalt .ace_heading,\
-.ace-cobalt .ace_markup.ace_heading {\
-color: #C8E4FD;\
-background-color: #001221\
-}\
-.ace-cobalt .ace_list,\
-.ace-cobalt .ace_markup.ace_list {\
-background-color: #130D26\
-}\
-.ace-cobalt .ace_variable {\
-color: #CCCCCC\
-}\
-.ace-cobalt .ace_variable.ace_language {\
-color: #FF80E1\
-}\
-.ace-cobalt .ace_meta.ace_tag {\
-color: #9EFFFF\
-}\
-.ace-cobalt .ace_indent-guide {\
-background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWNgYGBgYHCLSvkPAAP3AgSDTRd4AAAAAElFTkSuQmCC) right repeat-y\
-}\
-";
-
-    var dom = require("../lib/dom");
-    dom.importCssString(exports.cssText, exports.cssClass);
-});
--- a/Server/src/main/resources/static/js/ace/theme-crimson_editor.js
+++ b/Server/src/main/resources/static/js/ace/theme-crimson_editor.js
@@ -1,118 +0,0 @@
-define("ace/theme/crimson_editor", ["require", "exports", "ace/lib/dom"], function (require, exports) {
-    exports.isDark = false;
-    exports.cssText = ".ace-crimson-editor .ace_gutter {\
-background: #ebebeb;\
-color: #333;\
-overflow : hidden;\
-}\
-.ace-crimson-editor .ace_gutter-layer {\
-width: 100%;\
-text-align: right;\
-}\
-.ace-crimson-editor .ace_print-margin {\
-width: 1px;\
-background: #e8e8e8;\
-}\
-.ace-crimson-editor {\
-background-color: #FFFFFF;\
-color: rgb(64, 64, 64);\
-}\
-.ace-crimson-editor .ace_cursor {\
-color: black;\
-}\
-.ace-crimson-editor .ace_invisible {\
-color: rgb(191, 191, 191);\
-}\
-.ace-crimson-editor .ace_identifier {\
-color: black;\
-}\
-.ace-crimson-editor .ace_keyword {\
-color: blue;\
-}\
-.ace-crimson-editor .ace_constant.ace_buildin {\
-color: rgb(88, 72, 246);\
-}\
-.ace-crimson-editor .ace_constant.ace_language {\
-color: rgb(255, 156, 0);\
-}\
-.ace-crimson-editor .ace_constant.ace_library {\
-color: rgb(6, 150, 14);\
-}\
-.ace-crimson-editor .ace_invalid {\
-text-decoration: line-through;\
-color: rgb(224, 0, 0);\
-}\
-.ace-crimson-editor .ace_fold {\
-}\
-.ace-crimson-editor .ace_support.ace_function {\
-color: rgb(192, 0, 0);\
-}\
-.ace-crimson-editor .ace_support.ace_constant {\
-color: rgb(6, 150, 14);\
-}\
-.ace-crimson-editor .ace_support.ace_type,\
-.ace-crimson-editor .ace_support.ace_class {\
-color: rgb(109, 121, 222);\
-}\
-.ace-crimson-editor .ace_keyword.ace_operator {\
-color: rgb(49, 132, 149);\
-}\
-.ace-crimson-editor .ace_string {\
-color: rgb(128, 0, 128);\
-}\
-.ace-crimson-editor .ace_comment {\
-color: rgb(76, 136, 107);\
-}\
-.ace-crimson-editor .ace_comment.ace_doc {\
-color: rgb(0, 102, 255);\
-}\
-.ace-crimson-editor .ace_comment.ace_doc.ace_tag {\
-color: rgb(128, 159, 191);\
-}\
-.ace-crimson-editor .ace_constant.ace_numeric {\
-color: rgb(0, 0, 64);\
-}\
-.ace-crimson-editor .ace_variable {\
-color: rgb(0, 64, 128);\
-}\
-.ace-crimson-editor .ace_xml-pe {\
-color: rgb(104, 104, 91);\
-}\
-.ace-crimson-editor .ace_marker-layer .ace_selection {\
-background: rgb(181, 213, 255);\
-}\
-.ace-crimson-editor .ace_marker-layer .ace_step {\
-background: rgb(252, 255, 0);\
-}\
-.ace-crimson-editor .ace_marker-layer .ace_stack {\
-background: rgb(164, 229, 101);\
-}\
-.ace-crimson-editor .ace_marker-layer .ace_bracket {\
-margin: -1px 0 0 -1px;\
-border: 1px solid rgb(192, 192, 192);\
-}\
-.ace-crimson-editor .ace_marker-layer .ace_active-line {\
-background: rgb(232, 242, 254);\
-}\
-.ace-crimson-editor .ace_gutter-active-line {\
-background-color : #dcdcdc;\
-}\
-.ace-crimson-editor .ace_meta.ace_tag {\
-color:rgb(28, 2, 255);\
-}\
-.ace-crimson-editor .ace_marker-layer .ace_selected-word {\
-background: rgb(250, 250, 255);\
-border: 1px solid rgb(200, 200, 250);\
-}\
-.ace-crimson-editor .ace_string.ace_regex {\
-color: rgb(192, 0, 192);\
-}\
-.ace-crimson-editor .ace_indent-guide {\
-background: url(\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAE0lEQVQImWP4////f4bLly//BwAmVgd1/w11/gAAAABJRU5ErkJggg==\") right repeat-y;\
-}";
-
-    exports.cssClass = "ace-crimson-editor";
-
-    var dom = require("../lib/dom");
-    dom.importCssString(exports.cssText, exports.cssClass);
-});
--- a/Server/src/main/resources/static/js/ace/theme-dawn.js
+++ b/Server/src/main/resources/static/js/ace/theme-dawn.js
@@ -1,108 +0,0 @@
-define("ace/theme/dawn", ["require", "exports", "ace/lib/dom"], function (require, exports) {
-
-    exports.isDark = false;
-    exports.cssClass = "ace-dawn";
-    exports.cssText = ".ace-dawn .ace_gutter {\
-background: #ebebeb;\
-color: #333\
-}\
-.ace-dawn .ace_print-margin {\
-width: 1px;\
-background: #e8e8e8\
-}\
-.ace-dawn {\
-background-color: #F9F9F9;\
-color: #080808\
-}\
-.ace-dawn .ace_cursor {\
-color: #000000\
-}\
-.ace-dawn .ace_marker-layer .ace_selection {\
-background: rgba(39, 95, 255, 0.30)\
-}\
-.ace-dawn.ace_multiselect .ace_selection.ace_start {\
-box-shadow: 0 0 3px 0px #F9F9F9;\
-}\
-.ace-dawn .ace_marker-layer .ace_step {\
-background: rgb(255, 255, 0)\
-}\
-.ace-dawn .ace_marker-layer .ace_bracket {\
-margin: -1px 0 0 -1px;\
-border: 1px solid rgba(75, 75, 126, 0.50)\
-}\
-.ace-dawn .ace_marker-layer .ace_active-line {\
-background: rgba(36, 99, 180, 0.12)\
-}\
-.ace-dawn .ace_gutter-active-line {\
-background-color : #dcdcdc\
-}\
-.ace-dawn .ace_marker-layer .ace_selected-word {\
-border: 1px solid rgba(39, 95, 255, 0.30)\
-}\
-.ace-dawn .ace_invisible {\
-color: rgba(75, 75, 126, 0.50)\
-}\
-.ace-dawn .ace_keyword,\
-.ace-dawn .ace_meta {\
-color: #794938\
-}\
-.ace-dawn .ace_constant,\
-.ace-dawn .ace_constant.ace_character,\
-.ace-dawn .ace_constant.ace_character.ace_escape,\
-.ace-dawn .ace_constant.ace_other {\
-color: #811F24\
-}\
-.ace-dawn .ace_invalid.ace_illegal {\
-text-decoration: underline;\
-font-style: italic;\
-color: #F8F8F8;\
-background-color: #B52A1D\
-}\
-.ace-dawn .ace_invalid.ace_deprecated {\
-text-decoration: underline;\
-font-style: italic;\
-color: #B52A1D\
-}\
-.ace-dawn .ace_support {\
-color: #691C97\
-}\
-.ace-dawn .ace_support.ace_constant {\
-color: #B4371F\
-}\
-.ace-dawn .ace_fold {\
-background-color: #794938;\
-border-color: #080808\
-}\
-.ace-dawn .ace_list,\
-.ace-dawn .ace_markup.ace_list,\
-.ace-dawn .ace_support.ace_function {\
-color: #693A17\
-}\
-.ace-dawn .ace_storage {\
-font-style: italic;\
-color: #A71D5D\
-}\
-.ace-dawn .ace_string {\
-color: #0B6125\
-}\
-.ace-dawn .ace_string.ace_regexp {\
-color: #CF5628\
-}\
-.ace-dawn .ace_comment {\
-font-style: italic;\
-color: #5A525F\
-}\
-.ace-dawn .ace_heading,\
-.ace-dawn .ace_markup.ace_heading {\
-color: #19356D\
-}\
-.ace-dawn .ace_variable {\
-color: #234A97\
-}\
-.ace-dawn .ace_indent-guide {\
-background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWNgYGBgYLh/5+x/AAizA4hxNNsZAAAAAElFTkSuQmCC) right repeat-y\
-}";
-
-    var dom = require("../lib/dom");
-    dom.importCssString(exports.cssText, exports.cssClass);
-});
--- a/Server/src/main/resources/static/js/ace/theme-dracula.js
+++ b/Server/src/main/resources/static/js/ace/theme-dracula.js
@@ -1,121 +0,0 @@
-define("ace/theme/dracula", ["require", "exports", "ace/lib/dom"], function (require, exports) {
-
-    exports.isDark = true;
-    exports.cssClass = "ace-dracula";
-    exports.cssText = "\
-ace-dracula .ace_gutter {\
-background: #282a36;\
-color: rgb(144,145,148)\
-}\
-.ace-dracula .ace_print-margin {\
-width: 1px;\
-background: #e8e8e8\
-}\
-.ace-dracula {\
-background-color: #282a36;\
-color: #f8f8f2\
-}\
-.ace-dracula .ace_cursor {\
-color: #f8f8f0\
-}\
-.ace-dracula .ace_marker-layer .ace_selection {\
-background: #44475a\
-}\
-.ace-dracula.ace_multiselect .ace_selection.ace_start {\
-box-shadow: 0 0 3px 0px #282a36;\
-border-radius: 2px\
-}\
-.ace-dracula .ace_marker-layer .ace_step {\
-background: rgb(198, 219, 174)\
-}\
-.ace-dracula .ace_marker-layer .ace_bracket {\
-margin: -1px 0 0 -1px;\
-border: 1px solid #3B3A32\
-}\
-.ace-dracula .ace_marker-layer .ace_active-line {\
-background: #44475a\
-}\
-.ace-dracula .ace_gutter-active-line {\
-background-color: #44475a\
-}\
-.ace-dracula .ace_marker-layer .ace_selected-word {\
-border: 1px solid #44475a\
-}\
-.ace-dracula .ace_fold {\
-background-color: #50fa7b;\
-border-color: #f8f8f2\
-}\
-.ace-dracula .ace_keyword {\
-color: #ff79c6\
-}\
-.ace-dracula .ace_constant.ace_language {\
-color: #bd93f9\
-}\
-.ace-dracula .ace_constant.ace_numeric {\
-color: #bd93f9\
-}\
-.ace-dracula .ace_constant.ace_character {\
-color: #bd93f9\
-}\
-.ace-dracula .ace_constant.ace_character.ace_escape {\
-color: #ff79c6\
-}\
-.ace-dracula .ace_constant.ace_other {\
-color: #bd93f9\
-}\
-.ace-dracula .ace_support.ace_function {\
-color: #8be9fd\
-}\
-.ace-dracula .ace_support.ace_constant {\
-color: #6be5fd\
-}\
-.ace-dracula .ace_support.ace_class {\
-font-style: italic;\
-color: #66d9ef\
-}\
-.ace-dracula .ace_support.ace_type {\
-font-style: italic;\
-color: #66d9ef\
-}\
-.ace-dracula .ace_storage {\
-color: #ff79c6\
-}\
-.ace-dracula .ace_storage.ace_type {\
-font-style: italic;\
-color: #8be9fd\
-}\
-.ace-dracula .ace_invalid {\
-color: #F8F8F0;\
-background-color: #ff79c6\
-}\
-.ace-dracula .ace_invalid.ace_deprecated {\
-color: #F8F8F0;\
-background-color: #bd93f9\
-}\
-.ace-dracula .ace_string {\
-color: #f1fa8c\
-}\
-.ace-dracula .ace_comment {\
-color: #6272a4\
-}\
-.ace-dracula .ace_variable {\
-color: #50fa7b\
-}\
-.ace-dracula .ace_variable.ace_parameter {\
-font-style: italic;\
-color: #ffb86c\
-}\
-.ace-dracula .ace_entity.ace_other.ace_attribute-name {\
-color: #50fa7b\
-}\
-.ace-dracula .ace_entity.ace_name.ace_function {\
-color: #50fa7b\
-}\
-.ace-dracula .ace_entity.ace_name.ace_tag {\
-color: #ff79c6\
-}\
-";
-
-    var dom = require("../lib/dom");
-    dom.importCssString(exports.cssText, exports.cssClass);
-});
--- a/Server/src/main/resources/static/js/ace/theme-dreamweaver.js
+++ b/Server/src/main/resources/static/js/ace/theme-dreamweaver.js
@@ -1,141 +0,0 @@
-define("ace/theme/dreamweaver", ["require", "exports", "ace/lib/dom"], function (require, exports) {
-    exports.isDark = false;
-    exports.cssClass = "ace-dreamweaver";
-    exports.cssText = ".ace-dreamweaver .ace_gutter {\
-background: #e8e8e8;\
-color: #333;\
-}\
-.ace-dreamweaver .ace_print-margin {\
-width: 1px;\
-background: #e8e8e8;\
-}\
-.ace-dreamweaver {\
-background-color: #FFFFFF;\
-color: black;\
-}\
-.ace-dreamweaver .ace_fold {\
-background-color: #757AD8;\
-}\
-.ace-dreamweaver .ace_cursor {\
-color: black;\
-}\
-.ace-dreamweaver .ace_invisible {\
-color: rgb(191, 191, 191);\
-}\
-.ace-dreamweaver .ace_storage,\
-.ace-dreamweaver .ace_keyword {\
-color: blue;\
-}\
-.ace-dreamweaver .ace_constant.ace_buildin {\
-color: rgb(88, 72, 246);\
-}\
-.ace-dreamweaver .ace_constant.ace_language {\
-color: rgb(88, 92, 246);\
-}\
-.ace-dreamweaver .ace_constant.ace_library {\
-color: rgb(6, 150, 14);\
-}\
-.ace-dreamweaver .ace_invalid {\
-background-color: rgb(153, 0, 0);\
-color: white;\
-}\
-.ace-dreamweaver .ace_support.ace_function {\
-color: rgb(60, 76, 114);\
-}\
-.ace-dreamweaver .ace_support.ace_constant {\
-color: rgb(6, 150, 14);\
-}\
-.ace-dreamweaver .ace_support.ace_type,\
-.ace-dreamweaver .ace_support.ace_class {\
-color: #009;\
-}\
-.ace-dreamweaver .ace_support.ace_php_tag {\
-color: #f00;\
-}\
-.ace-dreamweaver .ace_keyword.ace_operator {\
-color: rgb(104, 118, 135);\
-}\
-.ace-dreamweaver .ace_string {\
-color: #00F;\
-}\
-.ace-dreamweaver .ace_comment {\
-color: rgb(76, 136, 107);\
-}\
-.ace-dreamweaver .ace_comment.ace_doc {\
-color: rgb(0, 102, 255);\
-}\
-.ace-dreamweaver .ace_comment.ace_doc.ace_tag {\
-color: rgb(128, 159, 191);\
-}\
-.ace-dreamweaver .ace_constant.ace_numeric {\
-color: rgb(0, 0, 205);\
-}\
-.ace-dreamweaver .ace_variable {\
-color: #06F\
-}\
-.ace-dreamweaver .ace_xml-pe {\
-color: rgb(104, 104, 91);\
-}\
-.ace-dreamweaver .ace_entity.ace_name.ace_function {\
-color: #00F;\
-}\
-.ace-dreamweaver .ace_heading {\
-color: rgb(12, 7, 255);\
-}\
-.ace-dreamweaver .ace_list {\
-color:rgb(185, 6, 144);\
-}\
-.ace-dreamweaver .ace_marker-layer .ace_selection {\
-background: rgb(181, 213, 255);\
-}\
-.ace-dreamweaver .ace_marker-layer .ace_step {\
-background: rgb(252, 255, 0);\
-}\
-.ace-dreamweaver .ace_marker-layer .ace_stack {\
-background: rgb(164, 229, 101);\
-}\
-.ace-dreamweaver .ace_marker-layer .ace_bracket {\
-margin: -1px 0 0 -1px;\
-border: 1px solid rgb(192, 192, 192);\
-}\
-.ace-dreamweaver .ace_marker-layer .ace_active-line {\
-background: rgba(0, 0, 0, 0.07);\
-}\
-.ace-dreamweaver .ace_gutter-active-line {\
-background-color : #DCDCDC;\
-}\
-.ace-dreamweaver .ace_marker-layer .ace_selected-word {\
-background: rgb(250, 250, 255);\
-border: 1px solid rgb(200, 200, 250);\
-}\
-.ace-dreamweaver .ace_meta.ace_tag {\
-color:#009;\
-}\
-.ace-dreamweaver .ace_meta.ace_tag.ace_anchor {\
-color:#060;\
-}\
-.ace-dreamweaver .ace_meta.ace_tag.ace_form {\
-color:#F90;\
-}\
-.ace-dreamweaver .ace_meta.ace_tag.ace_image {\
-color:#909;\
-}\
-.ace-dreamweaver .ace_meta.ace_tag.ace_script {\
-color:#900;\
-}\
-.ace-dreamweaver .ace_meta.ace_tag.ace_style {\
-color:#909;\
-}\
-.ace-dreamweaver .ace_meta.ace_tag.ace_table {\
-color:#099;\
-}\
-.ace-dreamweaver .ace_string.ace_regex {\
-color: rgb(255, 0, 0)\
-}\
-.ace-dreamweaver .ace_indent-guide {\
-background: url(\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAE0lEQVQImWP4////f4bLly//BwAmVgd1/w11/gAAAABJRU5ErkJggg==\") right repeat-y;\
-}";
-
-    var dom = require("../lib/dom");
-    dom.importCssString(exports.cssText, exports.cssClass);
-});
--- a/Server/src/main/resources/static/js/ace/theme-eclipse.js
+++ b/Server/src/main/resources/static/js/ace/theme-eclipse.js
@@ -1,98 +0,0 @@
-define("ace/theme/eclipse", ["require", "exports", "ace/lib/dom"], function (require, exports) {
-    "use strict";
-
-    exports.isDark = false;
-    exports.cssText = ".ace-eclipse .ace_gutter {\
-background: #ebebeb;\
-border-right: 1px solid rgb(159, 159, 159);\
-color: rgb(136, 136, 136);\
-}\
-.ace-eclipse .ace_print-margin {\
-width: 1px;\
-background: #ebebeb;\
-}\
-.ace-eclipse {\
-background-color: #FFFFFF;\
-color: black;\
-}\
-.ace-eclipse .ace_fold {\
-background-color: rgb(60, 76, 114);\
-}\
-.ace-eclipse .ace_cursor {\
-color: black;\
-}\
-.ace-eclipse .ace_storage,\
-.ace-eclipse .ace_keyword,\
-.ace-eclipse .ace_variable {\
-color: rgb(127, 0, 85);\
-}\
-.ace-eclipse .ace_constant.ace_buildin {\
-color: rgb(88, 72, 246);\
-}\
-.ace-eclipse .ace_constant.ace_library {\
-color: rgb(6, 150, 14);\
-}\
-.ace-eclipse .ace_function {\
-color: rgb(60, 76, 114);\
-}\
-.ace-eclipse .ace_string {\
-color: rgb(42, 0, 255);\
-}\
-.ace-eclipse .ace_comment {\
-color: rgb(113, 150, 130);\
-}\
-.ace-eclipse .ace_comment.ace_doc {\
-color: rgb(63, 95, 191);\
-}\
-.ace-eclipse .ace_comment.ace_doc.ace_tag {\
-color: rgb(127, 159, 191);\
-}\
-.ace-eclipse .ace_constant.ace_numeric {\
-color: darkblue;\
-}\
-.ace-eclipse .ace_tag {\
-color: rgb(25, 118, 116);\
-}\
-.ace-eclipse .ace_type {\
-color: rgb(127, 0, 127);\
-}\
-.ace-eclipse .ace_xml-pe {\
-color: rgb(104, 104, 91);\
-}\
-.ace-eclipse .ace_marker-layer .ace_selection {\
-background: rgb(181, 213, 255);\
-}\
-.ace-eclipse .ace_marker-layer .ace_bracket {\
-margin: -1px 0 0 -1px;\
-border: 1px solid rgb(192, 192, 192);\
-}\
-.ace-eclipse .ace_meta.ace_tag {\
-color:rgb(25, 118, 116);\
-}\
-.ace-eclipse .ace_invisible {\
-color: #ddd;\
-}\
-.ace-eclipse .ace_entity.ace_other.ace_attribute-name {\
-color:rgb(127, 0, 127);\
-}\
-.ace-eclipse .ace_marker-layer .ace_step {\
-background: rgb(255, 255, 0);\
-}\
-.ace-eclipse .ace_active-line {\
-background: rgb(232, 242, 254);\
-}\
-.ace-eclipse .ace_gutter-active-line {\
-background-color : #DADADA;\
-}\
-.ace-eclipse .ace_marker-layer .ace_selected-word {\
-border: 1px solid rgb(181, 213, 255);\
-}\
-.ace-eclipse .ace_indent-guide {\
-background: url(\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAE0lEQVQImWP4////f4bLly//BwAmVgd1/w11/gAAAABJRU5ErkJggg==\") right repeat-y;\
-}";
-
-    exports.cssClass = "ace-eclipse";
-
-    var dom = require("../lib/dom");
-    dom.importCssString(exports.cssText, exports.cssClass);
-});
--- a/Server/src/main/resources/static/js/ace/theme-github.js
+++ b/Server/src/main/resources/static/js/ace/theme-github.js
@@ -1,103 +0,0 @@
-define("ace/theme/github", ["require", "exports", "ace/lib/dom"], function (require, exports) {
-
-    exports.isDark = false;
-    exports.cssClass = "ace-github";
-    exports.cssText = "\
-.ace-github .ace_gutter {\
-background: #e8e8e8;\
-color: #AAA;\
-}\
-.ace-github  {\
-background: #fff;\
-color: #000;\
-}\
-.ace-github .ace_keyword {\
-font-weight: bold;\
-}\
-.ace-github .ace_string {\
-color: #D14;\
-}\
-.ace-github .ace_variable.ace_class {\
-color: teal;\
-}\
-.ace-github .ace_constant.ace_numeric {\
-color: #099;\
-}\
-.ace-github .ace_constant.ace_buildin {\
-color: #0086B3;\
-}\
-.ace-github .ace_support.ace_function {\
-color: #0086B3;\
-}\
-.ace-github .ace_comment {\
-color: #998;\
-font-style: italic;\
-}\
-.ace-github .ace_variable.ace_language  {\
-color: #0086B3;\
-}\
-.ace-github .ace_paren {\
-font-weight: bold;\
-}\
-.ace-github .ace_boolean {\
-font-weight: bold;\
-}\
-.ace-github .ace_string.ace_regexp {\
-color: #009926;\
-font-weight: normal;\
-}\
-.ace-github .ace_variable.ace_instance {\
-color: teal;\
-}\
-.ace-github .ace_constant.ace_language {\
-font-weight: bold;\
-}\
-.ace-github .ace_cursor {\
-color: black;\
-}\
-.ace-github.ace_focus .ace_marker-layer .ace_active-line {\
-background: rgb(255, 255, 204);\
-}\
-.ace-github .ace_marker-layer .ace_active-line {\
-background: rgb(245, 245, 245);\
-}\
-.ace-github .ace_marker-layer .ace_selection {\
-background: rgb(181, 213, 255);\
-}\
-.ace-github.ace_multiselect .ace_selection.ace_start {\
-box-shadow: 0 0 3px 0px white;\
-}\
-.ace-github.ace_nobold .ace_line > span {\
-font-weight: normal !important;\
-}\
-.ace-github .ace_marker-layer .ace_step {\
-background: rgb(252, 255, 0);\
-}\
-.ace-github .ace_marker-layer .ace_stack {\
-background: rgb(164, 229, 101);\
-}\
-.ace-github .ace_marker-layer .ace_bracket {\
-margin: -1px 0 0 -1px;\
-border: 1px solid rgb(192, 192, 192);\
-}\
-.ace-github .ace_gutter-active-line {\
-background-color : rgba(0, 0, 0, 0.07);\
-}\
-.ace-github .ace_marker-layer .ace_selected-word {\
-background: rgb(250, 250, 255);\
-border: 1px solid rgb(200, 200, 250);\
-}\
-.ace-github .ace_invisible {\
-color: #BFBFBF\
-}\
-.ace-github .ace_print-margin {\
-width: 1px;\
-background: #e8e8e8;\
-}\
-.ace-github .ace_indent-guide {\
-background: url(\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAE0lEQVQImWP4////f4bLly//BwAmVgd1/w11/gAAAABJRU5ErkJggg==\") right repeat-y;\
-}";
-
-    var dom = require("../lib/dom");
-    dom.importCssString(exports.cssText, exports.cssClass);
-});
--- a/Server/src/main/resources/static/js/ace/theme-gob.js
+++ b/Server/src/main/resources/static/js/ace/theme-gob.js
@@ -1,112 +0,0 @@
-define("ace/theme/gob", ["require", "exports", "ace/lib/dom"], function (require, exports) {
-
-    exports.isDark = true;
-    exports.cssClass = "ace-gob";
-    exports.cssText = ".ace-gob .ace_gutter {\
-background: #0B1818;\
-color: #03EE03\
-}\
-.ace-gob .ace_print-margin {\
-width: 1px;\
-background: #131313\
-}\
-.ace-gob {\
-background-color: #0B0B0B;\
-color: #00FF00\
-}\
-.ace-gob .ace_cursor {\
-border-color: rgba(16, 248, 255, 0.90);\
-background-color: rgba(16, 240, 248, 0.70);\
-opacity: 0.4;\
-}\
-.ace-gob .ace_marker-layer .ace_selection {\
-background: rgba(221, 240, 255, 0.20)\
-}\
-.ace-gob.ace_multiselect .ace_selection.ace_start {\
-box-shadow: 0 0 3px 0px #141414;\
-}\
-.ace-gob .ace_marker-layer .ace_step {\
-background: rgb(16, 128, 0)\
-}\
-.ace-gob .ace_marker-layer .ace_bracket {\
-margin: -1px 0 0 -1px;\
-border: 1px solid rgba(64, 255, 255, 0.25)\
-}\
-.ace-gob .ace_marker-layer .ace_active-line {\
-background: rgba(255, 255, 255, 0.04)\
-}\
-.ace-gob .ace_gutter-active-line {\
-background-color: rgba(255, 255, 255, 0.04)\
-}\
-.ace-gob .ace_marker-layer .ace_selected-word {\
-border: 1px solid rgba(192, 240, 255, 0.20)\
-}\
-.ace-gob .ace_invisible {\
-color: rgba(255, 255, 255, 0.25)\
-}\
-.ace-gob .ace_keyword,\
-.ace-gob .ace_meta {\
-color: #10D8E8\
-}\
-.ace-gob .ace_constant,\
-.ace-gob .ace_constant.ace_character,\
-.ace-gob .ace_constant.ace_character.ace_escape,\
-.ace-gob .ace_constant.ace_other,\
-.ace-gob .ace_heading,\
-.ace-gob .ace_markup.ace_heading,\
-.ace-gob .ace_support.ace_constant {\
-color: #10F0A0\
-}\
-.ace-gob .ace_invalid.ace_illegal {\
-color: #F8F8F8;\
-background-color: rgba(86, 45, 86, 0.75)\
-}\
-.ace-gob .ace_invalid.ace_deprecated {\
-text-decoration: underline;\
-font-style: italic;\
-color: #20F8C0\
-}\
-.ace-gob .ace_support {\
-color: #20E8B0\
-}\
-.ace-gob .ace_fold {\
-background-color: #50B8B8;\
-border-color: #70F8F8\
-}\
-.ace-gob .ace_support.ace_function {\
-color: #00F800\
-}\
-.ace-gob .ace_list,\
-.ace-gob .ace_markup.ace_list,\
-.ace-gob .ace_storage {\
-color: #10FF98\
-}\
-.ace-gob .ace_entity.ace_name.ace_function,\
-.ace-gob .ace_meta.ace_tag,\
-.ace-gob .ace_variable {\
-color: #00F868\
-}\
-.ace-gob .ace_string {\
-color: #10F060\
-}\
-.ace-gob .ace_string.ace_regexp {\
-color: #20F090;\
-}\
-.ace-gob .ace_comment {\
-font-style: italic;\
-color: #00E060;\
-}\
-.ace-gob .ace_variable {\
-color: #00F888;\
-}\
-.ace-gob .ace_xml-pe {\
-color: #488858;\
-}\
-.ace-gob .ace_indent-guide {\
-background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWMQERFpYLC1tf0PAAgOAnPnhxyiAAAAAElFTkSuQmCC) right repeat-y\
-}\
-";
-
-    var dom = require("../lib/dom");
-    dom.importCssString(exports.cssText, exports.cssClass);
-});
--- a/Server/src/main/resources/static/js/ace/theme-gruvbox.js
+++ b/Server/src/main/resources/static/js/ace/theme-gruvbox.js
@@ -1,82 +0,0 @@
-define("ace/theme/gruvbox", ["require", "exports", "ace/lib/dom"], function (require, exports) {
-
-    exports.isDark = true;
-    exports.cssClass = "ace-gruvbox";
-    exports.cssText = ".ace-gruvbox .ace_gutter-active-line {\
-background-color: #3C3836;\
-}\
-.ace-gruvbox {\
-color: #EBDAB4;\
-background-color: #1D2021;\
-}\
-.ace-gruvbox .ace_invisible {\
-color: #504945;\
-}\
-.ace-gruvbox .ace_marker-layer .ace_selection {\
-background: rgba(179, 101, 57, 0.75)\
-}\
-.ace-gruvbox.ace_multiselect .ace_selection.ace_start {\
-box-shadow: 0 0 3px 0px #002240;\
-}\
-.ace-gruvbox .ace_keyword {\
-color: #8ec07c;\
-}\
-.ace-gruvbox .ace_comment {\
-font-style: italic;\
-color: #928375;\
-}\
-.ace-gruvbox .ace-statement {\
-color: red;\
-}\
-.ace-gruvbox .ace_variable {\
-color: #84A598;\
-}\
-.ace-gruvbox .ace_variable.ace_language {\
-color: #D2879B;\
-}\
-.ace-gruvbox .ace_constant {\
-color: #C2859A;\
-}\
-.ace-gruvbox .ace_constant.ace_language {\
-color: #C2859A;\
-}\
-.ace-gruvbox .ace_constant.ace_numeric {\
-color: #C2859A;\
-}\
-.ace-gruvbox .ace_string {\
-color: #B8BA37;\
-}\
-.ace-gruvbox .ace_support {\
-color: #F9BC41;\
-}\
-.ace-gruvbox .ace_support.ace_function {\
-color: #F84B3C;\
-}\
-.ace-gruvbox .ace_storage {\
-color: #8FBF7F;\
-}\
-.ace-gruvbox .ace_keyword.ace_operator {\
-color: #EBDAB4;\
-}\
-.ace-gruvbox .ace_punctuation.ace_operator {\
-color: yellow;\
-}\
-.ace-gruvbox .ace_marker-layer .ace_active-line {\
-background: #3C3836;\
-}\
-.ace-gruvbox .ace_marker-layer .ace_selected-word {\
-border-radius: 4px;\
-border: 8px solid #3f475d;\
-}\
-.ace-gruvbox .ace_print-margin {\
-width: 5px;\
-background: #3C3836;\
-}\
-.ace-gruvbox .ace_indent-guide {\
-background: url(\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWNQUFD4z6Crq/sfAAuYAuYl+7lfAAAAAElFTkSuQmCC\") right repeat-y;\
-}";
-
-    var dom = require("../lib/dom");
-    dom.importCssString(exports.cssText, exports.cssClass);
-
-});
--- a/Server/src/main/resources/static/js/ace/theme-idle_fingers.js
+++ b/Server/src/main/resources/static/js/ace/theme-idle_fingers.js
@@ -1,96 +0,0 @@
-define("ace/theme/idle_fingers", ["require", "exports", "ace/lib/dom"], function (require, exports) {
-
-    exports.isDark = true;
-    exports.cssClass = "ace-idle-fingers";
-    exports.cssText = ".ace-idle-fingers .ace_gutter {\
-background: #3b3b3b;\
-color: rgb(153,153,153)\
-}\
-.ace-idle-fingers .ace_print-margin {\
-width: 1px;\
-background: #3b3b3b\
-}\
-.ace-idle-fingers {\
-background-color: #323232;\
-color: #FFFFFF\
-}\
-.ace-idle-fingers .ace_cursor {\
-color: #91FF00\
-}\
-.ace-idle-fingers .ace_marker-layer .ace_selection {\
-background: rgba(90, 100, 126, 0.88)\
-}\
-.ace-idle-fingers.ace_multiselect .ace_selection.ace_start {\
-box-shadow: 0 0 3px 0px #323232;\
-}\
-.ace-idle-fingers .ace_marker-layer .ace_step {\
-background: rgb(102, 82, 0)\
-}\
-.ace-idle-fingers .ace_marker-layer .ace_bracket {\
-margin: -1px 0 0 -1px;\
-border: 1px solid #404040\
-}\
-.ace-idle-fingers .ace_marker-layer .ace_active-line {\
-background: #353637\
-}\
-.ace-idle-fingers .ace_gutter-active-line {\
-background-color: #353637\
-}\
-.ace-idle-fingers .ace_marker-layer .ace_selected-word {\
-border: 1px solid rgba(90, 100, 126, 0.88)\
-}\
-.ace-idle-fingers .ace_invisible {\
-color: #404040\
-}\
-.ace-idle-fingers .ace_keyword,\
-.ace-idle-fingers .ace_meta {\
-color: #CC7833\
-}\
-.ace-idle-fingers .ace_constant,\
-.ace-idle-fingers .ace_constant.ace_character,\
-.ace-idle-fingers .ace_constant.ace_character.ace_escape,\
-.ace-idle-fingers .ace_constant.ace_other,\
-.ace-idle-fingers .ace_support.ace_constant {\
-color: #6C99BB\
-}\
-.ace-idle-fingers .ace_invalid {\
-color: #FFFFFF;\
-background-color: #FF0000\
-}\
-.ace-idle-fingers .ace_fold {\
-background-color: #CC7833;\
-border-color: #FFFFFF\
-}\
-.ace-idle-fingers .ace_support.ace_function {\
-color: #B83426\
-}\
-.ace-idle-fingers .ace_variable.ace_parameter {\
-font-style: italic\
-}\
-.ace-idle-fingers .ace_string {\
-color: #A5C261\
-}\
-.ace-idle-fingers .ace_string.ace_regexp {\
-color: #CCCC33\
-}\
-.ace-idle-fingers .ace_comment {\
-font-style: italic;\
-color: #BC9458\
-}\
-.ace-idle-fingers .ace_meta.ace_tag {\
-color: #FFE5BB\
-}\
-.ace-idle-fingers .ace_entity.ace_name {\
-color: #FFC66D\
-}\
-.ace-idle-fingers .ace_collab.ace_user1 {\
-color: #323232;\
-background-color: #FFF980\
-}\
-.ace-idle-fingers .ace_indent-guide {\
-background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWMwMjLyZYiPj/8PAAreAwAI1+g0AAAAAElFTkSuQmCC) right repeat-y\
-}";
-
-    var dom = require("../lib/dom");
-    dom.importCssString(exports.cssText, exports.cssClass);
-});
--- a/Server/src/main/resources/static/js/ace/theme-katzenmilch.js
+++ b/Server/src/main/resources/static/js/ace/theme-katzenmilch.js
@@ -1,121 +0,0 @@
-define("ace/theme/katzenmilch", ["require", "exports", "ace/lib/dom"], function (require, exports) {
-
-    exports.isDark = false;
-    exports.cssClass = "ace-katzenmilch";
-    exports.cssText = ".ace-katzenmilch .ace_gutter,\
-.ace-katzenmilch .ace_gutter {\
-background: #e8e8e8;\
-color: #333\
-}\
-.ace-katzenmilch .ace_print-margin {\
-width: 1px;\
-background: #e8e8e8\
-}\
-.ace-katzenmilch {\
-background-color: #f3f2f3;\
-color: rgba(15, 0, 9, 1.0)\
-}\
-.ace-katzenmilch .ace_cursor {\
-border-left: 2px solid #100011\
-}\
-.ace-katzenmilch .ace_overwrite-cursors .ace_cursor {\
-border-left: 0px;\
-border-bottom: 1px solid #100011\
-}\
-.ace-katzenmilch .ace_marker-layer .ace_selection {\
-background: rgba(100, 5, 208, 0.27)\
-}\
-.ace-katzenmilch.ace_multiselect .ace_selection.ace_start {\
-box-shadow: 0 0 3px 0px #f3f2f3;\
-}\
-.ace-katzenmilch .ace_marker-layer .ace_step {\
-background: rgb(198, 219, 174)\
-}\
-.ace-katzenmilch .ace_marker-layer .ace_bracket {\
-margin: -1px 0 0 -1px;\
-border: 1px solid rgba(0, 0, 0, 0.33);\
-}\
-.ace-katzenmilch .ace_marker-layer .ace_active-line {\
-background: rgb(232, 242, 254)\
-}\
-.ace-katzenmilch .ace_gutter-active-line {\
-background-color: rgb(232, 242, 254)\
-}\
-.ace-katzenmilch .ace_marker-layer .ace_selected-word {\
-border: 1px solid rgba(100, 5, 208, 0.27)\
-}\
-.ace-katzenmilch .ace_invisible {\
-color: #BFBFBF\
-}\
-.ace-katzenmilch .ace_fold {\
-background-color: rgba(2, 95, 73, 0.97);\
-border-color: rgba(15, 0, 9, 1.0)\
-}\
-.ace-katzenmilch .ace_keyword {\
-color: #674Aa8;\
-rbackground-color: rgba(163, 170, 216, 0.055)\
-}\
-.ace-katzenmilch .ace_constant.ace_language {\
-color: #7D7e52;\
-rbackground-color: rgba(189, 190, 130, 0.059)\
-}\
-.ace-katzenmilch .ace_constant.ace_numeric {\
-color: rgba(79, 130, 123, 0.93);\
-rbackground-color: rgba(119, 194, 187, 0.059)\
-}\
-.ace-katzenmilch .ace_constant.ace_character,\
-.ace-katzenmilch .ace_constant.ace_other {\
-color: rgba(2, 95, 105, 1.0);\
-rbackground-color: rgba(127, 34, 153, 0.063)\
-}\
-.ace-katzenmilch .ace_support.ace_function {\
-color: #9D7e62;\
-rbackground-color: rgba(189, 190, 130, 0.039)\
-}\
-.ace-katzenmilch .ace_support.ace_class {\
-color: rgba(239, 106, 167, 1.0);\
-rbackground-color: rgba(239, 106, 167, 0.063)\
-}\
-.ace-katzenmilch .ace_storage {\
-color: rgba(123, 92, 191, 1.0);\
-rbackground-color: rgba(139, 93, 223, 0.051)\
-}\
-.ace-katzenmilch .ace_invalid {\
-color: #DFDFD5;\
-rbackground-color: #CC1B27\
-}\
-.ace-katzenmilch .ace_string {\
-color: #5a5f9b;\
-rbackground-color: rgba(170, 175, 219, 0.035)\
-}\
-.ace-katzenmilch .ace_comment {\
-font-style: italic;\
-color: rgba(64, 79, 80, 0.67);\
-rbackground-color: rgba(95, 15, 255, 0.0078)\
-}\
-.ace-katzenmilch .ace_entity.ace_name.ace_function,\
-.ace-katzenmilch .ace_variable {\
-color: rgba(2, 95, 73, 0.97);\
-rbackground-color: rgba(34, 255, 73, 0.12)\
-}\
-.ace-katzenmilch .ace_variable.ace_language {\
-color: #316fcf;\
-rbackground-color: rgba(58, 175, 255, 0.039)\
-}\
-.ace-katzenmilch .ace_variable.ace_parameter {\
-font-style: italic;\
-color: rgba(51, 150, 159, 0.87);\
-rbackground-color: rgba(5, 214, 249, 0.043)\
-}\
-.ace-katzenmilch .ace_entity.ace_other.ace_attribute-name {\
-color: rgba(73, 70, 194, 0.93);\
-rbackground-color: rgba(73, 134, 194, 0.035)\
-}\
-.ace-katzenmilch .ace_entity.ace_name.ace_tag {\
-color: #3976a2;\
-rbackground-color: rgba(73, 166, 210, 0.039)\
-}";
-
-    var dom = require("../lib/dom");
-    dom.importCssString(exports.cssText, exports.cssClass);
-});
--- a/Server/src/main/resources/static/js/ace/theme-kr_theme.js
+++ b/Server/src/main/resources/static/js/ace/theme-kr_theme.js
@@ -1,104 +0,0 @@
-define("ace/theme/kr_theme", ["require", "exports", "module", "ace/lib/dom"], function (require, exports, module) {
-
-    exports.isDark = true;
-    exports.cssClass = "ace-kr-theme";
-    exports.cssText = ".ace-kr-theme .ace_gutter {\
-background: #1c1917;\
-color: #FCFFE0\
-}\
-.ace-kr-theme .ace_print-margin {\
-width: 1px;\
-background: #1c1917\
-}\
-.ace-kr-theme {\
-background-color: #0B0A09;\
-color: #FCFFE0\
-}\
-.ace-kr-theme .ace_cursor {\
-color: #FF9900\
-}\
-.ace-kr-theme .ace_marker-layer .ace_selection {\
-background: rgba(170, 0, 255, 0.45)\
-}\
-.ace-kr-theme.ace_multiselect .ace_selection.ace_start {\
-box-shadow: 0 0 3px 0px #0B0A09;\
-}\
-.ace-kr-theme .ace_marker-layer .ace_step {\
-background: rgb(102, 82, 0)\
-}\
-.ace-kr-theme .ace_marker-layer .ace_bracket {\
-margin: -1px 0 0 -1px;\
-border: 1px solid rgba(255, 177, 111, 0.32)\
-}\
-.ace-kr-theme .ace_marker-layer .ace_active-line {\
-background: #38403D\
-}\
-.ace-kr-theme .ace_gutter-active-line {\
-background-color : #38403D\
-}\
-.ace-kr-theme .ace_marker-layer .ace_selected-word {\
-border: 1px solid rgba(170, 0, 255, 0.45)\
-}\
-.ace-kr-theme .ace_invisible {\
-color: rgba(255, 177, 111, 0.32)\
-}\
-.ace-kr-theme .ace_keyword,\
-.ace-kr-theme .ace_meta {\
-color: #949C8B\
-}\
-.ace-kr-theme .ace_constant,\
-.ace-kr-theme .ace_constant.ace_character,\
-.ace-kr-theme .ace_constant.ace_character.ace_escape,\
-.ace-kr-theme .ace_constant.ace_other {\
-color: rgba(210, 117, 24, 0.76)\
-}\
-.ace-kr-theme .ace_invalid {\
-color: #F8F8F8;\
-background-color: #A41300\
-}\
-.ace-kr-theme .ace_support {\
-color: #9FC28A\
-}\
-.ace-kr-theme .ace_support.ace_constant {\
-color: #C27E66\
-}\
-.ace-kr-theme .ace_fold {\
-background-color: #949C8B;\
-border-color: #FCFFE0\
-}\
-.ace-kr-theme .ace_support.ace_function {\
-color: #85873A\
-}\
-.ace-kr-theme .ace_storage {\
-color: #FFEE80\
-}\
-.ace-kr-theme .ace_string {\
-color: rgba(164, 161, 181, 0.8)\
-}\
-.ace-kr-theme .ace_string.ace_regexp {\
-color: rgba(125, 255, 192, 0.65)\
-}\
-.ace-kr-theme .ace_comment {\
-font-style: italic;\
-color: #706D5B\
-}\
-.ace-kr-theme .ace_variable {\
-color: #D1A796\
-}\
-.ace-kr-theme .ace_list,\
-.ace-kr-theme .ace_markup.ace_list {\
-background-color: #0F0040\
-}\
-.ace-kr-theme .ace_variable.ace_language {\
-color: #FF80E1\
-}\
-.ace-kr-theme .ace_meta.ace_tag {\
-color: #BABD9C\
-}\
-.ace-kr-theme .ace_indent-guide {\
-background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWNgYGBgYFBXV/8PAAJoAXX4kT2EAAAAAElFTkSuQmCC) right repeat-y\
-}";
-
-    var dom = require("../lib/dom");
-    dom.importCssString(exports.cssText, exports.cssClass);
-});
--- a/Server/src/main/resources/static/js/ace/theme-kuroir.js
+++ b/Server/src/main/resources/static/js/ace/theme-kuroir.js
@@ -1,61 +0,0 @@
-define("ace/theme/kuroir", ["require", "exports", "ace/lib/dom"], function (require, exports) {
-
-    exports.isDark = false;
-    exports.cssClass = "ace-kuroir";
-    exports.cssText = "\
-.ace-kuroir .ace_gutter {\
-background: #e8e8e8;\
-color: #333;\
-}\
-.ace-kuroir .ace_print-margin {\
-width: 1px;\
-background: #e8e8e8;\
-}\
-.ace-kuroir {\
-background-color: #E8E9E8;\
-color: #363636;\
-}\
-.ace-kuroir .ace_cursor {\
-color: #202020;\
-}\
-.ace-kuroir .ace_marker-layer .ace_selection {\
-background: rgba(245, 170, 0, 0.57);\
-}\
-.ace-kuroir.ace_multiselect .ace_selection.ace_start {\
-box-shadow: 0 0 3px 0px #E8E9E8;\
-}\
-.ace-kuroir .ace_marker-layer .ace_step {\
-background: rgb(198, 219, 174);\
-}\
-.ace-kuroir .ace_marker-layer .ace_bracket {\
-margin: -1px 0 0 -1px;\
-border: 1px solid rgba(0, 0, 0, 0.29);\
-}\
-.ace-kuroir .ace_marker-layer .ace_active-line {\
-background: rgba(203, 220, 47, 0.22);\
-}\
-.ace-kuroir .ace_gutter-active-line {\
-background-color: rgba(203, 220, 47, 0.22);\
-}\
-.ace-kuroir .ace_marker-layer .ace_selected-word {\
-border: 1px solid rgba(245, 170, 0, 0.57);\
-}\
-.ace-kuroir .ace_invisible {\
-color: #BFBFBF\
-}\
-.ace-kuroir .ace_fold {\
-border-color: #363636;\
-}\
-.ace-kuroir .ace_constant{color:#CD6839;}.ace-kuroir .ace_constant.ace_numeric{color:#9A5925;}.ace-kuroir .ace_support{color:#104E8B;}.ace-kuroir .ace_support.ace_function{color:#005273;}.ace-kuroir .ace_support.ace_constant{color:#CF6A4C;}.ace-kuroir .ace_storage{color:#A52A2A;}.ace-kuroir .ace_invalid.ace_illegal{color:#FD1224;\
-background-color:rgba(255, 6, 0, 0.15);}.ace-kuroir .ace_invalid.ace_deprecated{text-decoration:underline;\
-font-style:italic;\
-color:#FD1732;\
-background-color:#E8E9E8;}.ace-kuroir .ace_string{color:#639300;}.ace-kuroir .ace_string.ace_regexp{color:#417E00;\
-background-color:#C9D4BE;}.ace-kuroir .ace_comment{color:rgba(148, 148, 148, 0.91);\
-background-color:rgba(220, 220, 220, 0.56);}.ace-kuroir .ace_variable{color:#009ACD;}.ace-kuroir .ace_meta.ace_tag{color:#005273;}.ace-kuroir .ace_markup.ace_heading{color:#B8012D;\
-background-color:rgba(191, 97, 51, 0.051);}.ace-kuroir .ace_markup.ace_list{color:#8F5B26;}\
-";
-
-    var dom = require("../lib/dom");
-    dom.importCssString(exports.cssText, exports.cssClass);
-});
--- a/Server/src/main/resources/static/js/ace/theme-merbivore.js
+++ b/Server/src/main/resources/static/js/ace/theme-merbivore.js
@@ -1,95 +0,0 @@
-define("ace/theme/merbivore", ["require", "exports", "ace/lib/dom"], function (require, exports) {
-
-    exports.isDark = true;
-    exports.cssClass = "ace-merbivore";
-    exports.cssText = ".ace-merbivore .ace_gutter {\
-background: #202020;\
-color: #E6E1DC\
-}\
-.ace-merbivore .ace_print-margin {\
-width: 1px;\
-background: #555651\
-}\
-.ace-merbivore {\
-background-color: #161616;\
-color: #E6E1DC\
-}\
-.ace-merbivore .ace_cursor {\
-color: #FFFFFF\
-}\
-.ace-merbivore .ace_marker-layer .ace_selection {\
-background: #454545\
-}\
-.ace-merbivore.ace_multiselect .ace_selection.ace_start {\
-box-shadow: 0 0 3px 0px #161616;\
-}\
-.ace-merbivore .ace_marker-layer .ace_step {\
-background: rgb(102, 82, 0)\
-}\
-.ace-merbivore .ace_marker-layer .ace_bracket {\
-margin: -1px 0 0 -1px;\
-border: 1px solid #404040\
-}\
-.ace-merbivore .ace_marker-layer .ace_active-line {\
-background: #333435\
-}\
-.ace-merbivore .ace_gutter-active-line {\
-background-color: #333435\
-}\
-.ace-merbivore .ace_marker-layer .ace_selected-word {\
-border: 1px solid #454545\
-}\
-.ace-merbivore .ace_invisible {\
-color: #404040\
-}\
-.ace-merbivore .ace_entity.ace_name.ace_tag,\
-.ace-merbivore .ace_keyword,\
-.ace-merbivore .ace_meta,\
-.ace-merbivore .ace_meta.ace_tag,\
-.ace-merbivore .ace_storage,\
-.ace-merbivore .ace_support.ace_function {\
-color: #FC6F09\
-}\
-.ace-merbivore .ace_constant,\
-.ace-merbivore .ace_constant.ace_character,\
-.ace-merbivore .ace_constant.ace_character.ace_escape,\
-.ace-merbivore .ace_constant.ace_other,\
-.ace-merbivore .ace_support.ace_type {\
-color: #1EDAFB\
-}\
-.ace-merbivore .ace_constant.ace_character.ace_escape {\
-color: #519F50\
-}\
-.ace-merbivore .ace_constant.ace_language {\
-color: #FDC251\
-}\
-.ace-merbivore .ace_constant.ace_library,\
-.ace-merbivore .ace_string,\
-.ace-merbivore .ace_support.ace_constant {\
-color: #8DFF0A\
-}\
-.ace-merbivore .ace_constant.ace_numeric {\
-color: #58C554\
-}\
-.ace-merbivore .ace_invalid {\
-color: #FFFFFF;\
-background-color: #990000\
-}\
-.ace-merbivore .ace_fold {\
-background-color: #FC6F09;\
-border-color: #E6E1DC\
-}\
-.ace-merbivore .ace_comment {\
-font-style: italic;\
-color: #AD2EA4\
-}\
-.ace-merbivore .ace_entity.ace_other.ace_attribute-name {\
-color: #FFFF89\
-}\
-.ace-merbivore .ace_indent-guide {\
-background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWMQFxf3ZXB1df0PAAdsAmERTkEHAAAAAElFTkSuQmCC) right repeat-y\
-}";
-
-    var dom = require("../lib/dom");
-    dom.importCssString(exports.cssText, exports.cssClass);
-});
--- a/Server/src/main/resources/static/js/ace/theme-merbivore_soft.js
+++ b/Server/src/main/resources/static/js/ace/theme-merbivore_soft.js
@@ -1,96 +0,0 @@
-define("ace/theme/merbivore_soft", ["require", "exports", "ace/lib/dom"], function (require, exports) {
-
-    exports.isDark = true;
-    exports.cssClass = "ace-merbivore-soft";
-    exports.cssText = ".ace-merbivore-soft .ace_gutter {\
-background: #262424;\
-color: #E6E1DC\
-}\
-.ace-merbivore-soft .ace_print-margin {\
-width: 1px;\
-background: #262424\
-}\
-.ace-merbivore-soft {\
-background-color: #1C1C1C;\
-color: #E6E1DC\
-}\
-.ace-merbivore-soft .ace_cursor {\
-color: #FFFFFF\
-}\
-.ace-merbivore-soft .ace_marker-layer .ace_selection {\
-background: #494949\
-}\
-.ace-merbivore-soft.ace_multiselect .ace_selection.ace_start {\
-box-shadow: 0 0 3px 0px #1C1C1C;\
-}\
-.ace-merbivore-soft .ace_marker-layer .ace_step {\
-background: rgb(102, 82, 0)\
-}\
-.ace-merbivore-soft .ace_marker-layer .ace_bracket {\
-margin: -1px 0 0 -1px;\
-border: 1px solid #404040\
-}\
-.ace-merbivore-soft .ace_marker-layer .ace_active-line {\
-background: #333435\
-}\
-.ace-merbivore-soft .ace_gutter-active-line {\
-background-color: #333435\
-}\
-.ace-merbivore-soft .ace_marker-layer .ace_selected-word {\
-border: 1px solid #494949\
-}\
-.ace-merbivore-soft .ace_invisible {\
-color: #404040\
-}\
-.ace-merbivore-soft .ace_entity.ace_name.ace_tag,\
-.ace-merbivore-soft .ace_keyword,\
-.ace-merbivore-soft .ace_meta,\
-.ace-merbivore-soft .ace_meta.ace_tag,\
-.ace-merbivore-soft .ace_storage {\
-color: #FC803A\
-}\
-.ace-merbivore-soft .ace_constant,\
-.ace-merbivore-soft .ace_constant.ace_character,\
-.ace-merbivore-soft .ace_constant.ace_character.ace_escape,\
-.ace-merbivore-soft .ace_constant.ace_other,\
-.ace-merbivore-soft .ace_support.ace_type {\
-color: #68C1D8\
-}\
-.ace-merbivore-soft .ace_constant.ace_character.ace_escape {\
-color: #B3E5B4\
-}\
-.ace-merbivore-soft .ace_constant.ace_language {\
-color: #E1C582\
-}\
-.ace-merbivore-soft .ace_constant.ace_library,\
-.ace-merbivore-soft .ace_string,\
-.ace-merbivore-soft .ace_support.ace_constant {\
-color: #8EC65F\
-}\
-.ace-merbivore-soft .ace_constant.ace_numeric {\
-color: #7FC578\
-}\
-.ace-merbivore-soft .ace_invalid,\
-.ace-merbivore-soft .ace_invalid.ace_deprecated {\
-color: #FFFFFF;\
-background-color: #FE3838\
-}\
-.ace-merbivore-soft .ace_fold {\
-background-color: #FC803A;\
-border-color: #E6E1DC\
-}\
-.ace-merbivore-soft .ace_comment,\
-.ace-merbivore-soft .ace_meta {\
-font-style: italic;\
-color: #AC4BB8\
-}\
-.ace-merbivore-soft .ace_entity.ace_other.ace_attribute-name {\
-color: #EAF1A3\
-}\
-.ace-merbivore-soft .ace_indent-guide {\
-background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWOQkpLyZfD09PwPAAfYAnaStpHRAAAAAElFTkSuQmCC) right repeat-y\
-}";
-
-    var dom = require("../lib/dom");
-    dom.importCssString(exports.cssText, exports.cssClass);
-});
--- a/Server/src/main/resources/static/js/ace/theme-mono_industrial.js
+++ b/Server/src/main/resources/static/js/ace/theme-mono_industrial.js
@@ -1,107 +0,0 @@
-define("ace/theme/mono_industrial", ["require", "exports", "ace/lib/dom"], function (require, exports) {
-
-    exports.isDark = true;
-    exports.cssClass = "ace-mono-industrial";
-    exports.cssText = ".ace-mono-industrial .ace_gutter {\
-background: #1d2521;\
-color: #C5C9C9\
-}\
-.ace-mono-industrial .ace_print-margin {\
-width: 1px;\
-background: #555651\
-}\
-.ace-mono-industrial {\
-background-color: #222C28;\
-color: #FFFFFF\
-}\
-.ace-mono-industrial .ace_cursor {\
-color: #FFFFFF\
-}\
-.ace-mono-industrial .ace_marker-layer .ace_selection {\
-background: rgba(145, 153, 148, 0.40)\
-}\
-.ace-mono-industrial.ace_multiselect .ace_selection.ace_start {\
-box-shadow: 0 0 3px 0px #222C28;\
-}\
-.ace-mono-industrial .ace_marker-layer .ace_step {\
-background: rgb(102, 82, 0)\
-}\
-.ace-mono-industrial .ace_marker-layer .ace_bracket {\
-margin: -1px 0 0 -1px;\
-border: 1px solid rgba(102, 108, 104, 0.50)\
-}\
-.ace-mono-industrial .ace_marker-layer .ace_active-line {\
-background: rgba(12, 13, 12, 0.25)\
-}\
-.ace-mono-industrial .ace_gutter-active-line {\
-background-color: rgba(12, 13, 12, 0.25)\
-}\
-.ace-mono-industrial .ace_marker-layer .ace_selected-word {\
-border: 1px solid rgba(145, 153, 148, 0.40)\
-}\
-.ace-mono-industrial .ace_invisible {\
-color: rgba(102, 108, 104, 0.50)\
-}\
-.ace-mono-industrial .ace_string {\
-background-color: #151C19;\
-color: #FFFFFF\
-}\
-.ace-mono-industrial .ace_keyword,\
-.ace-mono-industrial .ace_meta {\
-color: #A39E64\
-}\
-.ace-mono-industrial .ace_constant,\
-.ace-mono-industrial .ace_constant.ace_character,\
-.ace-mono-industrial .ace_constant.ace_character.ace_escape,\
-.ace-mono-industrial .ace_constant.ace_numeric,\
-.ace-mono-industrial .ace_constant.ace_other {\
-color: #E98800\
-}\
-.ace-mono-industrial .ace_entity.ace_name.ace_function,\
-.ace-mono-industrial .ace_keyword.ace_operator,\
-.ace-mono-industrial .ace_variable {\
-color: #A8B3AB\
-}\
-.ace-mono-industrial .ace_invalid {\
-color: #FFFFFF;\
-background-color: rgba(153, 0, 0, 0.68)\
-}\
-.ace-mono-industrial .ace_support.ace_constant {\
-color: #C87500\
-}\
-.ace-mono-industrial .ace_fold {\
-background-color: #A8B3AB;\
-border-color: #FFFFFF\
-}\
-.ace-mono-industrial .ace_support.ace_function {\
-color: #588E60\
-}\
-.ace-mono-industrial .ace_entity.ace_name,\
-.ace-mono-industrial .ace_support.ace_class,\
-.ace-mono-industrial .ace_support.ace_type {\
-color: #5778B6\
-}\
-.ace-mono-industrial .ace_storage {\
-color: #C23B00\
-}\
-.ace-mono-industrial .ace_variable.ace_language,\
-.ace-mono-industrial .ace_variable.ace_parameter {\
-color: #648BD2\
-}\
-.ace-mono-industrial .ace_comment {\
-color: #666C68;\
-background-color: #151C19\
-}\
-.ace-mono-industrial .ace_entity.ace_other.ace_attribute-name {\
-color: #909993\
-}\
-.ace-mono-industrial .ace_entity.ace_name.ace_tag {\
-color: #A65EFF\
-}\
-.ace-mono-industrial .ace_indent-guide {\
-background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWNQ1NbwZfALD/4PAAlTArlEC4r/AAAAAElFTkSuQmCC) right repeat-y\
-}";
-
-    var dom = require("../lib/dom");
-    dom.importCssString(exports.cssText, exports.cssClass);
-});
--- a/Server/src/main/resources/static/js/ace/theme-monokai.js
+++ b/Server/src/main/resources/static/js/ace/theme-monokai.js
@@ -1,105 +0,0 @@
-define("ace/theme/monokai", ["require", "exports", "module", "ace/lib/dom"], function (require, exports, module) {
-
-    exports.isDark = true;
-    exports.cssClass = "ace-monokai";
-    exports.cssText = ".ace-monokai .ace_gutter {\
-background: #2F3129;\
-color: #8F908A\
-}\
-.ace-monokai .ace_print-margin {\
-width: 1px;\
-background: #555651\
-}\
-.ace-monokai {\
-background-color: #272822;\
-color: #F8F8F2\
-}\
-.ace-monokai .ace_cursor {\
-color: #F8F8F0\
-}\
-.ace-monokai .ace_marker-layer .ace_selection {\
-background: #49483E\
-}\
-.ace-monokai.ace_multiselect .ace_selection.ace_start {\
-box-shadow: 0 0 3px 0px #272822;\
-}\
-.ace-monokai .ace_marker-layer .ace_step {\
-background: rgb(102, 82, 0)\
-}\
-.ace-monokai .ace_marker-layer .ace_bracket {\
-margin: -1px 0 0 -1px;\
-border: 1px solid #49483E\
-}\
-.ace-monokai .ace_marker-layer .ace_active-line {\
-background: #202020\
-}\
-.ace-monokai .ace_gutter-active-line {\
-background-color: #272727\
-}\
-.ace-monokai .ace_marker-layer .ace_selected-word {\
-border: 1px solid #49483E\
-}\
-.ace-monokai .ace_invisible {\
-color: #52524d\
-}\
-.ace-monokai .ace_entity.ace_name.ace_tag,\
-.ace-monokai .ace_keyword,\
-.ace-monokai .ace_meta.ace_tag,\
-.ace-monokai .ace_storage {\
-color: #F92672\
-}\
-.ace-monokai .ace_punctuation,\
-.ace-monokai .ace_punctuation.ace_tag {\
-color: #fff\
-}\
-.ace-monokai .ace_constant.ace_character,\
-.ace-monokai .ace_constant.ace_language,\
-.ace-monokai .ace_constant.ace_numeric,\
-.ace-monokai .ace_constant.ace_other {\
-color: #AE81FF\
-}\
-.ace-monokai .ace_invalid {\
-color: #F8F8F0;\
-background-color: #F92672\
-}\
-.ace-monokai .ace_invalid.ace_deprecated {\
-color: #F8F8F0;\
-background-color: #AE81FF\
-}\
-.ace-monokai .ace_support.ace_constant,\
-.ace-monokai .ace_support.ace_function {\
-color: #66D9EF\
-}\
-.ace-monokai .ace_fold {\
-background-color: #A6E22E;\
-border-color: #F8F8F2\
-}\
-.ace-monokai .ace_storage.ace_type,\
-.ace-monokai .ace_support.ace_class,\
-.ace-monokai .ace_support.ace_type {\
-font-style: italic;\
-color: #66D9EF\
-}\
-.ace-monokai .ace_entity.ace_name.ace_function,\
-.ace-monokai .ace_entity.ace_other,\
-.ace-monokai .ace_entity.ace_other.ace_attribute-name,\
-.ace-monokai .ace_variable {\
-color: #A6E22E\
-}\
-.ace-monokai .ace_variable.ace_parameter {\
-font-style: italic;\
-color: #FD971F\
-}\
-.ace-monokai .ace_string {\
-color: #E6DB74\
-}\
-.ace-monokai .ace_comment {\
-color: #75715E\
-}\
-.ace-monokai .ace_indent-guide {\
-background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWPQ0FD0ZXBzd/wPAAjVAoxeSgNeAAAAAElFTkSuQmCC) right repeat-y\
-}";
-
-    var dom = require("../lib/dom");
-    dom.importCssString(exports.cssText, exports.cssClass);
-});
--- a/Server/src/main/resources/static/js/ace/theme-pastel_on_dark.js
+++ b/Server/src/main/resources/static/js/ace/theme-pastel_on_dark.js
@@ -1,108 +0,0 @@
-define("ace/theme/pastel_on_dark", ["require", "exports", "ace/lib/dom"], function (require, exports) {
-
-    exports.isDark = true;
-    exports.cssClass = "ace-pastel-on-dark";
-    exports.cssText = ".ace-pastel-on-dark .ace_gutter {\
-background: #353030;\
-color: #8F938F\
-}\
-.ace-pastel-on-dark .ace_print-margin {\
-width: 1px;\
-background: #353030\
-}\
-.ace-pastel-on-dark {\
-background-color: #2C2828;\
-color: #8F938F\
-}\
-.ace-pastel-on-dark .ace_cursor {\
-color: #A7A7A7\
-}\
-.ace-pastel-on-dark .ace_marker-layer .ace_selection {\
-background: rgba(221, 240, 255, 0.20)\
-}\
-.ace-pastel-on-dark.ace_multiselect .ace_selection.ace_start {\
-box-shadow: 0 0 3px 0px #2C2828;\
-}\
-.ace-pastel-on-dark .ace_marker-layer .ace_step {\
-background: rgb(102, 82, 0)\
-}\
-.ace-pastel-on-dark .ace_marker-layer .ace_bracket {\
-margin: -1px 0 0 -1px;\
-border: 1px solid rgba(255, 255, 255, 0.25)\
-}\
-.ace-pastel-on-dark .ace_marker-layer .ace_active-line {\
-background: rgba(255, 255, 255, 0.031)\
-}\
-.ace-pastel-on-dark .ace_gutter-active-line {\
-background-color: rgba(255, 255, 255, 0.031)\
-}\
-.ace-pastel-on-dark .ace_marker-layer .ace_selected-word {\
-border: 1px solid rgba(221, 240, 255, 0.20)\
-}\
-.ace-pastel-on-dark .ace_invisible {\
-color: rgba(255, 255, 255, 0.25)\
-}\
-.ace-pastel-on-dark .ace_keyword,\
-.ace-pastel-on-dark .ace_meta {\
-color: #757aD8\
-}\
-.ace-pastel-on-dark .ace_constant,\
-.ace-pastel-on-dark .ace_constant.ace_character,\
-.ace-pastel-on-dark .ace_constant.ace_character.ace_escape,\
-.ace-pastel-on-dark .ace_constant.ace_other {\
-color: #4FB7C5\
-}\
-.ace-pastel-on-dark .ace_keyword.ace_operator {\
-color: #797878\
-}\
-.ace-pastel-on-dark .ace_constant.ace_character {\
-color: #AFA472\
-}\
-.ace-pastel-on-dark .ace_constant.ace_language {\
-color: #DE8E30\
-}\
-.ace-pastel-on-dark .ace_constant.ace_numeric {\
-color: #CCCCCC\
-}\
-.ace-pastel-on-dark .ace_invalid,\
-.ace-pastel-on-dark .ace_invalid.ace_illegal {\
-color: #F8F8F8;\
-background-color: rgba(86, 45, 86, 0.75)\
-}\
-.ace-pastel-on-dark .ace_invalid.ace_deprecated {\
-text-decoration: underline;\
-font-style: italic;\
-color: #D2A8A1\
-}\
-.ace-pastel-on-dark .ace_fold {\
-background-color: #757aD8;\
-border-color: #8F938F\
-}\
-.ace-pastel-on-dark .ace_support.ace_function {\
-color: #AEB2F8\
-}\
-.ace-pastel-on-dark .ace_string {\
-color: #66A968\
-}\
-.ace-pastel-on-dark .ace_string.ace_regexp {\
-color: #E9C062\
-}\
-.ace-pastel-on-dark .ace_comment {\
-color: #A6C6FF\
-}\
-.ace-pastel-on-dark .ace_variable {\
-color: #BEBF55\
-}\
-.ace-pastel-on-dark .ace_variable.ace_language {\
-color: #C1C144\
-}\
-.ace-pastel-on-dark .ace_xml-pe {\
-color: #494949\
-}\
-.ace-pastel-on-dark .ace_indent-guide {\
-background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWNgYGBgYIiPj/8PAARgAh2NTMh8AAAAAElFTkSuQmCC) right repeat-y\
-}";
-
-    var dom = require("../lib/dom");
-    dom.importCssString(exports.cssText, exports.cssClass);
-});
--- a/Server/src/main/resources/static/js/ace/theme-solarized_dark.js
+++ b/Server/src/main/resources/static/js/ace/theme-solarized_dark.js
@@ -1,88 +0,0 @@
-define("ace/theme/solarized_dark", ["require", "exports", "ace/lib/dom"], function (require, exports) {
-
-    exports.isDark = true;
-    exports.cssClass = "ace-solarized-dark";
-    exports.cssText = ".ace-solarized-dark .ace_gutter {\
-background: #01313f;\
-color: #d0edf7\
-}\
-.ace-solarized-dark .ace_print-margin {\
-width: 1px;\
-background: #33555E\
-}\
-.ace-solarized-dark {\
-background-color: #002B36;\
-color: #93A1A1\
-}\
-.ace-solarized-dark .ace_entity.ace_other.ace_attribute-name,\
-.ace-solarized-dark .ace_storage {\
-color: #93A1A1\
-}\
-.ace-solarized-dark .ace_cursor,\
-.ace-solarized-dark .ace_string.ace_regexp {\
-color: #D30102\
-}\
-.ace-solarized-dark .ace_marker-layer .ace_active-line,\
-.ace-solarized-dark .ace_marker-layer .ace_selection {\
-background: rgba(255, 255, 255, 0.1)\
-}\
-.ace-solarized-dark.ace_multiselect .ace_selection.ace_start {\
-box-shadow: 0 0 3px 0px #002B36;\
-}\
-.ace-solarized-dark .ace_marker-layer .ace_step {\
-background: rgb(102, 82, 0)\
-}\
-.ace-solarized-dark .ace_marker-layer .ace_bracket {\
-margin: -1px 0 0 -1px;\
-border: 1px solid rgba(147, 161, 161, 0.50)\
-}\
-.ace-solarized-dark .ace_gutter-active-line {\
-background-color: #0d3440\
-}\
-.ace-solarized-dark .ace_marker-layer .ace_selected-word {\
-border: 1px solid #073642\
-}\
-.ace-solarized-dark .ace_invisible {\
-color: rgba(147, 161, 161, 0.50)\
-}\
-.ace-solarized-dark .ace_keyword,\
-.ace-solarized-dark .ace_meta,\
-.ace-solarized-dark .ace_support.ace_class,\
-.ace-solarized-dark .ace_support.ace_type {\
-color: #859900\
-}\
-.ace-solarized-dark .ace_constant.ace_character,\
-.ace-solarized-dark .ace_constant.ace_other {\
-color: #CB4B16\
-}\
-.ace-solarized-dark .ace_constant.ace_language {\
-color: #B58900\
-}\
-.ace-solarized-dark .ace_constant.ace_numeric {\
-color: #D33682\
-}\
-.ace-solarized-dark .ace_fold {\
-background-color: #268BD2;\
-border-color: #93A1A1\
-}\
-.ace-solarized-dark .ace_entity.ace_name.ace_function,\
-.ace-solarized-dark .ace_entity.ace_name.ace_tag,\
-.ace-solarized-dark .ace_support.ace_function,\
-.ace-solarized-dark .ace_variable,\
-.ace-solarized-dark .ace_variable.ace_language {\
-color: #268BD2\
-}\
-.ace-solarized-dark .ace_string {\
-color: #2AA198\
-}\
-.ace-solarized-dark .ace_comment {\
-font-style: italic;\
-color: #657B83\
-}\
-.ace-solarized-dark .ace_indent-guide {\
-background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWNg0Db1ZVCxc/sPAAd4AlUHlLenAAAAAElFTkSuQmCC) right repeat-y\
-}";
-
-    var dom = require("../lib/dom");
-    dom.importCssString(exports.cssText, exports.cssClass);
-});
--- a/Server/src/main/resources/static/js/ace/theme-solarized_light.js
+++ b/Server/src/main/resources/static/js/ace/theme-solarized_light.js
@@ -1,91 +0,0 @@
-define("ace/theme/solarized_light", ["require", "exports", "ace/lib/dom"], function (require, exports) {
-
-    exports.isDark = false;
-    exports.cssClass = "ace-solarized-light";
-    exports.cssText = ".ace-solarized-light .ace_gutter {\
-background: #fbf1d3;\
-color: #333\
-}\
-.ace-solarized-light .ace_print-margin {\
-width: 1px;\
-background: #e8e8e8\
-}\
-.ace-solarized-light {\
-background-color: #FDF6E3;\
-color: #586E75\
-}\
-.ace-solarized-light .ace_cursor {\
-color: #000000\
-}\
-.ace-solarized-light .ace_marker-layer .ace_selection {\
-background: rgba(7, 54, 67, 0.09)\
-}\
-.ace-solarized-light.ace_multiselect .ace_selection.ace_start {\
-box-shadow: 0 0 3px 0px #FDF6E3;\
-}\
-.ace-solarized-light .ace_marker-layer .ace_step {\
-background: rgb(255, 255, 0)\
-}\
-.ace-solarized-light .ace_marker-layer .ace_bracket {\
-margin: -1px 0 0 -1px;\
-border: 1px solid rgba(147, 161, 161, 0.50)\
-}\
-.ace-solarized-light .ace_marker-layer .ace_active-line {\
-background: #EEE8D5\
-}\
-.ace-solarized-light .ace_gutter-active-line {\
-background-color : #EDE5C1\
-}\
-.ace-solarized-light .ace_marker-layer .ace_selected-word {\
-border: 1px solid #073642\
-}\
-.ace-solarized-light .ace_invisible {\
-color: rgba(147, 161, 161, 0.50)\
-}\
-.ace-solarized-light .ace_keyword,\
-.ace-solarized-light .ace_meta,\
-.ace-solarized-light .ace_support.ace_class,\
-.ace-solarized-light .ace_support.ace_type {\
-color: #859900\
-}\
-.ace-solarized-light .ace_constant.ace_character,\
-.ace-solarized-light .ace_constant.ace_other {\
-color: #CB4B16\
-}\
-.ace-solarized-light .ace_constant.ace_language {\
-color: #B58900\
-}\
-.ace-solarized-light .ace_constant.ace_numeric {\
-color: #D33682\
-}\
-.ace-solarized-light .ace_fold {\
-background-color: #268BD2;\
-border-color: #586E75\
-}\
-.ace-solarized-light .ace_entity.ace_name.ace_function,\
-.ace-solarized-light .ace_entity.ace_name.ace_tag,\
-.ace-solarized-light .ace_support.ace_function,\
-.ace-solarized-light .ace_variable,\
-.ace-solarized-light .ace_variable.ace_language {\
-color: #268BD2\
-}\
-.ace-solarized-light .ace_storage {\
-color: #073642\
-}\
-.ace-solarized-light .ace_string {\
-color: #2AA198\
-}\
-.ace-solarized-light .ace_string.ace_regexp {\
-color: #D30102\
-}\
-.ace-solarized-light .ace_comment,\
-.ace-solarized-light .ace_entity.ace_other.ace_attribute-name {\
-color: #93A1A1\
-}\
-.ace-solarized-light .ace_indent-guide {\
-background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWNgYGBgYHjy8NJ/AAjgA5fzQUmBAAAAAElFTkSuQmCC) right repeat-y\
-}";
-
-    var dom = require("../lib/dom");
-    dom.importCssString(exports.cssText, exports.cssClass);
-});
--- a/Server/src/main/resources/static/js/ace/theme-sqlserver.js
+++ b/Server/src/main/resources/static/js/ace/theme-sqlserver.js
@@ -1,138 +0,0 @@
-define("ace/theme/sqlserver", ["require", "exports", "ace/lib/dom"], function (require, exports) {
-
-    exports.isDark = false;
-    exports.cssClass = "ace-sqlserver";
-    exports.cssText = ".ace-sqlserver .ace_gutter {\
-background: #ebebeb;\
-color: #333;\
-overflow: hidden;\
-}\
-.ace-sqlserver .ace_print-margin {\
-width: 1px;\
-background: #e8e8e8;\
-}\
-.ace-sqlserver {\
-background-color: #FFFFFF;\
-color: black;\
-}\
-.ace-sqlserver .ace_identifier {\
-color: black;\
-}\
-.ace-sqlserver .ace_keyword {\
-color: #0000FF;\
-}\
-.ace-sqlserver .ace_numeric {\
-color: black;\
-}\
-.ace-sqlserver .ace_storage {\
-color: #11B7BE;\
-}\
-.ace-sqlserver .ace_keyword.ace_operator,\
-.ace-sqlserver .ace_lparen,\
-.ace-sqlserver .ace_rparen,\
-.ace-sqlserver .ace_punctuation {\
-color: #808080;\
-}\
-.ace-sqlserver .ace_set.ace_statement {\
-color: #0000FF;\
-text-decoration: underline;\
-}\
-.ace-sqlserver .ace_cursor {\
-color: black;\
-}\
-.ace-sqlserver .ace_invisible {\
-color: rgb(191, 191, 191);\
-}\
-.ace-sqlserver .ace_constant.ace_buildin {\
-color: rgb(88, 72, 246);\
-}\
-.ace-sqlserver .ace_constant.ace_language {\
-color: #979797;\
-}\
-.ace-sqlserver .ace_constant.ace_library {\
-color: rgb(6, 150, 14);\
-}\
-.ace-sqlserver .ace_invalid {\
-background-color: rgb(153, 0, 0);\
-color: white;\
-}\
-.ace-sqlserver .ace_support.ace_function {\
-color: #FF00FF;\
-}\
-.ace-sqlserver .ace_support.ace_constant {\
-color: rgb(6, 150, 14);\
-}\
-.ace-sqlserver .ace_class {\
-color: #008080;\
-}\
-.ace-sqlserver .ace_support.ace_other {\
-color: #6D79DE;\
-}\
-.ace-sqlserver .ace_variable.ace_parameter {\
-font-style: italic;\
-color: #FD971F;\
-}\
-.ace-sqlserver .ace_comment {\
-color: #008000;\
-}\
-.ace-sqlserver .ace_constant.ace_numeric {\
-color: black;\
-}\
-.ace-sqlserver .ace_variable {\
-color: rgb(49, 132, 149);\
-}\
-.ace-sqlserver .ace_xml-pe {\
-color: rgb(104, 104, 91);\
-}\
-.ace-sqlserver .ace_support.ace_storedprocedure {\
-color: #800000;\
-}\
-.ace-sqlserver .ace_heading {\
-color: rgb(12, 7, 255);\
-}\
-.ace-sqlserver .ace_list {\
-color: rgb(185, 6, 144);\
-}\
-.ace-sqlserver .ace_marker-layer .ace_selection {\
-background: rgb(181, 213, 255);\
-}\
-.ace-sqlserver .ace_marker-layer .ace_step {\
-background: rgb(252, 255, 0);\
-}\
-.ace-sqlserver .ace_marker-layer .ace_stack {\
-background: rgb(164, 229, 101);\
-}\
-.ace-sqlserver .ace_marker-layer .ace_bracket {\
-margin: -1px 0 0 -1px;\
-border: 1px solid rgb(192, 192, 192);\
-}\
-.ace-sqlserver .ace_marker-layer .ace_active-line {\
-background: rgba(0, 0, 0, 0.07);\
-}\
-.ace-sqlserver .ace_gutter-active-line {\
-background-color: #dcdcdc;\
-}\
-.ace-sqlserver .ace_marker-layer .ace_selected-word {\
-background: rgb(250, 250, 255);\
-border: 1px solid rgb(200, 200, 250);\
-}\
-.ace-sqlserver .ace_meta.ace_tag {\
-color: #0000FF;\
-}\
-.ace-sqlserver .ace_string.ace_regex {\
-color: #FF0000;\
-}\
-.ace-sqlserver .ace_string {\
-color: #FF0000;\
-}\
-.ace-sqlserver .ace_entity.ace_other.ace_attribute-name {\
-color: #994409;\
-}\
-.ace-sqlserver .ace_indent-guide {\
-background: url(\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAE0lEQVQImWP4////f4bLly//BwAmVgd1/w11/gAAAABJRU5ErkJggg==\") right repeat-y;\
-}\
-";
-
-    var dom = require("../lib/dom");
-    dom.importCssString(exports.cssText, exports.cssClass);
-});
--- a/Server/src/main/resources/static/js/ace/theme-terminal.js
+++ b/Server/src/main/resources/static/js/ace/theme-terminal.js
@@ -1,114 +0,0 @@
-define("ace/theme/terminal", ["require", "exports", "ace/lib/dom"], function (require, exports) {
-
-    exports.isDark = true;
-    exports.cssClass = "ace-terminal-theme";
-    exports.cssText = ".ace-terminal-theme .ace_gutter {\
-background: #1a0005;\
-color: steelblue\
-}\
-.ace-terminal-theme .ace_print-margin {\
-width: 1px;\
-background: #1a1a1a\
-}\
-.ace-terminal-theme {\
-background-color: black;\
-color: #DEDEDE\
-}\
-.ace-terminal-theme .ace_cursor {\
-color: #9F9F9F\
-}\
-.ace-terminal-theme .ace_marker-layer .ace_selection {\
-background: #424242\
-}\
-.ace-terminal-theme.ace_multiselect .ace_selection.ace_start {\
-box-shadow: 0 0 3px 0px black;\
-}\
-.ace-terminal-theme .ace_marker-layer .ace_step {\
-background: rgb(0, 0, 0)\
-}\
-.ace-terminal-theme .ace_marker-layer .ace_bracket {\
-background: #090;\
-}\
-.ace-terminal-theme .ace_marker-layer .ace_bracket-start {\
-background: #090;\
-}\
-.ace-terminal-theme .ace_marker-layer .ace_bracket-unmatched {\
-margin: -1px 0 0 -1px;\
-border: 1px solid #900\
-}\
-.ace-terminal-theme .ace_marker-layer .ace_active-line {\
-background: #2A2A2A\
-}\
-.ace-terminal-theme .ace_gutter-active-line {\
-background-color: #2A112A\
-}\
-.ace-terminal-theme .ace_marker-layer .ace_selected-word {\
-border: 1px solid #424242\
-}\
-.ace-terminal-theme .ace_invisible {\
-color: #343434\
-}\
-.ace-terminal-theme .ace_keyword,\
-.ace-terminal-theme .ace_meta,\
-.ace-terminal-theme .ace_storage,\
-.ace-terminal-theme .ace_storage.ace_type,\
-.ace-terminal-theme .ace_support.ace_type {\
-color: tomato\
-}\
-.ace-terminal-theme .ace_keyword.ace_operator {\
-color: deeppink\
-}\
-.ace-terminal-theme .ace_constant.ace_character,\
-.ace-terminal-theme .ace_constant.ace_language,\
-.ace-terminal-theme .ace_constant.ace_numeric,\
-.ace-terminal-theme .ace_keyword.ace_other.ace_unit,\
-.ace-terminal-theme .ace_support.ace_constant,\
-.ace-terminal-theme .ace_variable.ace_parameter {\
-color: #E78C45\
-}\
-.ace-terminal-theme .ace_constant.ace_other {\
-color: gold\
-}\
-.ace-terminal-theme .ace_invalid {\
-color: yellow;\
-background-color: red\
-}\
-.ace-terminal-theme .ace_invalid.ace_deprecated {\
-color: #CED2CF;\
-background-color: #B798BF\
-}\
-.ace-terminal-theme .ace_fold {\
-background-color: #7AA6DA;\
-border-color: #DEDEDE\
-}\
-.ace-terminal-theme .ace_entity.ace_name.ace_function,\
-.ace-terminal-theme .ace_support.ace_function,\
-.ace-terminal-theme .ace_variable {\
-color: #7AA6DA\
-}\
-.ace-terminal-theme .ace_support.ace_class,\
-.ace-terminal-theme .ace_support.ace_type {\
-color: #E7C547\
-}\
-.ace-terminal-theme .ace_heading,\
-.ace-terminal-theme .ace_string {\
-color: #B9CA4A\
-}\
-.ace-terminal-theme .ace_entity.ace_name.ace_tag,\
-.ace-terminal-theme .ace_entity.ace_other.ace_attribute-name,\
-.ace-terminal-theme .ace_meta.ace_tag,\
-.ace-terminal-theme .ace_string.ace_regexp,\
-.ace-terminal-theme .ace_variable {\
-color: #D54E53\
-}\
-.ace-terminal-theme .ace_comment {\
-color: orangered\
-}\
-.ace-terminal-theme .ace_indent-guide {\
-background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWNgYGBgYLBWV/8PAAK4AYnhiq+xAAAAAElFTkSuQmCC) right repeat-y;\
-}\
-";
-
-    var dom = require("../lib/dom");
-    dom.importCssString(exports.cssText, exports.cssClass);
-});
--- a/Server/src/main/resources/static/js/ace/theme-textmate.js
+++ b/Server/src/main/resources/static/js/ace/theme-textmate.js
@@ -1,129 +0,0 @@
-define("ace/theme/textmate", ["require", "exports", "ace/lib/dom"], function (require, exports) {
-    "use strict";
-
-    exports.isDark = false;
-    exports.cssClass = "ace-tm";
-    exports.cssText = ".ace-tm .ace_gutter {\
-background: #f0f0f0;\
-color: #333;\
-}\
-.ace-tm .ace_print-margin {\
-width: 1px;\
-background: #e8e8e8;\
-}\
-.ace-tm .ace_fold {\
-background-color: #6B72E6;\
-}\
-.ace-tm {\
-background-color: #FFFFFF;\
-color: black;\
-}\
-.ace-tm .ace_cursor {\
-color: black;\
-}\
-.ace-tm .ace_invisible {\
-color: rgb(191, 191, 191);\
-}\
-.ace-tm .ace_storage,\
-.ace-tm .ace_keyword {\
-color: blue;\
-}\
-.ace-tm .ace_constant {\
-color: rgb(197, 6, 11);\
-}\
-.ace-tm .ace_constant.ace_buildin {\
-color: rgb(88, 72, 246);\
-}\
-.ace-tm .ace_constant.ace_language {\
-color: rgb(88, 92, 246);\
-}\
-.ace-tm .ace_constant.ace_library {\
-color: rgb(6, 150, 14);\
-}\
-.ace-tm .ace_invalid {\
-background-color: rgba(255, 0, 0, 0.1);\
-color: red;\
-}\
-.ace-tm .ace_support.ace_function {\
-color: rgb(60, 76, 114);\
-}\
-.ace-tm .ace_support.ace_constant {\
-color: rgb(6, 150, 14);\
-}\
-.ace-tm .ace_support.ace_type,\
-.ace-tm .ace_support.ace_class {\
-color: rgb(109, 121, 222);\
-}\
-.ace-tm .ace_keyword.ace_operator {\
-color: rgb(104, 118, 135);\
-}\
-.ace-tm .ace_string {\
-color: rgb(3, 106, 7);\
-}\
-.ace-tm .ace_comment {\
-color: rgb(76, 136, 107);\
-}\
-.ace-tm .ace_comment.ace_doc {\
-color: rgb(0, 102, 255);\
-}\
-.ace-tm .ace_comment.ace_doc.ace_tag {\
-color: rgb(128, 159, 191);\
-}\
-.ace-tm .ace_constant.ace_numeric {\
-color: rgb(0, 0, 205);\
-}\
-.ace-tm .ace_variable {\
-color: rgb(49, 132, 149);\
-}\
-.ace-tm .ace_xml-pe {\
-color: rgb(104, 104, 91);\
-}\
-.ace-tm .ace_entity.ace_name.ace_function {\
-color: #0000A2;\
-}\
-.ace-tm .ace_heading {\
-color: rgb(12, 7, 255);\
-}\
-.ace-tm .ace_list {\
-color:rgb(185, 6, 144);\
-}\
-.ace-tm .ace_meta.ace_tag {\
-color:rgb(0, 22, 142);\
-}\
-.ace-tm .ace_string.ace_regex {\
-color: rgb(255, 0, 0)\
-}\
-.ace-tm .ace_marker-layer .ace_selection {\
-background: rgb(181, 213, 255);\
-}\
-.ace-tm.ace_multiselect .ace_selection.ace_start {\
-box-shadow: 0 0 3px 0px white;\
-}\
-.ace-tm .ace_marker-layer .ace_step {\
-background: rgb(252, 255, 0);\
-}\
-.ace-tm .ace_marker-layer .ace_stack {\
-background: rgb(164, 229, 101);\
-}\
-.ace-tm .ace_marker-layer .ace_bracket {\
-margin: -1px 0 0 -1px;\
-border: 1px solid rgb(192, 192, 192);\
-}\
-.ace-tm .ace_marker-layer .ace_active-line {\
-background: rgba(0, 0, 0, 0.07);\
-}\
-.ace-tm .ace_gutter-active-line {\
-background-color : #dcdcdc;\
-}\
-.ace-tm .ace_marker-layer .ace_selected-word {\
-background: rgb(250, 250, 255);\
-border: 1px solid rgb(200, 200, 250);\
-}\
-.ace-tm .ace_indent-guide {\
-background: url(\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAE0lEQVQImWP4////f4bLly//BwAmVgd1/w11/gAAAABJRU5ErkJggg==\") right repeat-y;\
-}\
-";
-
-    var dom = require("../lib/dom");
-    dom.importCssString(exports.cssText, exports.cssClass);
-});
--- a/Server/src/main/resources/static/js/ace/theme-tomorrow.js
+++ b/Server/src/main/resources/static/js/ace/theme-tomorrow.js
@@ -1,108 +0,0 @@
-define("ace/theme/tomorrow", ["require", "exports", "ace/lib/dom"], function (require, exports) {
-
-    exports.isDark = false;
-    exports.cssClass = "ace-tomorrow";
-    exports.cssText = ".ace-tomorrow .ace_gutter {\
-background: #f6f6f6;\
-color: #4D4D4C\
-}\
-.ace-tomorrow .ace_print-margin {\
-width: 1px;\
-background: #f6f6f6\
-}\
-.ace-tomorrow {\
-background-color: #FFFFFF;\
-color: #4D4D4C\
-}\
-.ace-tomorrow .ace_cursor {\
-color: #AEAFAD\
-}\
-.ace-tomorrow .ace_marker-layer .ace_selection {\
-background: #D6D6D6\
-}\
-.ace-tomorrow.ace_multiselect .ace_selection.ace_start {\
-box-shadow: 0 0 3px 0px #FFFFFF;\
-}\
-.ace-tomorrow .ace_marker-layer .ace_step {\
-background: rgb(255, 255, 0)\
-}\
-.ace-tomorrow .ace_marker-layer .ace_bracket {\
-margin: -1px 0 0 -1px;\
-border: 1px solid #D1D1D1\
-}\
-.ace-tomorrow .ace_marker-layer .ace_active-line {\
-background: #EFEFEF\
-}\
-.ace-tomorrow .ace_gutter-active-line {\
-background-color : #dcdcdc\
-}\
-.ace-tomorrow .ace_marker-layer .ace_selected-word {\
-border: 1px solid #D6D6D6\
-}\
-.ace-tomorrow .ace_invisible {\
-color: #D1D1D1\
-}\
-.ace-tomorrow .ace_keyword,\
-.ace-tomorrow .ace_meta,\
-.ace-tomorrow .ace_storage,\
-.ace-tomorrow .ace_storage.ace_type,\
-.ace-tomorrow .ace_support.ace_type {\
-color: #8959A8\
-}\
-.ace-tomorrow .ace_keyword.ace_operator {\
-color: #3E999F\
-}\
-.ace-tomorrow .ace_constant.ace_character,\
-.ace-tomorrow .ace_constant.ace_language,\
-.ace-tomorrow .ace_constant.ace_numeric,\
-.ace-tomorrow .ace_keyword.ace_other.ace_unit,\
-.ace-tomorrow .ace_support.ace_constant,\
-.ace-tomorrow .ace_variable.ace_parameter {\
-color: #F5871F\
-}\
-.ace-tomorrow .ace_constant.ace_other {\
-color: #666969\
-}\
-.ace-tomorrow .ace_invalid {\
-color: #FFFFFF;\
-background-color: #C82829\
-}\
-.ace-tomorrow .ace_invalid.ace_deprecated {\
-color: #FFFFFF;\
-background-color: #8959A8\
-}\
-.ace-tomorrow .ace_fold {\
-background-color: #4271AE;\
-border-color: #4D4D4C\
-}\
-.ace-tomorrow .ace_entity.ace_name.ace_function,\
-.ace-tomorrow .ace_support.ace_function,\
-.ace-tomorrow .ace_variable {\
-color: #4271AE\
-}\
-.ace-tomorrow .ace_support.ace_class,\
-.ace-tomorrow .ace_support.ace_type {\
-color: #C99E00\
-}\
-.ace-tomorrow .ace_heading,\
-.ace-tomorrow .ace_markup.ace_heading,\
-.ace-tomorrow .ace_string {\
-color: #718C00\
-}\
-.ace-tomorrow .ace_entity.ace_name.ace_tag,\
-.ace-tomorrow .ace_entity.ace_other.ace_attribute-name,\
-.ace-tomorrow .ace_meta.ace_tag,\
-.ace-tomorrow .ace_string.ace_regexp,\
-.ace-tomorrow .ace_variable {\
-color: #C82829\
-}\
-.ace-tomorrow .ace_comment {\
-color: #8E908C\
-}\
-.ace-tomorrow .ace_indent-guide {\
-background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAE0lEQVQImWP4////f4bdu3f/BwAlfgctduB85QAAAABJRU5ErkJggg==) right repeat-y\
-}";
-
-    var dom = require("../lib/dom");
-    dom.importCssString(exports.cssText, exports.cssClass);
-});
--- a/Server/src/main/resources/static/js/ace/theme-tomorrow_night.js
+++ b/Server/src/main/resources/static/js/ace/theme-tomorrow_night.js
@@ -1,108 +0,0 @@
-define("ace/theme/tomorrow_night", ["require", "exports", "ace/lib/dom"], function (require, exports) {
-
-    exports.isDark = true;
-    exports.cssClass = "ace-tomorrow-night";
-    exports.cssText = ".ace-tomorrow-night .ace_gutter {\
-background: #25282c;\
-color: #C5C8C6\
-}\
-.ace-tomorrow-night .ace_print-margin {\
-width: 1px;\
-background: #25282c\
-}\
-.ace-tomorrow-night {\
-background-color: #1D1F21;\
-color: #C5C8C6\
-}\
-.ace-tomorrow-night .ace_cursor {\
-color: #AEAFAD\
-}\
-.ace-tomorrow-night .ace_marker-layer .ace_selection {\
-background: #373B41\
-}\
-.ace-tomorrow-night.ace_multiselect .ace_selection.ace_start {\
-box-shadow: 0 0 3px 0px #1D1F21;\
-}\
-.ace-tomorrow-night .ace_marker-layer .ace_step {\
-background: rgb(102, 82, 0)\
-}\
-.ace-tomorrow-night .ace_marker-layer .ace_bracket {\
-margin: -1px 0 0 -1px;\
-border: 1px solid #4B4E55\
-}\
-.ace-tomorrow-night .ace_marker-layer .ace_active-line {\
-background: #282A2E\
-}\
-.ace-tomorrow-night .ace_gutter-active-line {\
-background-color: #282A2E\
-}\
-.ace-tomorrow-night .ace_marker-layer .ace_selected-word {\
-border: 1px solid #373B41\
-}\
-.ace-tomorrow-night .ace_invisible {\
-color: #4B4E55\
-}\
-.ace-tomorrow-night .ace_keyword,\
-.ace-tomorrow-night .ace_meta,\
-.ace-tomorrow-night .ace_storage,\
-.ace-tomorrow-night .ace_storage.ace_type,\
-.ace-tomorrow-night .ace_support.ace_type {\
-color: #B294BB\
-}\
-.ace-tomorrow-night .ace_keyword.ace_operator {\
-color: #8ABEB7\
-}\
-.ace-tomorrow-night .ace_constant.ace_character,\
-.ace-tomorrow-night .ace_constant.ace_language,\
-.ace-tomorrow-night .ace_constant.ace_numeric,\
-.ace-tomorrow-night .ace_keyword.ace_other.ace_unit,\
-.ace-tomorrow-night .ace_support.ace_constant,\
-.ace-tomorrow-night .ace_variable.ace_parameter {\
-color: #DE935F\
-}\
-.ace-tomorrow-night .ace_constant.ace_other {\
-color: #CED1CF\
-}\
-.ace-tomorrow-night .ace_invalid {\
-color: #CED2CF;\
-background-color: #DF5F5F\
-}\
-.ace-tomorrow-night .ace_invalid.ace_deprecated {\
-color: #CED2CF;\
-background-color: #B798BF\
-}\
-.ace-tomorrow-night .ace_fold {\
-background-color: #81A2BE;\
-border-color: #C5C8C6\
-}\
-.ace-tomorrow-night .ace_entity.ace_name.ace_function,\
-.ace-tomorrow-night .ace_support.ace_function,\
-.ace-tomorrow-night .ace_variable {\
-color: #81A2BE\
-}\
-.ace-tomorrow-night .ace_support.ace_class,\
-.ace-tomorrow-night .ace_support.ace_type {\
-color: #F0C674\
-}\
-.ace-tomorrow-night .ace_heading,\
-.ace-tomorrow-night .ace_markup.ace_heading,\
-.ace-tomorrow-night .ace_string {\
-color: #B5BD68\
-}\
-.ace-tomorrow-night .ace_entity.ace_name.ace_tag,\
-.ace-tomorrow-night .ace_entity.ace_other.ace_attribute-name,\
-.ace-tomorrow-night .ace_meta.ace_tag,\
-.ace-tomorrow-night .ace_string.ace_regexp,\
-.ace-tomorrow-night .ace_variable {\
-color: #CC6666\
-}\
-.ace-tomorrow-night .ace_comment {\
-color: #969896\
-}\
-.ace-tomorrow-night .ace_indent-guide {\
-background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWNgYGBgYHB3d/8PAAOIAdULw8qMAAAAAElFTkSuQmCC) right repeat-y\
-}";
-
-    var dom = require("../lib/dom");
-    dom.importCssString(exports.cssText, exports.cssClass);
-});
--- a/Server/src/main/resources/static/js/ace/theme-tomorrow_night_blue.js
+++ b/Server/src/main/resources/static/js/ace/theme-tomorrow_night_blue.js
@@ -1,106 +0,0 @@
-define("ace/theme/tomorrow_night_blue", ["require", "exports", "ace/lib/dom"], function (require, exports) {
-
-    exports.isDark = true;
-    exports.cssClass = "ace-tomorrow-night-blue";
-    exports.cssText = ".ace-tomorrow-night-blue .ace_gutter {\
-background: #00204b;\
-color: #7388b5\
-}\
-.ace-tomorrow-night-blue .ace_print-margin {\
-width: 1px;\
-background: #00204b\
-}\
-.ace-tomorrow-night-blue {\
-background-color: #002451;\
-color: #FFFFFF\
-}\
-.ace-tomorrow-night-blue .ace_constant.ace_other,\
-.ace-tomorrow-night-blue .ace_cursor {\
-color: #FFFFFF\
-}\
-.ace-tomorrow-night-blue .ace_marker-layer .ace_selection {\
-background: #003F8E\
-}\
-.ace-tomorrow-night-blue.ace_multiselect .ace_selection.ace_start {\
-box-shadow: 0 0 3px 0px #002451;\
-}\
-.ace-tomorrow-night-blue .ace_marker-layer .ace_step {\
-background: rgb(127, 111, 19)\
-}\
-.ace-tomorrow-night-blue .ace_marker-layer .ace_bracket {\
-margin: -1px 0 0 -1px;\
-border: 1px solid #404F7D\
-}\
-.ace-tomorrow-night-blue .ace_marker-layer .ace_active-line {\
-background: #00346E\
-}\
-.ace-tomorrow-night-blue .ace_gutter-active-line {\
-background-color: #022040\
-}\
-.ace-tomorrow-night-blue .ace_marker-layer .ace_selected-word {\
-border: 1px solid #003F8E\
-}\
-.ace-tomorrow-night-blue .ace_invisible {\
-color: #404F7D\
-}\
-.ace-tomorrow-night-blue .ace_keyword,\
-.ace-tomorrow-night-blue .ace_meta,\
-.ace-tomorrow-night-blue .ace_storage,\
-.ace-tomorrow-night-blue .ace_storage.ace_type,\
-.ace-tomorrow-night-blue .ace_support.ace_type {\
-color: #EBBBFF\
-}\
-.ace-tomorrow-night-blue .ace_keyword.ace_operator {\
-color: #99FFFF\
-}\
-.ace-tomorrow-night-blue .ace_constant.ace_character,\
-.ace-tomorrow-night-blue .ace_constant.ace_language,\
-.ace-tomorrow-night-blue .ace_constant.ace_numeric,\
-.ace-tomorrow-night-blue .ace_keyword.ace_other.ace_unit,\
-.ace-tomorrow-night-blue .ace_support.ace_constant,\
-.ace-tomorrow-night-blue .ace_variable.ace_parameter {\
-color: #FFC58F\
-}\
-.ace-tomorrow-night-blue .ace_invalid {\
-color: #FFFFFF;\
-background-color: #F99DA5\
-}\
-.ace-tomorrow-night-blue .ace_invalid.ace_deprecated {\
-color: #FFFFFF;\
-background-color: #EBBBFF\
-}\
-.ace-tomorrow-night-blue .ace_fold {\
-background-color: #BBDAFF;\
-border-color: #FFFFFF\
-}\
-.ace-tomorrow-night-blue .ace_entity.ace_name.ace_function,\
-.ace-tomorrow-night-blue .ace_support.ace_function,\
-.ace-tomorrow-night-blue .ace_variable {\
-color: #BBDAFF\
-}\
-.ace-tomorrow-night-blue .ace_support.ace_class,\
-.ace-tomorrow-night-blue .ace_support.ace_type {\
-color: #FFEEAD\
-}\
-.ace-tomorrow-night-blue .ace_heading,\
-.ace-tomorrow-night-blue .ace_markup.ace_heading,\
-.ace-tomorrow-night-blue .ace_string {\
-color: #D1F1A9\
-}\
-.ace-tomorrow-night-blue .ace_entity.ace_name.ace_tag,\
-.ace-tomorrow-night-blue .ace_entity.ace_other.ace_attribute-name,\
-.ace-tomorrow-night-blue .ace_meta.ace_tag,\
-.ace-tomorrow-night-blue .ace_string.ace_regexp,\
-.ace-tomorrow-night-blue .ace_variable {\
-color: #FF9DA4\
-}\
-.ace-tomorrow-night-blue .ace_comment {\
-color: #7285B7\
-}\
-.ace-tomorrow-night-blue .ace_indent-guide {\
-background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWNgYGBgYJDzqfwPAANXAeNsiA+ZAAAAAElFTkSuQmCC) right repeat-y\
-}";
-
-    var dom = require("../lib/dom");
-    dom.importCssString(exports.cssText, exports.cssClass);
-});
--- a/Server/src/main/resources/static/js/ace/theme-tomorrow_night_bright.js
+++ b/Server/src/main/resources/static/js/ace/theme-tomorrow_night_bright.js
@@ -1,121 +0,0 @@
-define("ace/theme/tomorrow_night_bright", ["require", "exports", "ace/lib/dom"], function (require, exports) {
-
-    exports.isDark = true;
-    exports.cssClass = "ace-tomorrow-night-bright";
-    exports.cssText = ".ace-tomorrow-night-bright .ace_gutter {\
-background: #1a1a1a;\
-color: #DEDEDE\
-}\
-.ace-tomorrow-night-bright .ace_print-margin {\
-width: 1px;\
-background: #1a1a1a\
-}\
-.ace-tomorrow-night-bright {\
-background-color: #000000;\
-color: #DEDEDE\
-}\
-.ace-tomorrow-night-bright .ace_cursor {\
-color: #9F9F9F\
-}\
-.ace-tomorrow-night-bright .ace_marker-layer .ace_selection {\
-background: #424242\
-}\
-.ace-tomorrow-night-bright.ace_multiselect .ace_selection.ace_start {\
-box-shadow: 0 0 3px 0px #000000;\
-}\
-.ace-tomorrow-night-bright .ace_marker-layer .ace_step {\
-background: rgb(102, 82, 0)\
-}\
-.ace-tomorrow-night-bright .ace_marker-layer .ace_bracket {\
-margin: -1px 0 0 -1px;\
-border: 1px solid #888888\
-}\
-.ace-tomorrow-night-bright .ace_marker-layer .ace_highlight {\
-border: 1px solid rgb(110, 119, 0);\
-border-bottom: 0;\
-box-shadow: inset 0 -1px rgb(110, 119, 0);\
-margin: -1px 0 0 -1px;\
-background: rgba(255, 235, 0, 0.1)\
-}\
-.ace-tomorrow-night-bright .ace_marker-layer .ace_active-line {\
-background: #2A2A2A\
-}\
-.ace-tomorrow-night-bright .ace_gutter-active-line {\
-background-color: #2A2A2A\
-}\
-.ace-tomorrow-night-bright .ace_stack {\
-background-color: rgb(66, 90, 44)\
-}\
-.ace-tomorrow-night-bright .ace_marker-layer .ace_selected-word {\
-border: 1px solid #888888\
-}\
-.ace-tomorrow-night-bright .ace_invisible {\
-color: #343434\
-}\
-.ace-tomorrow-night-bright .ace_keyword,\
-.ace-tomorrow-night-bright .ace_meta,\
-.ace-tomorrow-night-bright .ace_storage,\
-.ace-tomorrow-night-bright .ace_storage.ace_type,\
-.ace-tomorrow-night-bright .ace_support.ace_type {\
-color: #C397D8\
-}\
-.ace-tomorrow-night-bright .ace_keyword.ace_operator {\
-color: #70C0B1\
-}\
-.ace-tomorrow-night-bright .ace_constant.ace_character,\
-.ace-tomorrow-night-bright .ace_constant.ace_language,\
-.ace-tomorrow-night-bright .ace_constant.ace_numeric,\
-.ace-tomorrow-night-bright .ace_keyword.ace_other.ace_unit,\
-.ace-tomorrow-night-bright .ace_support.ace_constant,\
-.ace-tomorrow-night-bright .ace_variable.ace_parameter {\
-color: #E78C45\
-}\
-.ace-tomorrow-night-bright .ace_constant.ace_other {\
-color: #EEEEEE\
-}\
-.ace-tomorrow-night-bright .ace_invalid {\
-color: #CED2CF;\
-background-color: #DF5F5F\
-}\
-.ace-tomorrow-night-bright .ace_invalid.ace_deprecated {\
-color: #CED2CF;\
-background-color: #B798BF\
-}\
-.ace-tomorrow-night-bright .ace_fold {\
-background-color: #7AA6DA;\
-border-color: #DEDEDE\
-}\
-.ace-tomorrow-night-bright .ace_entity.ace_name.ace_function,\
-.ace-tomorrow-night-bright .ace_support.ace_function,\
-.ace-tomorrow-night-bright .ace_variable {\
-color: #7AA6DA\
-}\
-.ace-tomorrow-night-bright .ace_support.ace_class,\
-.ace-tomorrow-night-bright .ace_support.ace_type {\
-color: #E7C547\
-}\
-.ace-tomorrow-night-bright .ace_heading,\
-.ace-tomorrow-night-bright .ace_markup.ace_heading,\
-.ace-tomorrow-night-bright .ace_string {\
-color: #B9CA4A\
-}\
-.ace-tomorrow-night-bright .ace_entity.ace_name.ace_tag,\
-.ace-tomorrow-night-bright .ace_entity.ace_other.ace_attribute-name,\
-.ace-tomorrow-night-bright .ace_meta.ace_tag,\
-.ace-tomorrow-night-bright .ace_string.ace_regexp,\
-.ace-tomorrow-night-bright .ace_variable {\
-color: #D54E53\
-}\
-.ace-tomorrow-night-bright .ace_comment {\
-color: #969896\
-}\
-.ace-tomorrow-night-bright .ace_c9searchresults.ace_keyword {\
-color: #C2C280\
-}\
-.ace-tomorrow-night-bright .ace_indent-guide {\
-background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWNgYGBgYFBXV/8PAAJoAXX4kT2EAAAAAElFTkSuQmCC) right repeat-y\
-}";
-
-    var dom = require("../lib/dom");
-    dom.importCssString(exports.cssText, exports.cssClass);
-});
--- a/Server/src/main/resources/static/js/ace/theme-tomorrow_night_eighties.js
+++ b/Server/src/main/resources/static/js/ace/theme-tomorrow_night_eighties.js
@@ -1,108 +0,0 @@
-define("ace/theme/tomorrow_night_eighties", ["require", "exports", "ace/lib/dom"], function (require, exports) {
-
-    exports.isDark = true;
-    exports.cssClass = "ace-tomorrow-night-eighties";
-    exports.cssText = ".ace-tomorrow-night-eighties .ace_gutter {\
-background: #272727;\
-color: #CCC\
-}\
-.ace-tomorrow-night-eighties .ace_print-margin {\
-width: 1px;\
-background: #272727\
-}\
-.ace-tomorrow-night-eighties {\
-background-color: #2D2D2D;\
-color: #CCCCCC\
-}\
-.ace-tomorrow-night-eighties .ace_constant.ace_other,\
-.ace-tomorrow-night-eighties .ace_cursor {\
-color: #CCCCCC\
-}\
-.ace-tomorrow-night-eighties .ace_marker-layer .ace_selection {\
-background: #515151\
-}\
-.ace-tomorrow-night-eighties.ace_multiselect .ace_selection.ace_start {\
-box-shadow: 0 0 3px 0px #2D2D2D;\
-}\
-.ace-tomorrow-night-eighties .ace_marker-layer .ace_step {\
-background: rgb(102, 82, 0)\
-}\
-.ace-tomorrow-night-eighties .ace_marker-layer .ace_bracket {\
-margin: -1px 0 0 -1px;\
-border: 1px solid #6A6A6A\
-}\
-.ace-tomorrow-night-bright .ace_stack {\
-background: rgb(66, 90, 44)\
-}\
-.ace-tomorrow-night-eighties .ace_marker-layer .ace_active-line {\
-background: #393939\
-}\
-.ace-tomorrow-night-eighties .ace_gutter-active-line {\
-background-color: #393939\
-}\
-.ace-tomorrow-night-eighties .ace_marker-layer .ace_selected-word {\
-border: 1px solid #515151\
-}\
-.ace-tomorrow-night-eighties .ace_invisible {\
-color: #6A6A6A\
-}\
-.ace-tomorrow-night-eighties .ace_keyword,\
-.ace-tomorrow-night-eighties .ace_meta,\
-.ace-tomorrow-night-eighties .ace_storage,\
-.ace-tomorrow-night-eighties .ace_storage.ace_type,\
-.ace-tomorrow-night-eighties .ace_support.ace_type {\
-color: #CC99CC\
-}\
-.ace-tomorrow-night-eighties .ace_keyword.ace_operator {\
-color: #66CCCC\
-}\
-.ace-tomorrow-night-eighties .ace_constant.ace_character,\
-.ace-tomorrow-night-eighties .ace_constant.ace_language,\
-.ace-tomorrow-night-eighties .ace_constant.ace_numeric,\
-.ace-tomorrow-night-eighties .ace_keyword.ace_other.ace_unit,\
-.ace-tomorrow-night-eighties .ace_support.ace_constant,\
-.ace-tomorrow-night-eighties .ace_variable.ace_parameter {\
-color: #F99157\
-}\
-.ace-tomorrow-night-eighties .ace_invalid {\
-color: #CDCDCD;\
-background-color: #F2777A\
-}\
-.ace-tomorrow-night-eighties .ace_invalid.ace_deprecated {\
-color: #CDCDCD;\
-background-color: #CC99CC\
-}\
-.ace-tomorrow-night-eighties .ace_fold {\
-background-color: #6699CC;\
-border-color: #CCCCCC\
-}\
-.ace-tomorrow-night-eighties .ace_entity.ace_name.ace_function,\
-.ace-tomorrow-night-eighties .ace_support.ace_function,\
-.ace-tomorrow-night-eighties .ace_variable {\
-color: #6699CC\
-}\
-.ace-tomorrow-night-eighties .ace_support.ace_class,\
-.ace-tomorrow-night-eighties .ace_support.ace_type {\
-color: #FFCC66\
-}\
-.ace-tomorrow-night-eighties .ace_heading,\
-.ace-tomorrow-night-eighties .ace_markup.ace_heading,\
-.ace-tomorrow-night-eighties .ace_string {\
-color: #99CC99\
-}\
-.ace-tomorrow-night-eighties .ace_comment {\
-color: #999999\
-}\
-.ace-tomorrow-night-eighties .ace_entity.ace_name.ace_tag,\
-.ace-tomorrow-night-eighties .ace_entity.ace_other.ace_attribute-name,\
-.ace-tomorrow-night-eighties .ace_meta.ace_tag,\
-.ace-tomorrow-night-eighties .ace_variable {\
-color: #F2777A\
-}\
-.ace-tomorrow-night-eighties .ace_indent-guide {\
-background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWPQ09NrYAgMjP4PAAtGAwchHMyAAAAAAElFTkSuQmCC) right repeat-y\
-}";
-
-    var dom = require("../lib/dom");
-    dom.importCssString(exports.cssText, exports.cssClass);
-});
--- a/Server/src/main/resources/static/js/ace/theme-twilight.js
+++ b/Server/src/main/resources/static/js/ace/theme-twilight.js
@@ -1,109 +0,0 @@
-define("ace/theme/twilight", ["require", "exports", "ace/lib/dom"], function (require, exports) {
-
-    exports.isDark = true;
-    exports.cssClass = "ace-twilight";
-    exports.cssText = ".ace-twilight .ace_gutter {\
-background: #232323;\
-color: #E2E2E2\
-}\
-.ace-twilight .ace_print-margin {\
-width: 1px;\
-background: #232323\
-}\
-.ace-twilight {\
-background-color: #141414;\
-color: #F8F8F8\
-}\
-.ace-twilight .ace_cursor {\
-color: #A7A7A7\
-}\
-.ace-twilight .ace_marker-layer .ace_selection {\
-background: rgba(221, 240, 255, 0.20)\
-}\
-.ace-twilight.ace_multiselect .ace_selection.ace_start {\
-box-shadow: 0 0 3px 0px #141414;\
-}\
-.ace-twilight .ace_marker-layer .ace_step {\
-background: rgb(102, 82, 0)\
-}\
-.ace-twilight .ace_marker-layer .ace_bracket {\
-margin: -1px 0 0 -1px;\
-border: 1px solid rgba(255, 255, 255, 0.25)\
-}\
-.ace-twilight .ace_marker-layer .ace_active-line {\
-background: rgba(255, 255, 255, 0.031)\
-}\
-.ace-twilight .ace_gutter-active-line {\
-background-color: rgba(255, 255, 255, 0.031)\
-}\
-.ace-twilight .ace_marker-layer .ace_selected-word {\
-border: 1px solid rgba(221, 240, 255, 0.20)\
-}\
-.ace-twilight .ace_invisible {\
-color: rgba(255, 255, 255, 0.25)\
-}\
-.ace-twilight .ace_keyword,\
-.ace-twilight .ace_meta {\
-color: #CDA869\
-}\
-.ace-twilight .ace_constant,\
-.ace-twilight .ace_constant.ace_character,\
-.ace-twilight .ace_constant.ace_character.ace_escape,\
-.ace-twilight .ace_constant.ace_other,\
-.ace-twilight .ace_heading,\
-.ace-twilight .ace_markup.ace_heading,\
-.ace-twilight .ace_support.ace_constant {\
-color: #CF6A4C\
-}\
-.ace-twilight .ace_invalid.ace_illegal {\
-color: #F8F8F8;\
-background-color: rgba(86, 45, 86, 0.75)\
-}\
-.ace-twilight .ace_invalid.ace_deprecated {\
-text-decoration: underline;\
-font-style: italic;\
-color: #D2A8A1\
-}\
-.ace-twilight .ace_support {\
-color: #9B859D\
-}\
-.ace-twilight .ace_fold {\
-background-color: #AC885B;\
-border-color: #F8F8F8\
-}\
-.ace-twilight .ace_support.ace_function {\
-color: #DAD085\
-}\
-.ace-twilight .ace_list,\
-.ace-twilight .ace_markup.ace_list,\
-.ace-twilight .ace_storage {\
-color: #F9EE98\
-}\
-.ace-twilight .ace_entity.ace_name.ace_function,\
-.ace-twilight .ace_meta.ace_tag,\
-.ace-twilight .ace_variable {\
-color: #AC885B\
-}\
-.ace-twilight .ace_string {\
-color: #8F9D6A\
-}\
-.ace-twilight .ace_string.ace_regexp {\
-color: #E9C062\
-}\
-.ace-twilight .ace_comment {\
-font-style: italic;\
-color: #5F5A60\
-}\
-.ace-twilight .ace_variable {\
-color: #7587A6\
-}\
-.ace-twilight .ace_xml-pe {\
-color: #494949\
-}\
-.ace-twilight .ace_indent-guide {\
-background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWMQERFpYLC1tf0PAAgOAnPnhxyiAAAAAElFTkSuQmCC) right repeat-y\
-}";
-
-    var dom = require("../lib/dom");
-    dom.importCssString(exports.cssText, exports.cssClass);
-});
--- a/Server/src/main/resources/static/js/ace/theme-vibrant_ink.js
+++ b/Server/src/main/resources/static/js/ace/theme-vibrant_ink.js
@@ -1,94 +0,0 @@
-define("ace/theme/vibrant_ink", ["require", "exports", "ace/lib/dom"], function (require, exports) {
-
-    exports.isDark = true;
-    exports.cssClass = "ace-vibrant-ink";
-    exports.cssText = ".ace-vibrant-ink .ace_gutter {\
-background: #1a1a1a;\
-color: #BEBEBE\
-}\
-.ace-vibrant-ink .ace_print-margin {\
-width: 1px;\
-background: #1a1a1a\
-}\
-.ace-vibrant-ink {\
-background-color: #0F0F0F;\
-color: #FFFFFF\
-}\
-.ace-vibrant-ink .ace_cursor {\
-color: #FFFFFF\
-}\
-.ace-vibrant-ink .ace_marker-layer .ace_selection {\
-background: #6699CC\
-}\
-.ace-vibrant-ink.ace_multiselect .ace_selection.ace_start {\
-box-shadow: 0 0 3px 0px #0F0F0F;\
-}\
-.ace-vibrant-ink .ace_marker-layer .ace_step {\
-background: rgb(102, 82, 0)\
-}\
-.ace-vibrant-ink .ace_marker-layer .ace_bracket {\
-margin: -1px 0 0 -1px;\
-border: 1px solid #404040\
-}\
-.ace-vibrant-ink .ace_marker-layer .ace_active-line {\
-background: #333333\
-}\
-.ace-vibrant-ink .ace_gutter-active-line {\
-background-color: #333333\
-}\
-.ace-vibrant-ink .ace_marker-layer .ace_selected-word {\
-border: 1px solid #6699CC\
-}\
-.ace-vibrant-ink .ace_invisible {\
-color: #404040\
-}\
-.ace-vibrant-ink .ace_keyword,\
-.ace-vibrant-ink .ace_meta {\
-color: #FF6600\
-}\
-.ace-vibrant-ink .ace_constant,\
-.ace-vibrant-ink .ace_constant.ace_character,\
-.ace-vibrant-ink .ace_constant.ace_character.ace_escape,\
-.ace-vibrant-ink .ace_constant.ace_other {\
-color: #339999\
-}\
-.ace-vibrant-ink .ace_constant.ace_numeric {\
-color: #99CC99\
-}\
-.ace-vibrant-ink .ace_invalid,\
-.ace-vibrant-ink .ace_invalid.ace_deprecated {\
-color: #CCFF33;\
-background-color: #000000\
-}\
-.ace-vibrant-ink .ace_fold {\
-background-color: #FFCC00;\
-border-color: #FFFFFF\
-}\
-.ace-vibrant-ink .ace_entity.ace_name.ace_function,\
-.ace-vibrant-ink .ace_support.ace_function,\
-.ace-vibrant-ink .ace_variable {\
-color: #FFCC00\
-}\
-.ace-vibrant-ink .ace_variable.ace_parameter {\
-font-style: italic\
-}\
-.ace-vibrant-ink .ace_string {\
-color: #66FF00\
-}\
-.ace-vibrant-ink .ace_string.ace_regexp {\
-color: #44B4CC\
-}\
-.ace-vibrant-ink .ace_comment {\
-color: #9933CC\
-}\
-.ace-vibrant-ink .ace_entity.ace_other.ace_attribute-name {\
-font-style: italic;\
-color: #99CC99\
-}\
-.ace-vibrant-ink .ace_indent-guide {\
-background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWNgYGBgYNDTc/oPAALPAZ7hxlbYAAAAAElFTkSuQmCC) right repeat-y\
-}";
-
-    var dom = require("../lib/dom");
-    dom.importCssString(exports.cssText, exports.cssClass);
-});
--- a/Server/src/main/resources/static/js/ace/theme-xcode.js
+++ b/Server/src/main/resources/static/js/ace/theme-xcode.js
@@ -1,88 +0,0 @@
-define("ace/theme/xcode", ["require", "exports", "ace/lib/dom"], function (require, exports) {
-
-    exports.isDark = false;
-    exports.cssClass = "ace-xcode";
-    exports.cssText = "\
-.ace-xcode .ace_gutter {\
-background: #e8e8e8;\
-color: #333\
-}\
-.ace-xcode .ace_print-margin {\
-width: 1px;\
-background: #e8e8e8\
-}\
-.ace-xcode {\
-background-color: #FFFFFF;\
-color: #000000\
-}\
-.ace-xcode .ace_cursor {\
-color: #000000\
-}\
-.ace-xcode .ace_marker-layer .ace_selection {\
-background: #B5D5FF\
-}\
-.ace-xcode.ace_multiselect .ace_selection.ace_start {\
-box-shadow: 0 0 3px 0px #FFFFFF;\
-}\
-.ace-xcode .ace_marker-layer .ace_step {\
-background: rgb(198, 219, 174)\
-}\
-.ace-xcode .ace_marker-layer .ace_bracket {\
-margin: -1px 0 0 -1px;\
-border: 1px solid #BFBFBF\
-}\
-.ace-xcode .ace_marker-layer .ace_active-line {\
-background: rgba(0, 0, 0, 0.071)\
-}\
-.ace-xcode .ace_gutter-active-line {\
-background-color: rgba(0, 0, 0, 0.071)\
-}\
-.ace-xcode .ace_marker-layer .ace_selected-word {\
-border: 1px solid #B5D5FF\
-}\
-.ace-xcode .ace_constant.ace_language,\
-.ace-xcode .ace_keyword,\
-.ace-xcode .ace_meta,\
-.ace-xcode .ace_variable.ace_language {\
-color: #C800A4\
-}\
-.ace-xcode .ace_invisible {\
-color: #BFBFBF\
-}\
-.ace-xcode .ace_constant.ace_character,\
-.ace-xcode .ace_constant.ace_other {\
-color: #275A5E\
-}\
-.ace-xcode .ace_constant.ace_numeric {\
-color: #3A00DC\
-}\
-.ace-xcode .ace_entity.ace_other.ace_attribute-name,\
-.ace-xcode .ace_support.ace_constant,\
-.ace-xcode .ace_support.ace_function {\
-color: #450084\
-}\
-.ace-xcode .ace_fold {\
-background-color: #C800A4;\
-border-color: #000000\
-}\
-.ace-xcode .ace_entity.ace_name.ace_tag,\
-.ace-xcode .ace_support.ace_class,\
-.ace-xcode .ace_support.ace_type {\
-color: #790EAD\
-}\
-.ace-xcode .ace_storage {\
-color: #C900A4\
-}\
-.ace-xcode .ace_string {\
-color: #DF0002\
-}\
-.ace-xcode .ace_comment {\
-color: #008E00\
-}\
-.ace-xcode .ace_indent-guide {\
-background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAE0lEQVQImWP4////f4bLly//BwAmVgd1/w11/gAAAABJRU5ErkJggg==) right repeat-y\
-}";
-
-    var dom = require("../lib/dom");
-    dom.importCssString(exports.cssText, exports.cssClass);
-});
--- a/Server/src/main/resources/static/js/mar.js
+++ b/Server/src/main/resources/static/js/mar.js
--- a/Server/src/test/java/net/simon987/server/assembly/CPUTest.java
+++ b/Server/src/test/java/net/simon987/server/assembly/CPUTest.java
@@ -1,6 +0,0 @@
-package net.simon987.server.assembly;
-
-public class CPUTest {
-
-
-}
--- a/Server/src/test/java/net/simon987/server/assembly/DWTest.java
+++ b/Server/src/test/java/net/simon987/server/assembly/DWTest.java
@@ -1,24 +0,0 @@
-package net.simon987.server.assembly;
-
-import net.simon987.server.FakeConfiguration;
-import net.simon987.server.IServerConfiguration;
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-
-public class DWTest {
-
-    @Test
-    public void TestSemiColonInString() {
-
-        IServerConfiguration configuration = new FakeConfiguration();
-
-        configuration.setInt("memory_size", 1000);
-        configuration.setInt("org_offset", 400);
-
-        Assembler assembler = new Assembler(new DefaultInstructionSet(), new DefaultRegisterSet(), configuration);
-
-        AssemblyResult ar = assembler.parse("DW \";\"");
-        assertEquals(0, ar.exceptions.size());
-    }
-}
--- a/Server/src/test/java/net/simon987/server/assembly/TestHelper.java
+++ b/Server/src/test/java/net/simon987/server/assembly/TestHelper.java
@@ -1,18 +0,0 @@
-package net.simon987.server.assembly;
-
-import net.simon987.server.FakeConfiguration;
-import net.simon987.server.IServerConfiguration;
-
-class TestHelper {
-
-    static Assembler getTestAsm() {
-
-        IServerConfiguration configuration = new FakeConfiguration();
-
-        configuration.setInt("memory_size", 1000);
-        configuration.setInt("org_offset", 400);
-
-        return new Assembler(new DefaultInstructionSet(), new DefaultRegisterSet(), configuration);
-    }
-
-}
--- a/Server/src/test/java/net/simon987/server/assembly/instruction/CallInstructionTest.java
+++ b/Server/src/test/java/net/simon987/server/assembly/instruction/CallInstructionTest.java
@@ -1,7 +0,0 @@
-package net.simon987.server.assembly.instruction;
-
-public class CallInstructionTest {
-
-
-
-}
--- a/5
+++ b/5
@@ -1,5 +0,0 @@
-Vagrant.configure("2") do |config|
-  config.vm.box = "ubuntu/trusty64"
-  config.vm.provision :shell, path: "bootstrap.sh"
-  config.vm.network "forwarded_port", guest: 4567, host: 4567
-end
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-# This file is ran during vagrant provision
-add-apt-repository ppa:webupd8team/java
-apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5
-echo "deb [ arch=amd64 ] https://repo.mongodb.org/apt/ubuntu trusty/mongodb-org/3.6 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-3.6.list
-apt-get update
-echo oracle-java8-installer shared/accepted-oracle-license-v1-1 select true | /usr/bin/debconf-set-selections
-apt-get install -y git maven oracle-java8-installer mongodb-org-server
-cd /vagrant/
-mvn clean
-mvn install
-cd target
-java -jar server-1.4a.jar
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -19,9 +19,9 @@ services:
          - ./data/db:/data/db
        ports:
            - 27017:27017
-        command: mongod --logpath=/dev/null --port 27017
+        command: mongod --smallfiles --logpath=/dev/null --port 27017
        healthcheck:
          test: echo 'db.stats().ok' | mongo localhost:27017/mar --quiet
          interval: 2s
          timeout: 2s
-          retries: 2
+          retries: 2
--- a/plugin-contruction/pom.xml
+++ b/plugin-contruction/pom.xml
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>net.simon987.server</groupId>
-        <artifactId>server_root</artifactId>
-        <version>1.4a</version>
-    </parent>
-
-    <groupId>net.simon987.plugincontruction</groupId>
-    <artifactId>plugin-construction</artifactId>
-    <version>1.4a</version>
-
-
-    <dependencies>
-        <dependency>
-            <groupId>com.googlecode.json-simple</groupId>
-            <artifactId>json-simple</artifactId>
-            <version>1.1.1</version>
-        </dependency>
-
-        <dependency>
-            <groupId>net.simon987.server</groupId>
-            <artifactId>server</artifactId>
-            <version>1.4a</version>
-        </dependency>
-    </dependencies>
-</project>
--- a/plugin-contruction/src/main/java/net/simon987/constructionplugin/ConstructionPlugin.java
+++ b/plugin-contruction/src/main/java/net/simon987/constructionplugin/ConstructionPlugin.java
@@ -1,24 +0,0 @@
-package net.simon987.constructionplugin;
-
-import net.simon987.server.GameServer;
-import net.simon987.server.game.objects.GameRegistry;
-import net.simon987.server.logging.LogManager;
-import net.simon987.server.plugin.ServerPlugin;
-
-public class ConstructionPlugin extends ServerPlugin {
-
-    @Override
-    public void init(GameServer gameServer) {
-
-        BluePrintUtil.setSecretKey(gameServer.getSecretKey());
-        GameRegistry gameRegistry = gameServer.getRegistry();
-
-        gameRegistry.registerItem(ItemBluePrint.ID, ItemBluePrint.class);
-        gameRegistry.registerGameObject(Obstacle.class);
-        gameRegistry.registerGameObject(ConstructionSite.class);
-
-        BluePrintRegistry.INSTANCE.registerBluePrint(ObstacleBlueprint.class);
-
-        LogManager.LOGGER.info("(Construction Plugin) Initialized construction plugin");
-    }
-}
--- a/plugin-contruction/src/main/resources/plugin.properties
+++ b/plugin-contruction/src/main/resources/plugin.properties
@@ -1,3 +0,0 @@
-classpath=net.simon987.constructionplugin.ConstructionPlugin
-name=Construction Plugin
-version=1.0
--- a/pom.xml
+++ b/pom.xml
@@ -4,13 +4,30 @@
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>

-    <groupId>net.simon987.server</groupId>
-    <artifactId>server_root</artifactId>
-    <version>1.4a</version>
-    <packaging>pom</packaging>
+    <groupId>net.simon987.mar</groupId>
+    <artifactId>muchassemblyrequired</artifactId>
+    <version>1.6a</version>

    <build>
        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <version>3.0.0</version>
+                <executions>
+                    <execution>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <executable>tsc</executable>
+                    <workingDirectory>./src/main/typescript/</workingDirectory>
+                </configuration>
+            </plugin>
+
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <version>3.6.2</version>
@@ -20,36 +37,119 @@
                    <target>1.8</target>
                </configuration>
            </plugin>
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>3.0.2</version>
+                <executions>
+                    <execution>
+                        <id>default-resources</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>./target/</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>./src/main/resources</directory>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-dependencies</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>./target/libs</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-jar-plugin</artifactId>
                <version>3.0.2</version>
                <configuration>
-                    <outputDirectory>../target/plugins</outputDirectory>
+                    <outputDirectory>./target</outputDirectory>
                    <archive>
                        <manifest>
-                            <addClasspath>false</addClasspath>
-                            <mainClass>net.simon987.server.Main</mainClass>
+                            <mainClass>net.simon987.mar.server.Main</mainClass>
+                            <addClasspath>true</addClasspath>
+                            <classpathPrefix>libs/</classpathPrefix>
                        </manifest>
                    </archive>
                </configuration>
            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.7.2</version>
+                <configuration>
+                    <forkMode>never</forkMode>
+                    <workingDirectory>./src/main/resources</workingDirectory>
+                </configuration>
+            </plugin>
        </plugins>
    </build>

-    <modules>
-        <module>Server</module>
-        <module>Plugin Plant</module>
-        <module>Plugin NPC</module>
-        <module>Plugin Misc HW</module>
-        <module>Plugin Cubot</module>
-        <module>Plugin Radioactive Cloud</module>
-        <module>plugin-contruction</module>
-    </modules>
+    <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.12</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.googlecode.json-simple</groupId>
+            <artifactId>json-simple</artifactId>
+            <version>1.1.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-text</artifactId>
+            <version>1.6</version>
+        </dependency>
+        <dependency>
+            <groupId>org.mongodb</groupId>
+            <artifactId>mongodb-driver-sync</artifactId>
+            <version>3.9.1</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/org.springframework.security/spring-security-core -->
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-core</artifactId>
+            <version>5.1.11.RELEASE</version>
+        </dependency>
+        <dependency>
+            <groupId>com.sparkjava</groupId>
+            <artifactId>spark-core</artifactId>
+            <version>2.8.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.sparkjava</groupId>
+            <artifactId>spark-template-velocity</artifactId>
+            <version>2.7.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+            <version>1.7.25</version>
+        </dependency>
+    </dependencies>

    <properties>
-        <!-- explicitly set build encoding so not altered by build platform defaults -->
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
    </properties>
-
-</project>
+</project>
--- a/Plant/src/main/java/net/simon987/biomassplugin/BiomassBlob.java
+++ b/Plant/src/main/java/net/simon987/biomassplugin/BiomassBlob.java
@@ -1,8 +1,8 @@
-package net.simon987.biomassplugin;
+package net.simon987.mar.biomass;

-import net.simon987.server.game.item.Item;
-import net.simon987.server.game.objects.GameObject;
-import net.simon987.server.game.objects.InventoryHolder;
+import net.simon987.mar.server.game.item.Item;
+import net.simon987.mar.server.game.objects.GameObject;
+import net.simon987.mar.server.game.objects.InventoryHolder;
 import org.bson.Document;
 import org.json.simple.JSONObject;

--- a/Plant/src/main/java/net/simon987/biomassplugin/ItemBiomass.java
+++ b/Plant/src/main/java/net/simon987/biomassplugin/ItemBiomass.java
@@ -1,9 +1,8 @@
-package net.simon987.biomassplugin;
+package net.simon987.mar.biomass;

-import net.simon987.server.GameServer;
-import net.simon987.server.game.item.Item;
-import net.simon987.server.game.objects.ControllableUnit;
-import net.simon987.server.game.objects.Rechargeable;
+import net.simon987.mar.server.GameServer;
+import net.simon987.mar.server.game.item.Item;
+import net.simon987.mar.server.game.objects.ControllableUnit;
 import org.bson.Document;

 public class ItemBiomass extends Item {
@@ -27,9 +26,7 @@ public class ItemBiomass extends Item {

    @Override
    public void clear(ControllableUnit unit) {
-        if (unit instanceof Rechargeable) {
-            ((Rechargeable) unit).storeEnergy(energy);
-        }
+        unit.storeEnergy(energy);
    }

    @Override
--- a/Plant/src/main/java/net/simon987/biomassplugin/WorldUtils.java
+++ b/Plant/src/main/java/net/simon987/biomassplugin/WorldUtils.java
@@ -1,8 +1,8 @@
-package net.simon987.biomassplugin;
+package net.simon987.mar.biomass;

-import net.simon987.server.game.world.TileMap;
-import net.simon987.server.game.world.TilePlain;
-import net.simon987.server.game.world.World;
+import net.simon987.mar.server.game.world.TileMap;
+import net.simon987.mar.server.game.world.TilePlain;
+import net.simon987.mar.server.game.world.World;
 import org.bson.types.ObjectId;

 import java.awt.*;
--- a/Plant/src/main/java/net/simon987/biomassplugin/event/ObjectDeathListener.java
+++ b/Plant/src/main/java/net/simon987/biomassplugin/event/ObjectDeathListener.java
@@ -1,12 +1,12 @@
-package net.simon987.biomassplugin.event;
+package net.simon987.mar.biomass.event;

-import net.simon987.biomassplugin.BiomassBlob;
-import net.simon987.server.IServerConfiguration;
-import net.simon987.server.event.GameEvent;
-import net.simon987.server.event.GameEventListener;
-import net.simon987.server.event.ObjectDeathEvent;
-import net.simon987.server.game.objects.GameObject;
-import net.simon987.server.game.world.World;
+import net.simon987.mar.biomass.BiomassBlob;
+import net.simon987.mar.server.IServerConfiguration;
+import net.simon987.mar.server.event.GameEvent;
+import net.simon987.mar.server.event.GameEventListener;
+import net.simon987.mar.server.event.ObjectDeathEvent;
+import net.simon987.mar.server.game.objects.GameObject;
+import net.simon987.mar.server.game.world.World;
 import org.bson.types.ObjectId;

 /**
@@ -14,7 +14,7 @@ import org.bson.types.ObjectId;
 */
 public class ObjectDeathListener implements GameEventListener {

-    private int biomassDropCount;
+    private final int biomassDropCount;

    public ObjectDeathListener(IServerConfiguration config) {
        biomassDropCount = config.getInt("harvester_biomass_drop_count");
@@ -28,9 +28,9 @@ public class ObjectDeathListener implements GameEventListener {
    @Override
    public void handle(GameEvent event) {

-        if (event.getSource().getClass().getCanonicalName().equals("net.simon987.npcplugin.HarvesterNPC")) {
+        if (event.getSource().getClass().getCanonicalName().equals("net.simon987.mar.npc.HarvesterNPC")) {
            //An HarvesterNPC ObjectDeathEvent is received
-            GameObject dyingHarvesterNPC = (GameObject)event.getSource();
+            GameObject dyingHarvesterNPC = (GameObject) event.getSource();

            //Don't spawn biomass on World border
            if (dyingHarvesterNPC.getX() != 0 && dyingHarvesterNPC.getX() != dyingHarvesterNPC.getWorld().getWorldSize() - 1 &&
--- a/Plant/src/main/java/net/simon987/biomassplugin/event/WorldCreationListener.java
+++ b/Plant/src/main/java/net/simon987/biomassplugin/event/WorldCreationListener.java
@@ -1,11 +1,11 @@
-package net.simon987.biomassplugin.event;
+package net.simon987.mar.biomass.event;

-import net.simon987.biomassplugin.BiomassBlob;
-import net.simon987.biomassplugin.WorldUtils;
-import net.simon987.server.GameServer;
-import net.simon987.server.event.GameEvent;
-import net.simon987.server.event.GameEventListener;
-import net.simon987.server.event.WorldGenerationEvent;
+import net.simon987.mar.biomass.BiomassBlob;
+import net.simon987.mar.biomass.WorldUtils;
+import net.simon987.mar.server.GameServer;
+import net.simon987.mar.server.event.GameEvent;
+import net.simon987.mar.server.event.GameEventListener;
+import net.simon987.mar.server.event.WorldGenerationEvent;

 import java.util.ArrayList;

--- a/Plant/src/main/java/net/simon987/biomassplugin/event/WorldUpdateListener.java
+++ b/Plant/src/main/java/net/simon987/biomassplugin/event/WorldUpdateListener.java
@@ -1,13 +1,13 @@
-package net.simon987.biomassplugin.event;
+package net.simon987.mar.biomass.event;

-import net.simon987.biomassplugin.BiomassBlob;
-import net.simon987.biomassplugin.WorldUtils;
-import net.simon987.server.GameServer;
-import net.simon987.server.IServerConfiguration;
-import net.simon987.server.event.GameEvent;
-import net.simon987.server.event.GameEventListener;
-import net.simon987.server.event.WorldUpdateEvent;
-import net.simon987.server.game.world.World;
+import net.simon987.mar.biomass.BiomassBlob;
+import net.simon987.mar.biomass.WorldUtils;
+import net.simon987.mar.server.GameServer;
+import net.simon987.mar.server.IServerConfiguration;
+import net.simon987.mar.server.event.GameEvent;
+import net.simon987.mar.server.event.GameEventListener;
+import net.simon987.mar.server.event.WorldUpdateEvent;
+import net.simon987.mar.server.game.world.World;

 import java.util.ArrayList;
 import java.util.HashMap;
@@ -15,7 +15,7 @@ import java.util.HashMap;

 public class WorldUpdateListener implements GameEventListener {

-    private HashMap<World, Long> worldWaitMap = new HashMap<>(200);
+    private final HashMap<World, Long> worldWaitMap = new HashMap<>(200);

    private static int minBlobCount;
    private static int maxBlobCount;
@@ -50,12 +50,12 @@ public class WorldUpdateListener implements GameEventListener {

                //Set a timer for respawn_time ticks
                if (!worldWaitMap.containsKey(world) || worldWaitMap.get(world) == 0L) {
-                    worldWaitMap.put(world, GameServer.INSTANCE.getGameUniverse().getTime() + waitTime);
+                    worldWaitMap.put(world, GameServer.INSTANCE.getUniverse().getTime() + waitTime);
                } else {

                    long waitUntil = worldWaitMap.get(world);

-                    if (GameServer.INSTANCE.getGameUniverse().getTime() >= waitUntil) {
+                    if (GameServer.INSTANCE.getUniverse().getTime() >= waitUntil) {

                        //If the timer was set less than respawn_time ticks ago, respawn the blobs
                        ArrayList<BiomassBlob> newBlobs = WorldUtils.generateBlobs(world, minBlobCount,
@@ -72,4 +72,4 @@ public class WorldUpdateListener implements GameEventListener {
            }
        }
    }
-}
+}
--- a/plugin-contruction/src/main/java/net/simon987/constructionplugin/BluePrint.java
+++ b/plugin-contruction/src/main/java/net/simon987/constructionplugin/BluePrint.java
@@ -1,10 +1,10 @@
-package net.simon987.constructionplugin;
+package net.simon987.mar.construction;

-import net.simon987.server.game.item.Item;
-import net.simon987.server.game.objects.GameObject;
-import net.simon987.server.game.objects.InventoryHolder;
-import net.simon987.server.io.JSONSerializable;
-import net.simon987.server.io.MongoSerializable;
+import net.simon987.mar.server.game.item.Item;
+import net.simon987.mar.server.game.objects.GameObject;
+import net.simon987.mar.server.game.objects.InventoryHolder;
+import net.simon987.mar.server.io.JSONSerializable;
+import net.simon987.mar.server.io.MongoSerializable;
 import org.bson.Document;
 import org.json.simple.JSONObject;

--- a/plugin-contruction/src/main/java/net/simon987/constructionplugin/BluePrintRegistry.java
+++ b/plugin-contruction/src/main/java/net/simon987/constructionplugin/BluePrintRegistry.java
@@ -1,6 +1,6 @@
-package net.simon987.constructionplugin;
+package net.simon987.mar.construction;

-import net.simon987.server.logging.LogManager;
+import net.simon987.mar.server.logging.LogManager;
 import org.bson.Document;

 import java.lang.reflect.InvocationTargetException;
@@ -11,8 +11,8 @@ public class BluePrintRegistry {

    public static final BluePrintRegistry INSTANCE = new BluePrintRegistry();

-    private Map<String, Class<? extends BluePrint>> blueprints;
-    private Map<String, String> digitizedBlueprints;
+    private final Map<String, Class<? extends BluePrint>> blueprints;
+    private final Map<String, String> digitizedBlueprints;

    private BluePrintRegistry() {
        blueprints = new HashMap<>();
--- a/plugin-contruction/src/main/java/net/simon987/constructionplugin/BluePrintUtil.java
+++ b/plugin-contruction/src/main/java/net/simon987/constructionplugin/BluePrintUtil.java
@@ -1,4 +1,4 @@
-package net.simon987.constructionplugin;
+package net.simon987.mar.construction;

 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
--- a/src/main/java/net/simon987/mar/construction/ConstructionPlugin.java
+++ b/src/main/java/net/simon987/mar/construction/ConstructionPlugin.java
@@ -0,0 +1,12 @@
+package net.simon987.mar.construction;
+
+import net.simon987.mar.server.GameServer;
+
+public class ConstructionPlugin {
+
+    public void init(GameServer gameServer) {
+        // TODO
+        BluePrintUtil.setSecretKey(gameServer.getSecretKey());
+        BluePrintRegistry.INSTANCE.registerBluePrint(ObstacleBlueprint.class);
+    }
+}
--- a/plugin-contruction/src/main/java/net/simon987/constructionplugin/ConstructionSite.java
+++ b/plugin-contruction/src/main/java/net/simon987/constructionplugin/ConstructionSite.java
@@ -1,10 +1,10 @@
-package net.simon987.constructionplugin;
+package net.simon987.mar.construction;

-import net.simon987.server.GameServer;
-import net.simon987.server.game.item.Item;
-import net.simon987.server.game.objects.InventoryHolder;
-import net.simon987.server.game.objects.Structure;
-import net.simon987.server.game.objects.Updatable;
+import net.simon987.mar.server.GameServer;
+import net.simon987.mar.server.game.item.Item;
+import net.simon987.mar.server.game.objects.InventoryHolder;
+import net.simon987.mar.server.game.objects.Structure;
+import net.simon987.mar.server.game.objects.Updatable;
 import org.bson.Document;
 import org.json.simple.JSONObject;

@@ -14,7 +14,7 @@ public class ConstructionSite extends Structure implements Updatable, InventoryH
    public static final int LIFETIME = GameServer.INSTANCE.getConfig().getInt("construction_site_ttl");

    private int age;
-    private BluePrint bluePrint;
+    private final BluePrint bluePrint;

    public ConstructionSite(BluePrint bluePrint) {
        super(1, 1);
--- a/plugin-contruction/src/main/java/net/simon987/constructionplugin/ItemBluePrint.java
+++ b/plugin-contruction/src/main/java/net/simon987/constructionplugin/ItemBluePrint.java
@@ -1,7 +1,7 @@
-package net.simon987.constructionplugin;
+package net.simon987.mar.construction;

-import net.simon987.server.assembly.Memory;
-import net.simon987.server.game.item.Item;
+import net.simon987.mar.server.assembly.Memory;
+import net.simon987.mar.server.game.item.Item;
 import org.bson.Document;
 import org.json.simple.JSONObject;

--- a/plugin-contruction/src/main/java/net/simon987/constructionplugin/Obstacle.java
+++ b/plugin-contruction/src/main/java/net/simon987/constructionplugin/Obstacle.java
@@ -1,9 +1,9 @@
-package net.simon987.constructionplugin;
+package net.simon987.mar.construction;

-import net.simon987.server.GameServer;
-import net.simon987.server.game.objects.Attackable;
-import net.simon987.server.game.objects.Structure;
-import net.simon987.server.game.objects.Updatable;
+import net.simon987.mar.server.GameServer;
+import net.simon987.mar.server.game.objects.Attackable;
+import net.simon987.mar.server.game.objects.Structure;
+import net.simon987.mar.server.game.objects.Updatable;
 import org.bson.Document;
 import org.json.simple.JSONObject;

--- a/plugin-contruction/src/main/java/net/simon987/constructionplugin/ObstacleBlueprint.java
+++ b/plugin-contruction/src/main/java/net/simon987/constructionplugin/ObstacleBlueprint.java
@@ -1,6 +1,6 @@
-package net.simon987.constructionplugin;
+package net.simon987.mar.construction;

-import net.simon987.server.game.item.ItemIron;
+import net.simon987.mar.server.game.item.ItemIron;
 import org.bson.Document;

 public class ObstacleBlueprint extends BluePrint {
--- a/HW/src/main/java/net/simon987/mischwplugin/Clock.java
+++ b/HW/src/main/java/net/simon987/mischwplugin/Clock.java
@@ -1,10 +1,10 @@
-package net.simon987.mischwplugin;
+package net.simon987.mar.cubot;

-import net.simon987.server.GameServer;
-import net.simon987.server.assembly.HardwareModule;
-import net.simon987.server.assembly.Status;
-import net.simon987.server.assembly.Util;
-import net.simon987.server.game.objects.ControllableUnit;
+import net.simon987.mar.server.GameServer;
+import net.simon987.mar.server.assembly.HardwareModule;
+import net.simon987.mar.server.assembly.Status;
+import net.simon987.mar.server.assembly.Util;
+import net.simon987.mar.server.game.objects.ControllableUnit;
 import org.bson.Document;

 /**
@@ -27,7 +27,7 @@ public class Clock extends HardwareModule {
    @Override
    public void handleInterrupt(Status status) {

-        int time = (int) GameServer.INSTANCE.getGameUniverse().getTime();
+        int time = (int) GameServer.INSTANCE.getUniverse().getTime();

        //Will need to be changed to quadword in about 136 years
        getCpu().getRegisterSet().getRegister("B").setValue(Util.getHigherWord(time));
--- a/Cubot/src/main/java/net/simon987/cubotplugin/Cubot.java
+++ b/Cubot/src/main/java/net/simon987/cubotplugin/Cubot.java
@@ -1,19 +1,19 @@
-package net.simon987.cubotplugin;
+package net.simon987.mar.cubot;

-import net.simon987.cubotplugin.event.CubotWalkEvent;
-import net.simon987.cubotplugin.event.DeathEvent;
-import net.simon987.server.GameServer;
-import net.simon987.server.IServerConfiguration;
-import net.simon987.server.assembly.CPU;
-import net.simon987.server.assembly.HardwareModule;
-import net.simon987.server.assembly.Memory;
-import net.simon987.server.assembly.Status;
-import net.simon987.server.assembly.exception.CancelledException;
-import net.simon987.server.event.GameEvent;
-import net.simon987.server.game.item.Item;
-import net.simon987.server.game.item.ItemVoid;
-import net.simon987.server.game.objects.*;
-import net.simon987.server.user.User;
+import net.simon987.mar.cubot.event.CubotWalkEvent;
+import net.simon987.mar.cubot.event.DeathEvent;
+import net.simon987.mar.server.GameServer;
+import net.simon987.mar.server.IServerConfiguration;
+import net.simon987.mar.server.assembly.CPU;
+import net.simon987.mar.server.assembly.HardwareModule;
+import net.simon987.mar.server.assembly.Memory;
+import net.simon987.mar.server.assembly.Status;
+import net.simon987.mar.server.assembly.exception.CancelledException;
+import net.simon987.mar.server.event.GameEvent;
+import net.simon987.mar.server.game.item.Item;
+import net.simon987.mar.server.game.item.ItemVoid;
+import net.simon987.mar.server.game.objects.*;
+import net.simon987.mar.server.user.User;
 import org.bson.Document;
 import org.json.simple.JSONObject;

@@ -74,7 +74,7 @@ public class Cubot extends GameObject implements Updatable, ControllableUnit, Me
    /**
     * Buffer of console messages (also called 'internal buffer') that was set during the current tick
     */
-    private ArrayList<char[]> consoleMessagesBuffer = new ArrayList<>(CONSOLE_BUFFER_MAX_SIZE);
+    private final ArrayList<char[]> consoleMessagesBuffer = new ArrayList<>(CONSOLE_BUFFER_MAX_SIZE);
    /**
     * Buffer of console messages (also called 'internal buffer') at the end of the last tick
     */
@@ -101,8 +101,8 @@ public class Cubot extends GameObject implements Updatable, ControllableUnit, Me
    /**
     * List of attached hardware, 'modules'
     */
-    private Map<Integer, HardwareModule> hardwareAddresses = new HashMap<>();
-    private Map<Class<? extends HardwareModule>, Integer> hardwareModules = new HashMap<>();
+    private final Map<Integer, HardwareModule> hardwareAddresses = new HashMap<>();
+    private final Map<Class<? extends HardwareModule>, Integer> hardwareModules = new HashMap<>();

    /**
     * Cubot's brain box
@@ -157,6 +157,11 @@ public class Cubot extends GameObject implements Updatable, ControllableUnit, Me

    @Override
    public void update() {
+
+        if (getCpu().isPaused() || getCpu().isExecuting()) {
+            return;
+        }
+
        if (currentAction == Action.WALKING) {
            if (spendEnergy(100)) {
                if (!incrementLocation()) {
@@ -288,7 +293,7 @@ public class Cubot extends GameObject implements Updatable, ControllableUnit, Me
        int spawnX = config.getInt("new_user_worldX") + random.nextInt(5);
        int spawnY = config.getInt("new_user_worldY") + random.nextInt(5);
        String dimension = config.getString("new_user_dimension");
-        this.setWorld(GameServer.INSTANCE.getGameUniverse().getWorld(spawnX, spawnY, true, dimension));
+        this.setWorld(GameServer.INSTANCE.getUniverse().getWorld(spawnX, spawnY, true, dimension));

        Point point = this.getWorld().getRandomPassableTile();
        this.setX(point.x);
@@ -395,7 +400,7 @@ public class Cubot extends GameObject implements Updatable, ControllableUnit, Me

    /**
     * Damages shield by amount.
-     * 
+     *
     * Return damage that broke through the shield.
     */
    public int damageShield(int amount) {
--- a/Cubot/src/main/java/net/simon987/cubotplugin/CubotBattery.java
+++ b/Cubot/src/main/java/net/simon987/cubotplugin/CubotBattery.java
@@ -1,9 +1,9 @@
-package net.simon987.cubotplugin;
+package net.simon987.mar.cubot;

-import net.simon987.server.GameServer;
-import net.simon987.server.assembly.HardwareModule;
-import net.simon987.server.assembly.Status;
-import net.simon987.server.game.objects.ControllableUnit;
+import net.simon987.mar.server.GameServer;
+import net.simon987.mar.server.assembly.HardwareModule;
+import net.simon987.mar.server.assembly.Status;
+import net.simon987.mar.server.game.objects.ControllableUnit;
 import org.bson.Document;
 import org.json.simple.JSONObject;

--- a/Cubot/src/main/java/net/simon987/cubotplugin/CubotComPort.java
+++ b/Cubot/src/main/java/net/simon987/cubotplugin/CubotComPort.java
@@ -1,10 +1,10 @@
-package net.simon987.cubotplugin;
+package net.simon987.mar.cubot;

-import net.simon987.server.assembly.HardwareModule;
-import net.simon987.server.assembly.Status;
-import net.simon987.server.game.objects.ControllableUnit;
-import net.simon987.server.game.objects.GameObject;
-import net.simon987.server.game.objects.MessageReceiver;
+import net.simon987.mar.server.assembly.HardwareModule;
+import net.simon987.mar.server.assembly.Status;
+import net.simon987.mar.server.game.objects.ControllableUnit;
+import net.simon987.mar.server.game.objects.GameObject;
+import net.simon987.mar.server.game.objects.MessageReceiver;
 import org.bson.Document;

 import java.awt.*;
@@ -39,7 +39,7 @@ public class CubotComPort extends HardwareModule {
        if (a == COMPORT_BUFFER_CLEAR) {

            unit.getConsoleMessagesBuffer().clear();
-            
+
        } else if (a == COMPORT_CONSOLE_CLEAR) {

            if (unit instanceof Cubot) {
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
simon987	18a6858edd	UI fix for UHD monitors	2020-09-14 20:33:09 -04:00
simon987	9315111793	Add tsc notes	2020-09-14 20:32:49 -04:00
simon987	60c763167d	More work on debugger	2020-08-09 21:18:30 -04:00
simon987	3ae119072c	Fix dissassembly display error	2020-08-09 20:26:42 -04:00
simon987	2ace932b52	Fix tests	2020-08-01 21:22:13 -04:00
simon987	50b95d1a9c	Trap flag / Debugger first draft #232	2020-08-01 20:27:39 -04:00
simon987	ad08a5ac4f	Fix #229	2020-07-31 19:27:14 -04:00
simon987	84a9132f5e	Division by zero triggers INT #231	2020-07-31 18:34:57 -04:00
simon987	2ff19f24eb	INTO instruction #78	2020-07-31 18:11:00 -04:00
simon987	b1d7121b22	Interrupts WIP #230	2020-07-30 21:26:47 -04:00
simon987	51c0d4c3c7	SETA test to confirm I can close #184	2020-07-30 20:00:15 -04:00
simon987	421a983910	More tests, add octal with '0o' prefix, fixes #166	2020-07-30 19:27:41 -04:00
simon987	73dc9b1dca	More operand/dw tests (#228 )	2020-07-30 19:13:07 -04:00
simon987	fe299fe061	Test for DW directive with strings (#228 )	2020-07-30 18:40:34 -04:00
simon987	319abad130	Test for ORG directive (#228 )	2020-07-30 18:38:19 -04:00
simon987	ad0124508c	More refactoring, easier assembly testing (#227 )	2020-07-29 21:08:52 -04:00
simon987	ba78d2fd93	Merge mischw plugin with cubot package	2020-07-29 19:13:11 -04:00
simon987	cc5627902e	Remove NpcPlugin class	2020-07-29 18:58:34 -04:00
simon987	21a391e077	Simplify project structure (wip), editor keymap, UI tweaks	2020-07-28 20:09:51 -04:00
simon987	3b7cff6ac7	Hide phaser banner	2020-07-28 20:03:47 -04:00
simon987	304c063887	Simplify project structure (wip), run tsc during compilation	2020-07-27 19:38:29 -04:00