diff --git a/core/pom.xml b/core/pom.xml
index 82f7b43f..3baeec7b 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -24,16 +24,16 @@
 		</dependency>
 		<!--Discord4J Redis Stores-->
 		<dependency>
-			<groupId>com.discord4j</groupId>
-			<artifactId>stores-redis</artifactId>
-			<version>${discord4j.stores.version}</version>
-			<exclusions>
-				<exclusion>
-					<groupId>io.netty</groupId>
-					<artifactId>*</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
+            <groupId>com.discord4j</groupId>
+            <artifactId>stores-redis</artifactId>
+            <version>${discord4j.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>io.netty</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
 	</dependencies>
 
 	<build>
diff --git a/pom.xml b/pom.xml
index 4424ad57..f5c85794 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,287 +1,292 @@
 <?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>
+<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>
 
-	<packaging>pom</packaging>
+    <packaging>pom</packaging>
 
-	<properties>
-		<maven.compiler.target>1.8</maven.compiler.target>
-		<maven.compiler.source>1.8</maven.compiler.source>
-		<maven.compiler.testTarget>1.8</maven.compiler.testTarget>
-		<maven.compiler.testSource>1.8</maven.compiler.testSource>
+    <properties>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.testTarget>1.8</maven.compiler.testTarget>
+        <maven.compiler.testSource>1.8</maven.compiler.testSource>
 
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<project.build.targetEncoding>UTF-8</project.build.targetEncoding>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <project.build.targetEncoding>UTF-8</project.build.targetEncoding>
 
-		<thymeleaf.version>3.0.11.RELEASE</thymeleaf.version>
-		<thymeleaf-layout-dialect.version>2.3.0</thymeleaf-layout-dialect.version>
+        <thymeleaf.version>3.0.11.RELEASE</thymeleaf.version>
+        <thymeleaf-layout-dialect.version>2.3.0</thymeleaf-layout-dialect.version>
 
-		<spring.version>2.1.5.RELEASE</spring.version>
-		<spring.security.version>5.1.5.RELEASE</spring.security.version>
+        <spring.version>2.1.5.RELEASE</spring.version>
+        <spring.security.version>5.1.5.RELEASE</spring.security.version>
 
-		<discord4j.version>3.1.0-SNAPSHOT</discord4j.version>
-		<discord4j.stores.version>3.1.0-SNAPSHOT</discord4j.stores.version>
+        <discord4j.version>3.1.0-SNAPSHOT</discord4j.version>
 
-		<google.client-api.version>1.28.0</google.client-api.version>
+        <google.client-api.version>1.28.0</google.client-api.version>
 
-		<r2dbc.mysql.version>0.8.1.RELEASE</r2dbc.mysql.version>
-		<r2dbc.pool.version>0.8.2.RELEASE</r2dbc.pool.version>
+        <r2dbc.mysql.version>0.8.1.RELEASE</r2dbc.mysql.version>
+        <r2dbc.pool.version>0.8.2.RELEASE</r2dbc.pool.version>
 
-		<netty.version.forced>4.1.44.Final</netty.version.forced>
+        <netty.version.forced>4.1.44.Final</netty.version.forced>
 
-		<revision>3.1.0-SNAPSHOT</revision>
-	</properties>
+        <reactor.version.bom>Dysprosium-SR7</reactor.version.bom>
 
-	<groupId>org.dreamexposure</groupId>
-	<artifactId>DisCal</artifactId>
-	<version>${revision}</version>
+        <revision>3.1.0-SNAPSHOT</revision>
+    </properties>
 
-	<modules>
-		<module>core</module>
-		<module>client</module>
-		<module>server</module>
-		<module>web</module>
-	</modules>
+    <groupId>org.dreamexposure</groupId>
+    <artifactId>DisCal</artifactId>
+    <version>${revision}</version>
 
-	<distributionManagement>
-		<repository>
-			<id>nova-release-pub</id>
-			<name>Releases</name>
-			<url>https://repo.novafox161.com/repository/nova-release-pub/</url>
-		</repository>
-		<snapshotRepository>
-			<id>nova-snapshots-pub</id>
-			<name>Snapshots</name>
-			<url>https://repo.novafox161.com/repository/nova-snapshots-pub/</url>
-		</snapshotRepository>
-	</distributionManagement>
+    <modules>
+        <module>core</module>
+        <module>client</module>
+        <module>server</module>
+        <module>web</module>
+    </modules>
 
-	<repositories>
-		<repository>
-			<id>nova-public</id>
-			<url>https://repo.novafox161.com/repository/nova-public/</url>
-		</repository>
-		<repository>
-			<id>jcenter</id>
-			<url>https://jcenter.bintray.com</url>
-		</repository>
-		<repository>
-			<id>jitpack.io</id>
-			<url>https://jitpack.io</url>
-		</repository>
-		<repository>
-			<id>spring-releases</id>
-			<url>https://repo.spring.io/libs-release</url>
-		</repository>
-		<repository>
-			<id>snapshots-repo</id>
-			<url>https://oss.sonatype.org/content/repositories/snapshots</url>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</repository>
-	</repositories>
+    <distributionManagement>
+        <repository>
+            <id>nova-release-pub</id>
+            <name>Releases</name>
+            <url>https://repo.novafox161.com/repository/nova-release-pub/</url>
+        </repository>
+        <snapshotRepository>
+            <id>nova-snapshots-pub</id>
+            <name>Snapshots</name>
+            <url>https://repo.novafox161.com/repository/nova-snapshots-pub/</url>
+        </snapshotRepository>
+    </distributionManagement>
 
-	<pluginRepositories>
-		<pluginRepository>
-			<id>spring-releases</id>
-			<url>https://repo.spring.io/libs-release</url>
-		</pluginRepository>
-	</pluginRepositories>
+    <repositories>
+        <repository>
+            <id>nova-public</id>
+            <url>https://repo.novafox161.com/repository/nova-public/</url>
+        </repository>
+        <repository>
+            <id>jcenter</id>
+            <url>https://jcenter.bintray.com</url>
+        </repository>
+        <repository>
+            <id>jitpack.io</id>
+            <url>https://jitpack.io</url>
+        </repository>
+        <repository>
+            <id>spring-releases</id>
+            <url>https://repo.spring.io/libs-release</url>
+        </repository>
+        <repository>
+            <id>snapshots-repo</id>
+            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </repository>
+    </repositories>
 
-	<dependencyManagement>
-		<dependencies>
-			<dependency>
-				<groupId>io.projectreactor</groupId>
-				<artifactId>reactor-bom</artifactId>
-				<version>Dysprosium-SR6</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
-		</dependencies>
-	</dependencyManagement>
+    <pluginRepositories>
+        <pluginRepository>
+            <id>spring-releases</id>
+            <url>https://repo.spring.io/libs-release</url>
+        </pluginRepository>
+    </pluginRepositories>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>io.projectreactor</groupId>
+                <artifactId>reactor-bom</artifactId>
+                <version>${reactor.version.bom}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
 
 
-	<dependencies>
-		<!--For Annotations-->
-		<dependency>
-			<groupId>org.jetbrains</groupId>
-			<artifactId>annotations</artifactId>
-			<version>17.0.0</version>
-		</dependency>
-		<!--  *dies*  forced due to stores-redis:lettuce-core giving 4.1.38 -->
-		<dependency>
-			<groupId>io.netty</groupId>
-			<artifactId>netty-all</artifactId>
-			<version>${netty.version.forced}</version>
-		</dependency>
-		<!--Forcing reactor version-->
-		<dependency>
-			<groupId>io.projectreactor</groupId>
-			<artifactId>reactor-core</artifactId>
-		</dependency>
-		<!--NovaUtils API-->
-		<dependency>
-			<groupId>org.dreamexposure</groupId>
-			<artifactId>NovaUtils</artifactId>
-			<version>1.0.0-SNAPSHOT</version>
-			<type>jar</type>
-		</dependency>
-		<!--discordbots.net API library-->
-		<dependency>
-			<groupId>com.github.DiscordBotList</groupId>
-			<artifactId>Java-Wrapper</artifactId>
-			<version>v1.0</version>
-		</dependency>
-		<!--Google Client API-->
-		<dependency>
-			<groupId>com.google.api-client</groupId>
-			<artifactId>google-api-client</artifactId>
-			<version>${google.client-api.version}</version>
-			<optional>false</optional>
-		</dependency>
-		<!--Google Calendar API-->
-		<dependency>
-			<groupId>com.google.apis</groupId>
-			<artifactId>google-api-services-calendar</artifactId>
-			<version>v3-rev371-1.25.0</version>
-		</dependency>
-		<!--Google oauth client API-->
-		<dependency>
-			<groupId>com.google.oauth-client</groupId>
-			<artifactId>google-oauth-client-jetty</artifactId>
-			<version>${google.client-api.version}</version>
-			<exclusions>
-				<exclusion>
-					<groupId>org.mortbay.jetty</groupId>
-					<artifactId>servlet-api</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<!--r2jdbc API for reactive database queries-->
-		<dependency>
-			<groupId>dev.miku</groupId>
-			<artifactId>r2dbc-mysql</artifactId>
-			<version>${r2dbc.mysql.version}</version>
-			<exclusions>
-				<exclusion>
-					<groupId>io.netty</groupId>
-					<artifactId>*</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>io.projectreactor</groupId>
-					<artifactId>*</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<!--r2dbc pools API for mysql connection pooling-->
-		<dependency>
-			<groupId>io.r2dbc</groupId>
-			<artifactId>r2dbc-pool</artifactId>
-			<version>${r2dbc.pool.version}</version>
-		</dependency>
-		<!--JSON API-->
-		<dependency>
-			<groupId>org.json</groupId>
-			<artifactId>json</artifactId>
-			<version>20180813</version>
-		</dependency>
-		<!--Joda Time-->
-		<dependency>
-			<groupId>joda-time</groupId>
-			<artifactId>joda-time</artifactId>
-			<version>2.10.1</version>
-		</dependency>
-		<!--OkHTTP API-->
-		<dependency>
-			<groupId>com.squareup.okhttp3</groupId>
-			<artifactId>okhttp</artifactId>
-			<version>3.14.0</version>
-		</dependency>
-		<!--Discord Webhook Library-->
-		<dependency>
-			<groupId>club.minnced</groupId>
-			<artifactId>discord-webhooks</artifactId>
-			<version>0.1.7</version>
-		</dependency>
-		<!--Thymeleaf-->
-		<dependency>
-			<groupId>org.thymeleaf</groupId>
-			<artifactId>thymeleaf</artifactId>
-			<version>${thymeleaf.version}</version>
-			<scope>compile</scope>
-		</dependency>
-		<!--Thymeleaf 5 for Spring-->
-		<dependency>
-			<groupId>org.thymeleaf</groupId>
-			<artifactId>thymeleaf-spring5</artifactId>
-			<version>${thymeleaf.version}</version>
-			<scope>compile</scope>
-		</dependency>
-		<!--Thymeleaf dialect-->
-		<dependency>
-			<groupId>nz.net.ultraq.thymeleaf</groupId>
-			<artifactId>thymeleaf-layout-dialect</artifactId>
-			<version>${thymeleaf-layout-dialect.version}</version>
-			<scope>compile</scope>
-		</dependency>
-		<!--Spring Boot starter Thymeleaf API-->
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-thymeleaf</artifactId>
-			<version>${spring.version}</version>
-			<scope>compile</scope>
-		</dependency>
-		<!--Spring Boot starter web API-->
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-web</artifactId>
-			<version>${spring.version}</version>
-		</dependency>
-		<!--Spring Session API-->
-		<dependency>
-			<groupId>org.springframework.session</groupId>
-			<artifactId>spring-session-data-redis</artifactId>
-			<version>${spring.version}</version>
-		</dependency>
-		<!--Spring Security Core-->
-		<dependency>
-			<groupId>org.springframework.security</groupId>
-			<artifactId>spring-security-core</artifactId>
-			<version>${spring.security.version}</version>
-			<scope>compile</scope>
-		</dependency>
-		<!--Spring Security Web-->
-		<dependency>
-			<groupId>org.springframework.security</groupId>
-			<artifactId>spring-security-web</artifactId>
-			<version>${spring.security.version}</version>
-		</dependency>
-	</dependencies>
+    <dependencies>
+        <!--For Annotations-->
+        <dependency>
+            <groupId>org.jetbrains</groupId>
+            <artifactId>annotations</artifactId>
+            <version>17.0.0</version>
+        </dependency>
+        <!--  *dies*  forced due to stores-redis:lettuce-core giving 4.1.38 -->
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-all</artifactId>
+            <version>${netty.version.forced}</version>
+        </dependency>
+        <!--Forcing reactor version-->
+        <dependency>
+            <groupId>io.projectreactor</groupId>
+            <artifactId>reactor-core</artifactId>
+        </dependency>
+        <!--Forcing reactor netty version-->
+        <dependency>
+            <groupId>io.projectreactor.netty</groupId>
+            <artifactId>reactor-netty</artifactId>
+        </dependency>
+        <!--NovaUtils API-->
+        <dependency>
+            <groupId>org.dreamexposure</groupId>
+            <artifactId>NovaUtils</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+            <type>jar</type>
+        </dependency>
+        <!--discordbots.net API library-->
+        <dependency>
+            <groupId>com.github.DiscordBotList</groupId>
+            <artifactId>Java-Wrapper</artifactId>
+            <version>v1.0</version>
+        </dependency>
+        <!--Google Client API-->
+        <dependency>
+            <groupId>com.google.api-client</groupId>
+            <artifactId>google-api-client</artifactId>
+            <version>${google.client-api.version}</version>
+            <optional>false</optional>
+        </dependency>
+        <!--Google Calendar API-->
+        <dependency>
+            <groupId>com.google.apis</groupId>
+            <artifactId>google-api-services-calendar</artifactId>
+            <version>v3-rev371-1.25.0</version>
+        </dependency>
+        <!--Google oauth client API-->
+        <dependency>
+            <groupId>com.google.oauth-client</groupId>
+            <artifactId>google-oauth-client-jetty</artifactId>
+            <version>${google.client-api.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.mortbay.jetty</groupId>
+                    <artifactId>servlet-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <!--r2jdbc API for reactive database queries-->
+        <dependency>
+            <groupId>dev.miku</groupId>
+            <artifactId>r2dbc-mysql</artifactId>
+            <version>${r2dbc.mysql.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>io.netty</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>io.projectreactor</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <!--r2dbc pools API for mysql connection pooling-->
+        <dependency>
+            <groupId>io.r2dbc</groupId>
+            <artifactId>r2dbc-pool</artifactId>
+            <version>${r2dbc.pool.version}</version>
+        </dependency>
+        <!--JSON API-->
+        <dependency>
+            <groupId>org.json</groupId>
+            <artifactId>json</artifactId>
+            <version>20180813</version>
+        </dependency>
+        <!--Joda Time-->
+        <dependency>
+            <groupId>joda-time</groupId>
+            <artifactId>joda-time</artifactId>
+            <version>2.10.1</version>
+        </dependency>
+        <!--OkHTTP API-->
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
+            <version>3.14.0</version>
+        </dependency>
+        <!--Discord Webhook Library-->
+        <dependency>
+            <groupId>club.minnced</groupId>
+            <artifactId>discord-webhooks</artifactId>
+            <version>0.1.7</version>
+        </dependency>
+        <!--Thymeleaf-->
+        <dependency>
+            <groupId>org.thymeleaf</groupId>
+            <artifactId>thymeleaf</artifactId>
+            <version>${thymeleaf.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <!--Thymeleaf 5 for Spring-->
+        <dependency>
+            <groupId>org.thymeleaf</groupId>
+            <artifactId>thymeleaf-spring5</artifactId>
+            <version>${thymeleaf.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <!--Thymeleaf dialect-->
+        <dependency>
+            <groupId>nz.net.ultraq.thymeleaf</groupId>
+            <artifactId>thymeleaf-layout-dialect</artifactId>
+            <version>${thymeleaf-layout-dialect.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <!--Spring Boot starter Thymeleaf API-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-thymeleaf</artifactId>
+            <version>${spring.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <!--Spring Boot starter web API-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+            <version>${spring.version}</version>
+        </dependency>
+        <!--Spring Session API-->
+        <dependency>
+            <groupId>org.springframework.session</groupId>
+            <artifactId>spring-session-data-redis</artifactId>
+            <version>${spring.version}</version>
+        </dependency>
+        <!--Spring Security Core-->
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-core</artifactId>
+            <version>${spring.security.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <!--Spring Security Web-->
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-web</artifactId>
+            <version>${spring.security.version}</version>
+        </dependency>
+    </dependencies>
 
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.7.0</version>
-				<configuration>
-					<source>8</source>
-					<target>8</target>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-deploy-plugin</artifactId>
-				<version>2.7</version>
-				<configuration>
-					<skip>true</skip>
-				</configuration>
-				<inherited>false</inherited>
-			</plugin>
-		</plugins>
-	</build>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.7.0</version>
+                <configuration>
+                    <source>8</source>
+                    <target>8</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <version>2.7</version>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+                <inherited>false</inherited>
+            </plugin>
+        </plugins>
+    </build>
 </project>
\ No newline at end of file