diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 1d9daf17..6392f2fe 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/devcontainers/java:0-17
+FROM mcr.microsoft.com/devcontainers/java:17
 
 RUN su vscode -c "umask 0002 && . /usr/local/sdkman/bin/sdkman-init.sh && sdk install gradle "
 
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 21d4f154..8442c4ac 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -14,14 +14,24 @@
 	// Use 'forwardPorts' to make a list of ports inside the container available locally.
 	// This can be used to network with other containers or with the host.
 	"forwardPorts": [
-		1080,
-		80,
-		8082
+		1080, // Mailcatcher
+		5432, // PostgreSQL
+		8080, // Events
+		8082  // Adminer
 	],
 	// Use 'postCreateCommand' to run commands after the container is created.
-	"postCreateCommand": "gradle bootRun",
+	// "postCreateCommand": "gradle bootRun",
 	// Configure tool-specific properties.
 	// "customizations": {},
 	// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
-	"remoteUser": "root"
+	"remoteUser": "root",
+	"customizations": {
+		"vscode": {
+			"extensions": [
+				"vmware.vscode-boot-dev-pack",
+				"vscjava.vscode-gradle",
+				"vscjava.vscode-java-pack"
+			]
+		}
+	}
 }
\ No newline at end of file
diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml
index 1e479343..ca18713e 100644
--- a/.devcontainer/docker-compose.yml
+++ b/.devcontainer/docker-compose.yml
@@ -26,7 +26,7 @@ services:
       - mailcatcher
 
   postgres:
-    image: postgres:latest
+    image: docker.io/library/postgres:latest
     restart: unless-stopped
     volumes:
       - postgres-data:/var/lib/postgresql/data
@@ -36,7 +36,7 @@ services:
       POSTGRES_HOST_AUTH_METHOD: trust
 
   adminer:
-    image: adminer
+    image: docker.io/library/adminer:latest
     restart: always
     depends_on: 
       - postgres
@@ -44,6 +44,6 @@ services:
       - "8082:8080"
 
   mailcatcher:
-    image: schickling/mailcatcher
+    image: docker.io/schickling/mailcatcher:latest
     restart: on-failure
     network_mode: service:postgres
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 6c374a5e..f4e6e787 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -10,10 +10,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
+    - name: Setup JDK
+      uses: actions/setup-java@v3
+      with:
+        distribution: 'temurin'
+        java-version: '17'
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
+      uses: github/codeql-action/autobuild@v3
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3
diff --git a/build.gradle b/build.gradle
index c72e6dc5..22ba892c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
     ext {
-        springBootVersion = '2.7.18'
+        springBootVersion = '3.2.5'
     }
     repositories {
         mavenCentral()
@@ -56,16 +56,11 @@ dependencies {
     //TEMP APPLICATION PROPERTIES HELPER
     runtimeOnly 'org.springframework.boot:spring-boot-properties-migrator'
 
-
-    implementation 'javax.el:javax.el-api:2.2.5'
     implementation "be.woutschoovaerts:mollie:3.6.1"
 
-
-    implementation 'org.thymeleaf:thymeleaf-spring5'
-     implementation 'org.thymeleaf:thymeleaf'
-     implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity5'
-     implementation 'org.thymeleaf.extras:thymeleaf-extras-java8time'
-
+    implementation 'org.thymeleaf:thymeleaf-spring6'
+    implementation 'org.thymeleaf:thymeleaf'
+    implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity6'
 
     implementation 'com.google.guava:guava:32.0.0-jre'
     implementation 'org.hibernate.validator:hibernate-validator'
diff --git a/config/application-devcontainer.yml b/config/application-devcontainer.yml
index a0dca394..a21987c8 100644
--- a/config/application-devcontainer.yml
+++ b/config/application-devcontainer.yml
@@ -76,7 +76,7 @@ logging.level.web: DEBUG
 
 # Serve connect
 server:
-  port: 80
+  port: 8080
   servlet.context-path: /
 
 # CH Connect Configuration
diff --git a/src/main/java/ch/wisv/events/ChConnectConfiguration.java b/src/main/java/ch/wisv/events/ChConnectConfiguration.java
index eb146c0f..56d1f8c4 100644
--- a/src/main/java/ch/wisv/events/ChConnectConfiguration.java
+++ b/src/main/java/ch/wisv/events/ChConnectConfiguration.java
@@ -9,10 +9,10 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Profile;
-import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
+import org.springframework.security.config.Customizer;
+import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.oauth2.client.oidc.userinfo.OidcUserRequest;
 import org.springframework.security.oauth2.client.oidc.userinfo.OidcUserService;
@@ -20,6 +20,7 @@
 import org.springframework.security.oauth2.core.oidc.OidcIdToken;
 import org.springframework.security.oauth2.core.oidc.user.DefaultOidcUser;
 import org.springframework.security.oauth2.core.oidc.user.OidcUser;
+import org.springframework.security.web.SecurityFilterChain;
 import org.springframework.security.web.csrf.CookieCsrfTokenRepository;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.cors.CorsConfigurationSource;
@@ -32,11 +33,11 @@
  */
 @Configuration
 @EnableWebSecurity
-@EnableGlobalMethodSecurity(prePostEnabled = true)
+@EnableMethodSecurity(prePostEnabled = true)
 @ConfigurationProperties(prefix = "wisvch.connect")
 @Validated
 @Profile("!test")
-public class ChConnectConfiguration extends WebSecurityConfigurerAdapter {
+public class ChConnectConfiguration {
 
     /**
      * Groups that are admin in the system.
@@ -64,24 +65,29 @@ public class ChConnectConfiguration extends WebSecurityConfigurerAdapter {
      * @param http
      * @throws Exception
      */
-    public void configure(HttpSecurity http) throws Exception {
+    @Bean
+    public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
         http
-                .cors()
-                .and()
-                .csrf()
-                .and().authorizeRequests()
-                    .antMatchers("/administrator/**").hasRole("ADMIN")
-                    .antMatchers("/", "/management/health").permitAll()
+                .cors(Customizer.withDefaults())
+                .csrf(Customizer.withDefaults())
+                .authorizeHttpRequests((authorize) -> authorize
+                    .requestMatchers("/administrator/**").hasRole("ADMIN")
+                    .requestMatchers("/", "/management/health").permitAll()
                     .anyRequest().permitAll()
-                .and()
-                    .logout()
+                    )
+                .logout(logout -> logout
                     .logoutSuccessUrl("/")
-                .and()
-                    .csrf()
+                    )
+                .csrf(csrf -> csrf
                     .csrfTokenRepository(CookieCsrfTokenRepository.withHttpOnlyFalse())
-                    .ignoringAntMatchers("/api/v1/**")
-                .and()
-                .oauth2Login().userInfoEndpoint().oidcUserService(oidcUserService());
+                    .ignoringRequestMatchers("/api/v1/**")
+                )
+                .oauth2Login(oauth -> oauth
+                    .userInfoEndpoint(userInfo -> userInfo 
+                        .oidcUserService(oidcUserService())
+                    )
+                );
+        return http.build();
     }
 
     /**
diff --git a/src/main/java/ch/wisv/events/EventsApplication.java b/src/main/java/ch/wisv/events/EventsApplication.java
index 58db039e..346d92d1 100644
--- a/src/main/java/ch/wisv/events/EventsApplication.java
+++ b/src/main/java/ch/wisv/events/EventsApplication.java
@@ -3,10 +3,8 @@
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.domain.EntityScan;
-import org.springframework.context.annotation.Bean;
 import org.springframework.data.jpa.convert.threeten.Jsr310JpaConverters;
 import org.springframework.scheduling.annotation.EnableScheduling;
-import org.thymeleaf.extras.java8time.dialect.Java8TimeDialect;
 
 /**
  * EventsApplication class.
@@ -25,15 +23,4 @@ public class EventsApplication {
     public static void main(String[] args) {
         SpringApplication.run(EventsApplication.class, args);
     }
-
-    /**
-     * Enables Time formating in thymeleaf.
-     *
-     * @return Java8TimeDialect
-     */
-    @Bean
-    public Java8TimeDialect java8TimeDialect() {
-        return new Java8TimeDialect();
-    }
-
 }
diff --git a/src/main/java/ch/wisv/events/WebConfiguration.java b/src/main/java/ch/wisv/events/WebConfiguration.java
new file mode 100644
index 00000000..2a3ea9af
--- /dev/null
+++ b/src/main/java/ch/wisv/events/WebConfiguration.java
@@ -0,0 +1,15 @@
+package ch.wisv.events;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.PathMatchConfigurer;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+@Configuration
+public class WebConfiguration implements WebMvcConfigurer {
+
+    @Override
+    public void configurePathMatch(PathMatchConfigurer configurer) {
+      configurer.setUseTrailingSlashMatch(true);
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/ch/wisv/events/admin/controller/DashboardIndexController.java b/src/main/java/ch/wisv/events/admin/controller/DashboardIndexController.java
index c27e0497..c5a239a6 100644
--- a/src/main/java/ch/wisv/events/admin/controller/DashboardIndexController.java
+++ b/src/main/java/ch/wisv/events/admin/controller/DashboardIndexController.java
@@ -5,7 +5,6 @@
 import ch.wisv.events.core.repository.EventRepository;
 import ch.wisv.events.core.service.customer.CustomerService;
 import ch.wisv.events.core.service.event.EventService;
-import ch.wisv.events.core.service.ticket.TicketService;
 import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.List;
diff --git a/src/main/java/ch/wisv/events/api/controller/OrderRestController.java b/src/main/java/ch/wisv/events/api/controller/OrderRestController.java
index 4bca7733..79da0311 100644
--- a/src/main/java/ch/wisv/events/api/controller/OrderRestController.java
+++ b/src/main/java/ch/wisv/events/api/controller/OrderRestController.java
@@ -1,8 +1,6 @@
 package ch.wisv.events.api.controller;
 
-import ch.wisv.events.core.service.order.OrderService;
 import ch.wisv.events.webshop.service.PaymentsService;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
@@ -10,7 +8,6 @@
 /**
  * OrderRestController class.
  */
-@Slf4j
 @RestController
 @RequestMapping("/api/v1/orders")
 public class OrderRestController {
diff --git a/src/main/java/ch/wisv/events/api/request/ProductDto.java b/src/main/java/ch/wisv/events/api/request/ProductDto.java
index 480331d5..69f02910 100644
--- a/src/main/java/ch/wisv/events/api/request/ProductDto.java
+++ b/src/main/java/ch/wisv/events/api/request/ProductDto.java
@@ -1,6 +1,6 @@
 package ch.wisv.events.api.request;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 import ch.wisv.events.core.util.VatRate;
 import lombok.Getter;
diff --git a/src/main/java/ch/wisv/events/core/model/customer/Customer.java b/src/main/java/ch/wisv/events/core/model/customer/Customer.java
index 2521e0a0..3bfd0ecd 100644
--- a/src/main/java/ch/wisv/events/core/model/customer/Customer.java
+++ b/src/main/java/ch/wisv/events/core/model/customer/Customer.java
@@ -5,16 +5,15 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
-import javax.persistence.Column;
-import javax.persistence.ElementCollection;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
+import jakarta.persistence.Column;
+import jakarta.persistence.ElementCollection;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
 import lombok.AccessLevel;
 import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
-import org.springframework.beans.factory.annotation.Value;
 
 /**
  * Customer object.
diff --git a/src/main/java/ch/wisv/events/core/model/document/Document.java b/src/main/java/ch/wisv/events/core/model/document/Document.java
index fa24a0aa..6baa8960 100644
--- a/src/main/java/ch/wisv/events/core/model/document/Document.java
+++ b/src/main/java/ch/wisv/events/core/model/document/Document.java
@@ -1,8 +1,8 @@
 package ch.wisv.events.core.model.document;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
 import lombok.Data;
 
 /**
diff --git a/src/main/java/ch/wisv/events/core/model/event/Event.java b/src/main/java/ch/wisv/events/core/model/event/Event.java
index b9df4761..41e6d7e7 100644
--- a/src/main/java/ch/wisv/events/core/model/event/Event.java
+++ b/src/main/java/ch/wisv/events/core/model/event/Event.java
@@ -6,22 +6,22 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.ElementCollection;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
-import javax.persistence.OrderBy;
-import javax.validation.constraints.NotNull;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.ElementCollection;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OrderBy;
+import jakarta.validation.constraints.NotNull;
 
 import lombok.AccessLevel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.Setter;
-import javax.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotEmpty;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.format.annotation.DateTimeFormat.ISO;
 
diff --git a/src/main/java/ch/wisv/events/core/model/order/Order.java b/src/main/java/ch/wisv/events/core/model/order/Order.java
index 2126284b..a56a1c62 100644
--- a/src/main/java/ch/wisv/events/core/model/order/Order.java
+++ b/src/main/java/ch/wisv/events/core/model/order/Order.java
@@ -6,16 +6,16 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.UUID;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.ManyToMany;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 import ch.wisv.events.core.util.VatRate;
 import lombok.AccessLevel;
@@ -23,6 +23,7 @@
 import lombok.Getter;
 import lombok.Setter;
 import org.springframework.format.annotation.DateTimeFormat;
+
 import static org.springframework.format.annotation.DateTimeFormat.ISO;
 
 @Entity
@@ -51,7 +52,7 @@ public class Order {
      * Field customer customer that order this.
      */
     @ManyToOne
-    @NotNull
+    // @NotNull
     private Customer owner;
 
     /**
@@ -120,6 +121,8 @@ public Order() {
         this.createdAt = LocalDateTime.now();
         this.status = OrderStatus.ANONYMOUS;
         this.orderProducts = new ArrayList<>();
+        this.createdBy = "ANONYMOUS";
+        this.amount = 0d;
     }
 
     /**
diff --git a/src/main/java/ch/wisv/events/core/model/order/OrderProduct.java b/src/main/java/ch/wisv/events/core/model/order/OrderProduct.java
index 3eb6f30b..a88a84b3 100644
--- a/src/main/java/ch/wisv/events/core/model/order/OrderProduct.java
+++ b/src/main/java/ch/wisv/events/core/model/order/OrderProduct.java
@@ -2,8 +2,8 @@
 
 import ch.wisv.events.core.model.product.Product;
 
-import javax.persistence.*;
-import javax.validation.constraints.NotNull;
+import jakarta.persistence.*;
+import jakarta.validation.constraints.NotNull;
 
 import ch.wisv.events.core.util.VatRate;
 import lombok.AccessLevel;
diff --git a/src/main/java/ch/wisv/events/core/model/product/Product.java b/src/main/java/ch/wisv/events/core/model/product/Product.java
index dc95d8ee..65782ac9 100644
--- a/src/main/java/ch/wisv/events/core/model/product/Product.java
+++ b/src/main/java/ch/wisv/events/core/model/product/Product.java
@@ -6,7 +6,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
-import javax.persistence.*;
+import jakarta.persistence.*;
 
 import ch.wisv.events.core.model.event.Event;
 import ch.wisv.events.core.util.VatRate;
diff --git a/src/main/java/ch/wisv/events/core/model/ticket/Ticket.java b/src/main/java/ch/wisv/events/core/model/ticket/Ticket.java
index e76f9fa5..69ce0643 100644
--- a/src/main/java/ch/wisv/events/core/model/ticket/Ticket.java
+++ b/src/main/java/ch/wisv/events/core/model/ticket/Ticket.java
@@ -8,11 +8,11 @@
 
 import java.time.LocalDateTime;
 import java.util.UUID;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
-import javax.validation.constraints.NotNull;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToOne;
+import jakarta.validation.constraints.NotNull;
 
 import lombok.AccessLevel;
 import lombok.Data;
@@ -39,7 +39,7 @@ public class Ticket {
     /**
      * Customer which owns the Ticket.
      */
-    @ManyToOne(cascade = {javax.persistence.CascadeType.ALL})
+    @ManyToOne(cascade = {jakarta.persistence.CascadeType.ALL})
     public Order order;
 
     /**
diff --git a/src/main/java/ch/wisv/events/core/model/webhook/Webhook.java b/src/main/java/ch/wisv/events/core/model/webhook/Webhook.java
index 97d3897a..40278ac0 100644
--- a/src/main/java/ch/wisv/events/core/model/webhook/Webhook.java
+++ b/src/main/java/ch/wisv/events/core/model/webhook/Webhook.java
@@ -3,10 +3,10 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
-import javax.persistence.ElementCollection;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
+import jakarta.persistence.ElementCollection;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
 import lombok.Data;
 
 @Entity
diff --git a/src/main/java/ch/wisv/events/core/model/webhook/WebhookTask.java b/src/main/java/ch/wisv/events/core/model/webhook/WebhookTask.java
index a22a5bd7..5fc89edb 100644
--- a/src/main/java/ch/wisv/events/core/model/webhook/WebhookTask.java
+++ b/src/main/java/ch/wisv/events/core/model/webhook/WebhookTask.java
@@ -1,11 +1,11 @@
 package ch.wisv.events.core.model.webhook;
 
 import java.time.LocalDateTime;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToOne;
 import lombok.Data;
 import org.json.simple.JSONObject;
 
diff --git a/src/main/java/ch/wisv/events/core/service/customer/CustomerServiceImpl.java b/src/main/java/ch/wisv/events/core/service/customer/CustomerServiceImpl.java
index 0649b0fc..5a8b2d46 100644
--- a/src/main/java/ch/wisv/events/core/service/customer/CustomerServiceImpl.java
+++ b/src/main/java/ch/wisv/events/core/service/customer/CustomerServiceImpl.java
@@ -176,16 +176,16 @@ public Customer createByOidcUser(OidcUser userInfo) throws CustomerInvalidExcept
      */
     @Override
     public void update(Customer customer) throws CustomerInvalidException, CustomerNotFoundException {
+        this.assertIsValidCustomer(customer);
+        
         Customer model = this.getByKey(customer.getKey());
-
+        
         model.setName(customer.getName());
         model.setEmail(customer.getEmail());
         model.setRfidToken(customer.getRfidToken());
         model.setLdapGroups(customer.getLdapGroups());
         model.setVerifiedChMember(customer.isVerifiedChMember());
 
-        this.assertIsValidCustomer(model);
-
         customerRepository.save(model);
     }
 
diff --git a/src/main/java/ch/wisv/events/core/service/event/EventServiceImpl.java b/src/main/java/ch/wisv/events/core/service/event/EventServiceImpl.java
index 6b36acc8..7027ba5f 100644
--- a/src/main/java/ch/wisv/events/core/service/event/EventServiceImpl.java
+++ b/src/main/java/ch/wisv/events/core/service/event/EventServiceImpl.java
@@ -163,6 +163,8 @@ public void create(Event event) throws EventInvalidException {
      */
     @Override
     public void update(Event event) throws EventNotFoundException, EventInvalidException {
+        this.assertIsValidEvent(event);
+        
         Event update = this.getByKey(event.getKey());
         this.updateLinkedProducts(event, update.getProducts(), false);
 
@@ -184,7 +186,6 @@ public void update(Event event) throws EventNotFoundException, EventInvalidExcep
             update.setImageUrl(event.getImageUrl());
         }
 
-        this.assertIsValidEvent(event);
         this.updateLinkedProducts(event, update.getProducts(), true);
         eventRepository.save(update);
     }
diff --git a/src/main/java/ch/wisv/events/core/service/mail/MailServiceImpl.java b/src/main/java/ch/wisv/events/core/service/mail/MailServiceImpl.java
index 65d20e39..68d79fea 100644
--- a/src/main/java/ch/wisv/events/core/service/mail/MailServiceImpl.java
+++ b/src/main/java/ch/wisv/events/core/service/mail/MailServiceImpl.java
@@ -11,9 +11,9 @@
 import java.net.URL;
 import java.util.List;
 import java.util.Locale;
-import javax.mail.MessagingException;
-import javax.mail.internet.MimeMessage;
-import javax.validation.constraints.NotNull;
+import jakarta.mail.MessagingException;
+import jakarta.mail.internet.MimeMessage;
+import jakarta.validation.constraints.NotNull;
 
 import ch.wisv.events.core.service.ticket.TicketService;
 import ch.wisv.events.core.util.QrCode;
@@ -29,8 +29,7 @@
 import org.springframework.mail.javamail.MimeMessageHelper;
 import org.springframework.stereotype.Service;
 import org.thymeleaf.context.Context;
-import org.thymeleaf.spring5.SpringTemplateEngine;
-
+import org.thymeleaf.spring6.SpringTemplateEngine;
 /**
  * MailService implementation.
  */
diff --git a/src/main/java/ch/wisv/events/core/service/product/ProductServiceImpl.java b/src/main/java/ch/wisv/events/core/service/product/ProductServiceImpl.java
index 4f5fc526..e0a2fbb9 100644
--- a/src/main/java/ch/wisv/events/core/service/product/ProductServiceImpl.java
+++ b/src/main/java/ch/wisv/events/core/service/product/ProductServiceImpl.java
@@ -108,6 +108,8 @@ public Product create(ProductDto productDto) throws ProductInvalidException {
      */
     @Override
     public void update(Product product) throws ProductNotFoundException, ProductInvalidException {
+        this.assertIsValidProduct(product);
+
         Product model = this.getByKey(product.getKey());
         this.updateLinkedProducts(product, model.getProducts(), false);
 
@@ -128,7 +130,6 @@ public void update(Product product) throws ProductNotFoundException, ProductInva
             model.setSold(product.getSold());
         }
 
-        this.assertIsValidProduct(product);
         this.updateLinkedProducts(product, model.getProducts(), true);
         productRepository.save(model);
     }
diff --git a/src/main/java/ch/wisv/events/core/service/ticket/TicketServiceImpl.java b/src/main/java/ch/wisv/events/core/service/ticket/TicketServiceImpl.java
index 14bd68f8..4a50c351 100644
--- a/src/main/java/ch/wisv/events/core/service/ticket/TicketServiceImpl.java
+++ b/src/main/java/ch/wisv/events/core/service/ticket/TicketServiceImpl.java
@@ -24,7 +24,7 @@
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 /**
  * TicketServiceImpl class.
diff --git a/src/main/java/ch/wisv/events/webshop/controller/WebshopIndexController.java b/src/main/java/ch/wisv/events/webshop/controller/WebshopIndexController.java
index e7702ddd..a6c94c3d 100644
--- a/src/main/java/ch/wisv/events/webshop/controller/WebshopIndexController.java
+++ b/src/main/java/ch/wisv/events/webshop/controller/WebshopIndexController.java
@@ -15,7 +15,7 @@
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 /**
  * WebshopIndexController class.
diff --git a/src/main/java/ch/wisv/events/webshop/controller/WebshopTicketController.java b/src/main/java/ch/wisv/events/webshop/controller/WebshopTicketController.java
index 39913a96..3e4d05cd 100644
--- a/src/main/java/ch/wisv/events/webshop/controller/WebshopTicketController.java
+++ b/src/main/java/ch/wisv/events/webshop/controller/WebshopTicketController.java
@@ -19,7 +19,7 @@
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import java.awt.image.BufferedImage;
 import java.io.IOException;
 
diff --git a/src/main/java/ch/wisv/events/webshop/service/PaymentsServiceImpl.java b/src/main/java/ch/wisv/events/webshop/service/PaymentsServiceImpl.java
index 63bb17cf..8ab5e02d 100644
--- a/src/main/java/ch/wisv/events/webshop/service/PaymentsServiceImpl.java
+++ b/src/main/java/ch/wisv/events/webshop/service/PaymentsServiceImpl.java
@@ -15,7 +15,7 @@
 import ch.wisv.events.core.service.mail.MailService;
 import ch.wisv.events.core.service.order.OrderService;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
diff --git a/src/main/resources/dev/data/orders.json b/src/main/resources/dev/data/orders.json
index 33895536..8918fced 100644
--- a/src/main/resources/dev/data/orders.json
+++ b/src/main/resources/dev/data/orders.json
@@ -2,36 +2,50 @@
   {
     "orderStatus" : "PAID",
     "paymentMethod" : "IDEAL",
-    "customerRfid" : "3061a041"
+    "customerRfid" : "3061a041",
+    "owner" : 1,
+    "createdBy" : "Sven Popping"
   },
   {
     "orderStatus" : "PAID",
     "paymentMethod" : "IDEAL",
-    "customerRfid" : "3061a041"
+    "customerRfid" : "3061a041",
+    "owner" : 1,
+    "createdBy" : "Sven Popping"
   },
   {
     "orderStatus" : "PAID",
     "paymentMethod" : "IDEAL",
-    "customerRfid" : "3061a041"
+    "customerRfid" : "3061a041",
+    "owner" : 1,
+    "createdBy" : "Sven Popping"
   },
   {
     "orderStatus" : "PAID",
     "paymentMethod" : "IDEAL",
-    "customerRfid" : "3061a041"
+    "customerRfid" : "3061a041",
+    "owner" : 1,
+    "createdBy" : "Sven Popping"
   },
   {
     "orderStatus" : "PAID",
     "paymentMethod" : "IDEAL",
-    "customerRfid" : "3061a041"
+    "customerRfid" : "3061a041",
+    "owner" : 1,
+    "createdBy" : "Sven Popping"
   },
   {
     "orderStatus" : "PAID",
     "paymentMethod" : "IDEAL",
-    "customerRfid" : "3061a041"
+    "customerRfid" : "3061a041",
+    "owner" : 1,
+    "createdBy" : "Sven Popping"
   },
   {
     "orderStatus" : "PAID",
     "paymentMethod" : "IDEAL",
-    "customerRfid" : "3061a041"
+    "customerRfid" : "3061a041",
+    "owner" : 1,
+    "createdBy" : "Sven Popping"
   }
 ]
\ No newline at end of file
diff --git a/src/main/resources/templates/admin/customers/customer.html b/src/main/resources/templates/admin/customers/customer.html
index 9b435b1c..3ce1aeb5 100644
--- a/src/main/resources/templates/admin/customers/customer.html
+++ b/src/main/resources/templates/admin/customers/customer.html
@@ -32,17 +32,17 @@
 </head>
 
 <body>
-<nav th:replace="fragments/header :: header"></nav>
+<nav th:replace="~{fragments/header :: header}"></nav>
 
 <!--/*@thymesVar id="customer" type="ch.wisv.events.core.model.customer.Customer"*/-->
 <div class="container-fluid">
     <div class="row">
-        <nav th:replace="admin/sidebar :: sidebar"></nav>
+        <nav th:replace="~{admin/sidebar :: sidebar}"></nav>
 
         <main class="col-sm-9 ml-sm-auto col-md-10 p-5" role="main">
             <h1>Create/update customer</h1>
 
-            <div th:replace="fragments/messages :: messages"></div>
+            <div th:replace="~{fragments/messages :: messages}"></div>
 
             <form th:action="@{./}" th:object="${customer}" method="POST">
                 <input type="hidden" th:field="*{key}" th:value="*{key}">
diff --git a/src/main/resources/templates/admin/customers/index.html b/src/main/resources/templates/admin/customers/index.html
index a68932c8..4b0a20ad 100644
--- a/src/main/resources/templates/admin/customers/index.html
+++ b/src/main/resources/templates/admin/customers/index.html
@@ -32,11 +32,11 @@
 </head>
 
 <body>
-<nav th:replace="fragments/header :: header"></nav>
+<nav th:replace="~{fragments/header :: header}"></nav>
 
 <div class="container-fluid">
     <div class="row">
-        <nav th:replace="admin/sidebar :: sidebar"></nav>
+        <nav th:replace="~{admin/sidebar :: sidebar}"></nav>
 
         <main class="col-sm-9 ml-sm-auto col-md-10 p-5" role="main">
             <h1>Customers
@@ -45,7 +45,7 @@ <h1>Customers
                 </a>
             </h1>
 
-            <div th:replace="fragments/messages :: messages"></div>
+            <div th:replace="~{fragments/messages :: messages}"></div>
 
             <div class="table-responsive">
                 <table id="customerTable" class="table table-striped">
diff --git a/src/main/resources/templates/admin/customers/view.html b/src/main/resources/templates/admin/customers/view.html
index 529f0c79..1c998b6e 100644
--- a/src/main/resources/templates/admin/customers/view.html
+++ b/src/main/resources/templates/admin/customers/view.html
@@ -32,12 +32,12 @@
 </head>
 
 <body>
-<nav th:replace="fragments/header :: header"></nav>
+<nav th:replace="~{fragments/header :: header}"></nav>
 
 <!--/*@thymesVar id="customer" type="ch.wisv.events.core.model.customer.Customer"*/-->
 <div class="container-fluid">
     <div class="row">
-        <nav th:replace="admin/sidebar :: sidebar"></nav>
+        <nav th:replace="~{admin/sidebar :: sidebar}"></nav>
 
         <main class="col-sm-9 ml-sm-auto col-md-10 p-5" role="main">
             <h1>[[${customer.getName()}]]
@@ -46,7 +46,7 @@ <h1>[[${customer.getName()}]]
                 </a>
             </h1>
 
-            <div th:replace="fragments/messages :: messages"></div>
+            <div th:replace="~{fragments/messages :: messages}"></div>
 
 
             <div class="row mb-5">
diff --git a/src/main/resources/templates/admin/events/event.html b/src/main/resources/templates/admin/events/event.html
index a1bbe03a..895395dc 100644
--- a/src/main/resources/templates/admin/events/event.html
+++ b/src/main/resources/templates/admin/events/event.html
@@ -36,12 +36,12 @@
 </head>
 
 <body>
-<nav th:replace="fragments/header :: header"></nav>
+<nav th:replace="~{fragments/header :: header}"></nav>
 
 <!--/*@thymesVar id="event" type="ch.wisv.events.core.model.event.Event"*/-->
 <div class="container-fluid">
     <div class="row">
-        <nav th:replace="admin/sidebar :: sidebar"></nav>
+        <nav th:replace="~{admin/sidebar :: sidebar}"></nav>
 
         <main class="col-sm-9 ml-sm-auto col-md-10 p-5" role="main">
             <h1>Create/update event
@@ -62,7 +62,7 @@ <h4 class="dropdown-header">Select a template</h4>
                 </div>
             </h1>
 
-            <div th:replace="fragments/messages :: messages"></div>
+            <div th:replace="~{fragments/messages :: messages}"></div>
 
             <form th:action="@{./}" th:object="${event}" method="POST" enctype="multipart/form-data">
                 <input type="hidden" th:field="*{key}" th:value="*{key}">
diff --git a/src/main/resources/templates/admin/events/index.html b/src/main/resources/templates/admin/events/index.html
index 3d3a3499..e97e1418 100644
--- a/src/main/resources/templates/admin/events/index.html
+++ b/src/main/resources/templates/admin/events/index.html
@@ -32,11 +32,11 @@
 </head>
 
 <body>
-<nav th:replace="fragments/header :: header"></nav>
+<nav th:replace="~{fragments/header :: header}"></nav>
 
 <div class="container-fluid">
     <div class="row">
-        <nav th:replace="admin/sidebar :: sidebar"></nav>
+        <nav th:replace="~{admin/sidebar :: sidebar}"></nav>
 
         <main class="col-sm-9 ml-sm-auto col-md-10 p-5" role="main">
             <h1>Events
@@ -45,7 +45,7 @@ <h1>Events
                 </a>
             </h1>
 
-            <div th:replace="fragments/messages :: messages"></div>
+            <div th:replace="~{fragments/messages :: messages}"></div>
 
             <div class="table-responsive">
                 <table id="eventTable" class="table table-striped">
diff --git a/src/main/resources/templates/admin/events/overview.html b/src/main/resources/templates/admin/events/overview.html
index 81d4b792..14fdf099 100644
--- a/src/main/resources/templates/admin/events/overview.html
+++ b/src/main/resources/templates/admin/events/overview.html
@@ -33,17 +33,17 @@
 </head>
 
 <body>
-<nav th:replace="fragments/header :: header"></nav>
+<nav th:replace="~{fragments/header :: header}"></nav>
 
 <!--/*@thymesVar id="event" type="ch.wisv.events.core.model.event.Event"*/-->
 <div class="container-fluid">
     <div class="row">
-        <nav th:replace="admin/sidebar :: sidebar"></nav>
+        <nav th:replace="~{admin/sidebar :: sidebar}"></nav>
 
         <main class="col-sm-9 ml-sm-auto col-md-10 p-5" role="main">
             <h1>Ticket [[${event.getTitle()}]]</h1>
 
-            <div th:replace="fragments/messages :: messages"></div>
+            <div th:replace="~{fragments/messages :: messages}"></div>
 
             <div class="row mb-4">
                 <div class="col-auto">
diff --git a/src/main/resources/templates/admin/events/view.html b/src/main/resources/templates/admin/events/view.html
index cc238b51..f27db91a 100644
--- a/src/main/resources/templates/admin/events/view.html
+++ b/src/main/resources/templates/admin/events/view.html
@@ -35,12 +35,12 @@
 </head>
 
 <body>
-<nav th:replace="fragments/header :: header"></nav>
+<nav th:replace="~{fragments/header :: header}"></nav>
 
 <!--/*@thymesVar id="event" type="ch.wisv.events.core.model.event.Event"*/-->
 <div class="container-fluid">
     <div class="row">
-        <nav th:replace="admin/sidebar :: sidebar"></nav>
+        <nav th:replace="~{admin/sidebar :: sidebar}"></nav>
 
         <main class="col-sm-9 ml-sm-auto col-md-10 p-5" role="main">
             <h1>[[${event.getTitle()}]]
@@ -49,7 +49,7 @@ <h1>[[${event.getTitle()}]]
                 </a>
             </h1>
 
-            <div th:replace="fragments/messages :: messages"></div>
+            <div th:replace="~{fragments/messages :: messages}"></div>
 
             <div class="row">
                 <div class="col">
diff --git a/src/main/resources/templates/admin/index.html b/src/main/resources/templates/admin/index.html
index 3b9442e9..abf625af 100644
--- a/src/main/resources/templates/admin/index.html
+++ b/src/main/resources/templates/admin/index.html
@@ -32,12 +32,12 @@
 </head>
 
 <body>
-<nav th:replace="fragments/header :: header"></nav>
+<nav th:replace="~{fragments/header :: header}"></nav>
 
 <!--/*@thymesVar id="webhook" type="ch.wisv.events.core.model.webhook.Webhook"*/-->
 <div class="container-fluid">
     <div class="row">
-        <nav th:replace="admin/sidebar :: sidebar"></nav>
+        <nav th:replace="~{admin/sidebar :: sidebar}"></nav>
 
         <main class="col-sm-9 ml-sm-auto col-md-10 p-5" role="main">
             <h1>Overview</h1>
diff --git a/src/main/resources/templates/admin/orders/index.html b/src/main/resources/templates/admin/orders/index.html
index bacca124..bc1dd187 100644
--- a/src/main/resources/templates/admin/orders/index.html
+++ b/src/main/resources/templates/admin/orders/index.html
@@ -32,16 +32,16 @@
 </head>
 
 <body>
-<nav th:replace="fragments/header :: header"></nav>
+<nav th:replace="~{fragments/header :: header}"></nav>
 
 <div class="container-fluid">
     <div class="row">
-        <nav th:replace="admin/sidebar :: sidebar"></nav>
+        <nav th:replace="~{admin/sidebar :: sidebar}"></nav>
 
         <main class="col-sm-9 ml-sm-auto col-md-10 p-5" role="main">
             <h1>Orders</h1>
 
-            <div th:replace="fragments/messages :: messages"></div>
+            <div th:replace="~{fragments/messages :: messages}"></div>
 
             <div class="table-responsive">
                 <table id="orderTable" class="table table-striped">
diff --git a/src/main/resources/templates/admin/orders/view.html b/src/main/resources/templates/admin/orders/view.html
index 809ae90a..ceafb55b 100644
--- a/src/main/resources/templates/admin/orders/view.html
+++ b/src/main/resources/templates/admin/orders/view.html
@@ -32,16 +32,16 @@
 </head>
 
 <body>
-<nav th:replace="fragments/header :: header"></nav>
+<nav th:replace="~{fragments/header :: header}"></nav>
 
 <div class="container-fluid">
     <div class="row">
-        <nav th:replace="admin/sidebar :: sidebar"></nav>
+        <nav th:replace="~{admin/sidebar :: sidebar}"></nav>
 
         <main class="col-sm-9 ml-sm-auto col-md-10 p-5" role="main">
             <h1>Order #[[${order.getId()}]]</h1>
 
-            <div th:replace="fragments/messages :: messages"></div>
+            <div th:replace="~{fragments/messages :: messages}"></div>
 
             <div class="row" th:if="${order.getStatus() == T(ch.wisv.events.core.model.order.OrderStatus).RESERVATION}">
                 <div class="col">
diff --git a/src/main/resources/templates/admin/products/index.html b/src/main/resources/templates/admin/products/index.html
index e93a883c..3773134c 100644
--- a/src/main/resources/templates/admin/products/index.html
+++ b/src/main/resources/templates/admin/products/index.html
@@ -32,12 +32,12 @@
 </head>
 
 <body>
-<nav th:replace="fragments/header :: header"></nav>
+<nav th:replace="~{fragments/header :: header}"></nav>
 
 <!--/*@thymesVar id="product" type="ch.wisv.events.core.model.product.Product"*/-->
 <div class="container-fluid">
     <div class="row">
-        <nav th:replace="admin/sidebar :: sidebar"></nav>
+        <nav th:replace="~{admin/sidebar :: sidebar}"></nav>
 
         <main class="col-sm-9 ml-sm-auto col-md-10 p-5" role="main">
             <h1>Products
@@ -46,7 +46,7 @@ <h1>Products
                 </a>
             </h1>
 
-            <div th:replace="fragments/messages :: messages"></div>
+            <div th:replace="~{fragments/messages :: messages}"></div>
 
             <div class="table-responsive">
                 <table class="table table-striped" id="productTable">
diff --git a/src/main/resources/templates/admin/products/overview.html b/src/main/resources/templates/admin/products/overview.html
index 3913e87f..bac1b22f 100644
--- a/src/main/resources/templates/admin/products/overview.html
+++ b/src/main/resources/templates/admin/products/overview.html
@@ -33,17 +33,17 @@
 </head>
 
 <body>
-<nav th:replace="fragments/header :: header"></nav>
+<nav th:replace="~{fragments/header :: header}"></nav>
 
 <!--/*@thymesVar id="product" type="ch.wisv.events.core.model.product.Product"*/-->
 <div class="container-fluid">
     <div class="row">
-        <nav th:replace="admin/sidebar :: sidebar"></nav>
+        <nav th:replace="~{admin/sidebar :: sidebar}"></nav>
 
         <main class="col-sm-9 ml-sm-auto col-md-10 p-5" role="main">
             <h1>Sold ticket [[${product.getTitle()}]]</h1>
 
-            <div th:replace="fragments/messages :: messages"></div>
+            <div th:replace="~{fragments/messages :: messages}"></div>
 
             <div class="table-responsive">
                 <table id="soldProductTable" class="table table-hover">
diff --git a/src/main/resources/templates/admin/products/product.html b/src/main/resources/templates/admin/products/product.html
index 162ad210..487ee726 100644
--- a/src/main/resources/templates/admin/products/product.html
+++ b/src/main/resources/templates/admin/products/product.html
@@ -33,12 +33,12 @@
 </head>
 
 <body>
-<nav th:replace="fragments/header :: header"></nav>
+<nav th:replace="~{fragments/header :: header}"></nav>
 
 <!--/*@thymesVar id="product" type="ch.wisv.events.core.model.product.Product"*/-->
 <div class="container-fluid">
     <div class="row">
-        <nav th:replace="admin/sidebar :: sidebar"></nav>
+        <nav th:replace="~{admin/sidebar :: sidebar}"></nav>
 
         <main class="col-sm-9 ml-sm-auto col-md-10 p-5" role="main">
             <h1>Create/update product
@@ -59,7 +59,7 @@ <h4 class="dropdown-header">Select a template</h4>
                 </div>
             </h1>
 
-            <div th:replace="fragments/messages :: messages"></div>
+            <div th:replace="~{fragments/messages :: messages}"></div>
 
             <form th:action="@{./}" th:object="${product}" method="POST">
                 <input type="hidden" th:field="*{key}" th:value="*{key}">
diff --git a/src/main/resources/templates/admin/products/view.html b/src/main/resources/templates/admin/products/view.html
index 738947b7..75149a62 100644
--- a/src/main/resources/templates/admin/products/view.html
+++ b/src/main/resources/templates/admin/products/view.html
@@ -32,12 +32,12 @@
 </head>
 
 <body>
-<nav th:replace="fragments/header :: header"></nav>
+<nav th:replace="~{fragments/header :: header}"></nav>
 
 <!--/*@thymesVar id="product" type="ch.wisv.events.core.model.product.Product"*/-->
 <div class="container-fluid">
     <div class="row">
-        <nav th:replace="admin/sidebar :: sidebar"></nav>
+        <nav th:replace="~{admin/sidebar :: sidebar}"></nav>
 
         <main class="col-sm-9 ml-sm-auto col-md-10 p-5" role="main">
             <h1>[[${product.getTitle()}]]
@@ -46,7 +46,7 @@ <h1>[[${product.getTitle()}]]
                 </a>
             </h1>
 
-            <div th:replace="fragments/messages :: messages"></div>
+            <div th:replace="~{fragments/messages :: messages}"></div>
 
             <div class="row">
                 <div class="col">
diff --git a/src/main/resources/templates/admin/salesexport/index.html b/src/main/resources/templates/admin/salesexport/index.html
index ce0bc076..b28412ff 100644
--- a/src/main/resources/templates/admin/salesexport/index.html
+++ b/src/main/resources/templates/admin/salesexport/index.html
@@ -72,11 +72,11 @@
   </head>
 
   <body>
-    <nav th:replace="fragments/header :: header"></nav>
+    <nav th:replace="~{fragments/header :: header}"></nav>
 
     <div class="container-fluid">
       <div class="row">
-        <nav th:replace="admin/sidebar :: sidebar"></nav>
+        <nav th:replace="~{admin/sidebar :: sidebar}"></nav>
 
         <main class="col-sm-9 ml-sm-auto col-md-10 p-5" role="main">
           <h1>
@@ -85,7 +85,7 @@ <h1>
               Old Treasurer Tab
             </a>
           </h1>
-          <div th:replace="fragments/messages :: messages"></div>
+          <div th:replace="~{fragments/messages :: messages}"></div>
           <form
             th:action="@{./csv}"
             th:object="${SalesExportSubmission}"
diff --git a/src/main/resources/templates/admin/sidebar.html b/src/main/resources/templates/admin/sidebar.html
index 28b7e251..a90860f4 100644
--- a/src/main/resources/templates/admin/sidebar.html
+++ b/src/main/resources/templates/admin/sidebar.html
@@ -6,56 +6,48 @@
 <nav class="col-sm-3 col-md-2 d-none d-sm-block sidebar" th:fragment="sidebar">
     <ul class="nav nav-pills flex-column">
         <li class="nav-item">
-            <a th:href="@{/administrator/}" class="nav-link"
-               th:classappend="${#httpServletRequest.getRequestURI() == '/administrator/' ? 'active':''}">
+            <a th:href="@{/administrator/}" class="nav-link">
                 <i class="fas fa-tachometer-alt fa-fw" aria-hidden="true"></i> Overview
             </a>
         </li>
     </ul>
     <ul class="nav nav-pills flex-column">
         <li class="nav-item">
-            <a th:href="@{/administrator/events/}" class="nav-link"
-               th:classappend="${#httpServletRequest.getRequestURI().contains('/administrator/events/') ? 'active':''}">
+            <a th:href="@{/administrator/events/}" class="nav-link">
                 <i class="fa fa-calendar fa-fw" aria-hidden="true"></i> Events
             </a>
         </li>
         <li class="nav-item">
-            <a th:href="@{/administrator/products/}" class="nav-link"
-               th:classappend="${#httpServletRequest.getRequestURI().contains('/administrator/products/') ? 'active':''}">
+            <a th:href="@{/administrator/products/}" class="nav-link">
                 <i class="fas fa-ticket-alt fa-fw" aria-hidden="true"></i> Products
             </a>
         </li>
     </ul>
     <ul class="nav nav-pills flex-column">
         <li class="nav-item">
-            <a th:href="@{/administrator/orders/}" class="nav-link"
-               th:classappend="${#httpServletRequest.getRequestURI().contains('/administrator/orders/') ? 'active':''}">
+            <a th:href="@{/administrator/orders/}" class="nav-link">
                 <i class="fa fa-shopping-cart fa-fw" aria-hidden="true"></i> Orders
             </a>
         </li>
         <li class="nav-item">
-            <a th:href="@{/administrator/customers/}" class="nav-link"
-               th:classappend="${#httpServletRequest.getRequestURI().contains('/administrator/customers/') ?  'active':''}">
+            <a th:href="@{/administrator/customers/}" class="nav-link">
                 <i class="fa fa-users fa-fw" aria-hidden="true"></i> Customers
             </a>
         </li>
     </ul>
     <ul class="nav nav-pills flex-column">
         <li class="nav-item">
-            <a th:href="@{/administrator/webhooks/}" class="nav-link"
-               th:classappend="${#httpServletRequest.getRequestURI().contains('/administrator/webhooks/') ? 'active':''}">
+            <a th:href="@{/administrator/webhooks/}" class="nav-link">
                 <i class="fa fa-globe fa-fw" aria-hidden="true"></i> Webhooks
             </a>
-            <a th:href="@{/administrator/tasks/}" class="nav-link"
-               th:classappend="${#httpServletRequest.getRequestURI().contains('/administrator/tasks/') ? 'active':''}">
+            <a th:href="@{/administrator/tasks/}" class="nav-link">
                 <i class="fa fa-list fa-fw" aria-hidden="true"></i> Tasks
             </a>
         </li>
     </ul>
     <ul class="nav nav-pills flex-column">
         <li class="nav-item">
-            <a th:href="@{/administrator/salesexport/}" class="nav-link"
-               th:classappend="${#httpServletRequest.getRequestURI().contains('/administrator/salesexport/') ? 'active':''}">
+            <a th:href="@{/administrator/salesexport/}" class="nav-link">
                 <i class="far fa-money-bill-alt fa-fw" aria-hidden="true"></i> Sales Export
             </a>
         </li>
diff --git a/src/main/resources/templates/admin/tasks/index.html b/src/main/resources/templates/admin/tasks/index.html
index 26c4b126..adc403f6 100644
--- a/src/main/resources/templates/admin/tasks/index.html
+++ b/src/main/resources/templates/admin/tasks/index.html
@@ -32,16 +32,16 @@
 </head>
 
 <body>
-<nav th:replace="fragments/header :: header"></nav>
+<nav th:replace="~{fragments/header :: header}"></nav>
 
 <div class="container-fluid">
     <div class="row">
-        <nav th:replace="admin/sidebar :: sidebar"></nav>
+        <nav th:replace="~{admin/sidebar :: sidebar}"></nav>
 
         <main class="col-sm-9 ml-sm-auto col-md-10 p-5" role="main">
             <h1>Pending tasks</h1>
 
-            <div th:replace="fragments/messages :: messages"></div>
+            <div th:replace="~{fragments/messages :: messages}"></div>
 
             <div class="table-responsive">
                 <table id="webhookTable" class="table table-striped">
diff --git a/src/main/resources/templates/admin/treasurer/index.html b/src/main/resources/templates/admin/treasurer/index.html
index 95f26b19..3ec50a7b 100644
--- a/src/main/resources/templates/admin/treasurer/index.html
+++ b/src/main/resources/templates/admin/treasurer/index.html
@@ -32,16 +32,16 @@
 </head>
 
 <body>
-<nav th:replace="fragments/header :: header"></nav>
+<nav th:replace="~{fragments/header :: header}"></nav>
 
 <div class="container-fluid">
     <div class="row">
-        <nav th:replace="admin/sidebar :: sidebar"></nav>
+        <nav th:replace="~{admin/sidebar :: sidebar}"></nav>
 
         <main class="col-sm-9 ml-sm-auto col-md-10 p-5" role="main">
             <h1>Mollie Overview</h1>
 
-            <div th:replace="fragments/messages :: messages"></div>
+            <div th:replace="~{fragments/messages :: messages}"></div>
 
             <div class="table-responsive">
                 <table id="treasurerOverview" class="table table-striped">
diff --git a/src/main/resources/templates/admin/webhooks/index.html b/src/main/resources/templates/admin/webhooks/index.html
index 9ca42ad2..158b7168 100644
--- a/src/main/resources/templates/admin/webhooks/index.html
+++ b/src/main/resources/templates/admin/webhooks/index.html
@@ -32,11 +32,11 @@
 </head>
 
 <body>
-<nav th:replace="fragments/header :: header"></nav>
+<nav th:replace="~{fragments/header :: header}"></nav>
 
 <div class="container-fluid">
     <div class="row">
-        <nav th:replace="admin/sidebar :: sidebar"></nav>
+        <nav th:replace="~{admin/sidebar :: sidebar}"></nav>
 
         <main class="col-sm-9 ml-sm-auto col-md-10 p-5" role="main">
             <h1>Webhooks
@@ -45,7 +45,7 @@ <h1>Webhooks
                 </a>
             </h1>
 
-            <div th:replace="fragments/messages :: messages"></div>
+            <div th:replace="~{fragments/messages :: messages}"></div>
 
             <div class="table-responsive">
                 <table id="webhookTable" class="table table-striped">
diff --git a/src/main/resources/templates/admin/webhooks/view.html b/src/main/resources/templates/admin/webhooks/view.html
index c2e069e0..90a08133 100644
--- a/src/main/resources/templates/admin/webhooks/view.html
+++ b/src/main/resources/templates/admin/webhooks/view.html
@@ -32,12 +32,12 @@
 </head>
 
 <body>
-<nav th:replace="fragments/header :: header"></nav>
+<nav th:replace="~{fragments/header :: header}"></nav>
 
 <!--/*@thymesVar id="webhook" type="ch.wisv.events.core.model.webhook.Webhook"*/-->
 <div class="container-fluid">
     <div class="row">
-        <nav th:replace="admin/sidebar :: sidebar"></nav>
+        <nav th:replace="~{admin/sidebar :: sidebar}"></nav>
 
         <main class="col-sm-9 ml-sm-auto col-md-10 p-5" role="main">
             <h1>Webhook #[[${webhook.getId()}]]
@@ -46,7 +46,7 @@ <h1>Webhook #[[${webhook.getId()}]]
                 </a>
             </h1>
 
-            <div th:replace="fragments/messages :: messages"></div>
+            <div th:replace="~{fragments/messages :: messages}"></div>
 
             <div class="row">
                 <div class="col">
diff --git a/src/main/resources/templates/admin/webhooks/webhook.html b/src/main/resources/templates/admin/webhooks/webhook.html
index 318083ca..ff6a1bac 100644
--- a/src/main/resources/templates/admin/webhooks/webhook.html
+++ b/src/main/resources/templates/admin/webhooks/webhook.html
@@ -32,17 +32,17 @@
 </head>
 
 <body>
-<nav th:replace="fragments/header :: header"></nav>
+<nav th:replace="~{fragments/header :: header}"></nav>
 
 <!--/*@thymesVar id="webhook" type="ch.wisv.events.core.model.webhook.Webhook"*/-->
 <div class="container-fluid">
     <div class="row">
-        <nav th:replace="admin/sidebar :: sidebar"></nav>
+        <nav th:replace="~{admin/sidebar :: sidebar}"></nav>
 
         <main class="col-sm-9 ml-sm-auto col-md-10 p-5" role="main">
             <h1>Create/update webhook</h1>
 
-            <div th:replace="fragments/messages :: messages"></div>
+            <div th:replace="~{fragments/messages :: messages}"></div>
 
             <form th:action="@{./}" th:object="${webhook}" method="POST">
                 <input type="hidden" th:field="*{key}" th:value="*{key}">
diff --git a/src/main/resources/templates/error.html b/src/main/resources/templates/error.html
index 73e825c4..deb12068 100644
--- a/src/main/resources/templates/error.html
+++ b/src/main/resources/templates/error.html
@@ -32,7 +32,7 @@
 </head>
 
 <body>
-<nav th:replace="fragments/header :: header"></nav>
+<nav th:replace="~{fragments/header :: header}"></nav>
 
 <div class="container-fluid">
     <div class="row">
diff --git a/src/main/resources/templates/index.example.html b/src/main/resources/templates/index.example.html
index a3cff8f9..0db1476e 100644
--- a/src/main/resources/templates/index.example.html
+++ b/src/main/resources/templates/index.example.html
@@ -32,11 +32,11 @@
 </head>
 
 <body>
-<nav th:replace="fragments/header :: header"></nav>
+<nav th:replace="~{fragments/header :: header}"></nav>
 
 <div class="container-fluid">
     <div class="row">
-        <nav th:replace="admin/sidebar :: sidebar"></nav>
+        <nav th:replace="~{admin/sidebar :: sidebar}"></nav>
 
         <main class="col-sm-9 ml-sm-auto col-md-10 p-5" role="main">
             <h1>Example
@@ -45,7 +45,7 @@ <h1>Example
                 </a>
             </h1>
 
-            <div th:replace="fragments/messages :: messages"></div>
+            <div th:replace="~{fragments/messages :: messages}"></div>
         </main>
     </div>
 </div>
diff --git a/src/main/resources/templates/sales/index.html b/src/main/resources/templates/sales/index.html
index 7ea0727f..4a63fbb0 100644
--- a/src/main/resources/templates/sales/index.html
+++ b/src/main/resources/templates/sales/index.html
@@ -30,7 +30,7 @@
 </head>
 
 <body>
-<nav th:replace="sales/fragments/header :: header"></nav>
+<nav th:replace="~{sales/fragments/header :: header}"></nav>
 
 <div class="container-fluid">
 
diff --git a/src/main/resources/templates/sales/scan/barcode/barcode.html b/src/main/resources/templates/sales/scan/barcode/barcode.html
index 9ab4a66a..f1c01038 100644
--- a/src/main/resources/templates/sales/scan/barcode/barcode.html
+++ b/src/main/resources/templates/sales/scan/barcode/barcode.html
@@ -32,7 +32,7 @@
 
 <body style="width: calc(100vw); height: calc(100vh); background-color: #ffffff">
 
-<nav th:replace="fragments/header :: header"></nav>
+<nav th:replace="~{fragments/header :: header}"></nav>
 
 <!--/*@thymesVar id="ticket" type="ch.wisv.events.core.model.ticket.Ticket"*/-->
 <div class="container-fluid py-2 text-white" style="height: calc(100vh - .5rem);">
diff --git a/src/main/resources/templates/sales/scan/event/barcode.html b/src/main/resources/templates/sales/scan/event/barcode.html
index 1508ab52..5aa5a632 100644
--- a/src/main/resources/templates/sales/scan/event/barcode.html
+++ b/src/main/resources/templates/sales/scan/event/barcode.html
@@ -87,7 +87,7 @@
 </head>
 
 <body id="scanPage">
-<nav th:replace="fragments/header :: header"></nav>
+<nav th:replace="~{fragments/header :: header}"></nav>
 
 
 <div class="overlay">
diff --git a/src/main/resources/templates/sales/scan/event/code.html b/src/main/resources/templates/sales/scan/event/code.html
index 78bf24ed..db186f01 100644
--- a/src/main/resources/templates/sales/scan/event/code.html
+++ b/src/main/resources/templates/sales/scan/event/code.html
@@ -45,13 +45,13 @@
 </head>
 
 <body id="scanPage">
-<nav th:replace="fragments/header :: header"></nav>
+<nav th:replace="~{fragments/header :: header}"></nav>
 
 
 <div class="container-fluid">
     <div class="row pt-5">
         <main class="col-12" role="main">
-            <div th:replace="fragments/messages :: messages"></div>
+            <div th:replace="~{fragments/messages :: messages}"></div>
 
             <div class="row text-center">
                 <h3 class="w-100 mb-5" th:text="${event.getTitle()}"></h3>
diff --git a/src/main/resources/templates/sales/scan/event/qrcode.html b/src/main/resources/templates/sales/scan/event/qrcode.html
index 7bf366c3..14ac3136 100644
--- a/src/main/resources/templates/sales/scan/event/qrcode.html
+++ b/src/main/resources/templates/sales/scan/event/qrcode.html
@@ -63,7 +63,7 @@
 </head>
 
 <body id="scanPage">
-<nav th:replace="fragments/header :: header"></nav>
+<nav th:replace="~{fragments/header :: header}"></nav>
 
 <div th:if="${error}" class="alert alert-dismissible fade show alert-danger w-100" role="alert">
     <span class="fa fa-exclamation" aria-hidden="true"></span>
diff --git a/src/main/resources/templates/sales/scan/index.html b/src/main/resources/templates/sales/scan/index.html
index 719c6bff..bd1c3b1b 100644
--- a/src/main/resources/templates/sales/scan/index.html
+++ b/src/main/resources/templates/sales/scan/index.html
@@ -32,12 +32,12 @@
 </head>
 
 <body>
-<nav th:replace="fragments/header :: header"></nav>
+<nav th:replace="~{fragments/header :: header}"></nav>
 
 <div class="container-fluid">
     <div class="row">
         <main class="col-12 ml-auto p-5" role="main">
-            <div th:replace="fragments/messages :: messages"></div>
+            <div th:replace="~{fragments/messages :: messages}"></div>
 
             <div class="row mb-4">
                 <div class="col">
diff --git a/src/main/resources/templates/sales/sell/customer/create.html b/src/main/resources/templates/sales/sell/customer/create.html
index 68966a21..4b4637c6 100644
--- a/src/main/resources/templates/sales/sell/customer/create.html
+++ b/src/main/resources/templates/sales/sell/customer/create.html
@@ -29,12 +29,12 @@
 </head>
 
 <body id="scanPage">
-<nav th:replace="sales/fragments/header :: header"></nav>
+<nav th:replace="~{sales/fragments/header :: header}"></nav>
 
 <div class="container-fluid">
     <div class="row">
         <main class="col-12" role="main">
-            <div th:replace="fragments/messages :: messages"></div>
+            <div th:replace="~{fragments/messages :: messages}"></div>
 
             <!--/*@thymesVar id="customer" type="ch.wisv.events.core.model.customer.Customer"*/-->
             <form th:action="@{'/sales/sell/customer/' + ${order.getPublicReference()}}" th:object="${customer}"
diff --git a/src/main/resources/templates/sales/sell/customer/rfid.html b/src/main/resources/templates/sales/sell/customer/rfid.html
index 4ff535d7..9cd7582a 100644
--- a/src/main/resources/templates/sales/sell/customer/rfid.html
+++ b/src/main/resources/templates/sales/sell/customer/rfid.html
@@ -32,12 +32,12 @@
 </head>
 
 <body id="scanPage">
-<nav th:replace="sales/fragments/header :: header"></nav>
+<nav th:replace="~{sales/fragments/header :: header}"></nav>
 
 <div class="container-fluid">
     <div class="row">
         <main class="col-12" role="main">
-            <div th:replace="fragments/messages :: messages"></div>
+            <div th:replace="~{fragments/messages :: messages}"></div>
 
             <!--/*@thymesVar id="customer" type="ch.wisv.events.core.model.customer.Customer"*/-->
             <!--/*@thymesVar id="order" type="ch.wisv.events.core.model.order.Order"*/-->
diff --git a/src/main/resources/templates/sales/sell/index.html b/src/main/resources/templates/sales/sell/index.html
index d8e652be..80431ea0 100644
--- a/src/main/resources/templates/sales/sell/index.html
+++ b/src/main/resources/templates/sales/sell/index.html
@@ -31,14 +31,14 @@
 </head>
 
 <body>
-<nav th:replace="sales/fragments/header :: header"></nav>
+<nav th:replace="~{sales/fragments/header :: header}"></nav>
 
 <!--/*@thymesVar id="product" type="ch.wisv.events.core.model.product.Product"*/-->
 <div class="container-fluid">
 
     <div class="row">
         <main class="col-12" role="main">
-            <div th:replace="fragments/messages :: messages"></div>
+            <div th:replace="~{fragments/messages :: messages}"></div>
 
             <form class="form w-100" id="orderForm" th:action="@{/sales/sell/}" method="POST">
                 <div class="row justify-content-center">
diff --git a/src/main/resources/templates/sales/sell/order/cancelled.html b/src/main/resources/templates/sales/sell/order/cancelled.html
index cc9b3ae7..1ea60df9 100644
--- a/src/main/resources/templates/sales/sell/order/cancelled.html
+++ b/src/main/resources/templates/sales/sell/order/cancelled.html
@@ -31,12 +31,12 @@
 </head>
 
 <body>
-<nav th:replace="sales/fragments/header :: header"></nav>
+<nav th:replace="~{sales/fragments/header :: header}"></nav>
 
 <div class="container-fluid">
     <div class="row">
         <main class="col-12 ml-auto p-5" role="main">
-            <div th:replace="fragments/messages :: messages"></div>
+            <div th:replace="~{fragments/messages :: messages}"></div>
 
             <div class="row">
                 <div class="col text-center mt-5">
diff --git a/src/main/resources/templates/sales/sell/order/complete.html b/src/main/resources/templates/sales/sell/order/complete.html
index 1f7a473b..34ecf46e 100644
--- a/src/main/resources/templates/sales/sell/order/complete.html
+++ b/src/main/resources/templates/sales/sell/order/complete.html
@@ -31,12 +31,12 @@
 </head>
 
 <body>
-<nav th:replace="sales/fragments/header :: header"></nav>
+<nav th:replace="~{sales/fragments/header :: header}"></nav>
 
 <div class="container-fluid">
     <div class="row">
         <main class="col-12 ml-auto p-5" role="main">
-            <div th:replace="fragments/messages :: messages"></div>
+            <div th:replace="~{fragments/messages :: messages}"></div>
 
             <div class="row">
                 <div class="col text-center mt-5">
diff --git a/src/main/resources/templates/sales/sell/order/index.html b/src/main/resources/templates/sales/sell/order/index.html
index 40c95b27..86bc14db 100644
--- a/src/main/resources/templates/sales/sell/order/index.html
+++ b/src/main/resources/templates/sales/sell/order/index.html
@@ -32,13 +32,13 @@
 </head>
 
 <body id="scanPage">
-<nav th:replace="sales/fragments/header :: header"></nav>
+<nav th:replace="~{sales/fragments/header :: header}"></nav>
 
 <div class="container-fluid">
 
     <div class="row">
         <main class="col-12" role="main">
-            <div th:replace="fragments/messages :: messages"></div>
+            <div th:replace="~{fragments/messages :: messages}"></div>
 
             <!--/*@thymesVar id="order" type="ch.wisv.events.core.model.order.Order"*/-->
             <div class="row">
diff --git a/src/main/resources/templates/sales/stats/event/index.html b/src/main/resources/templates/sales/stats/event/index.html
index 016c3adb..e2784e89 100644
--- a/src/main/resources/templates/sales/stats/event/index.html
+++ b/src/main/resources/templates/sales/stats/event/index.html
@@ -31,13 +31,13 @@
 </head>
 
 <body style="width: calc(100vw); height: calc(100vh)">
-<nav th:replace="fragments/header :: header"></nav>
+<nav th:replace="~{fragments/header :: header}"></nav>
 <!--/*@thymesVar id="event" type="ch.wisv.events.core.model.event.Event"*/-->
 <!--/*@thymesVar id="moneyEarned" type="java.lang.Double"*/-->
 <!--/*@thymesVar id="ticketsSold" type="java.lang.Integer"*/-->
 <div class="container-fluid">
     <div class="row">
-        <nav th:replace="sales/stats/sidebar :: sidebar"></nav>
+        <nav th:replace="~{sales/stats/sidebar :: sidebar}"></nav>
         <main class="col-sm-9 ml-sm-auto col-md-10 p-5" role="main">
             <h1 th:text="${event.getTitle()}"/>
             <div class="row">
diff --git a/src/main/resources/templates/sales/stats/index.html b/src/main/resources/templates/sales/stats/index.html
index 806fe2c0..a81c83e9 100644
--- a/src/main/resources/templates/sales/stats/index.html
+++ b/src/main/resources/templates/sales/stats/index.html
@@ -32,11 +32,11 @@
 </head>
 
 <body>
-<nav th:replace="fragments/header :: header"></nav>
+<nav th:replace="~{fragments/header :: header}"></nav>
 <div class="container-fluid">
     <div class="row">
         <main class="col-12 ml-auto p-5" role="main">
-            <div th:replace="fragments/messages :: messages"></div>
+            <div th:replace="~{fragments/messages :: messages}"></div>
 
             <div class="row mb-4">
                 <div class="col">
diff --git a/src/main/resources/templates/sales/stats/products/index.html b/src/main/resources/templates/sales/stats/products/index.html
index 38c36682..efc69da4 100644
--- a/src/main/resources/templates/sales/stats/products/index.html
+++ b/src/main/resources/templates/sales/stats/products/index.html
@@ -31,10 +31,10 @@
 </head>
 
 <body style="width: calc(100vw); height: calc(100vh)">
-<nav th:replace="fragments/header :: header"></nav>
+<nav th:replace="~{fragments/header :: header}"></nav>
 <div class="container-fluid">
     <div class="row">
-        <nav th:replace="sales/stats/sidebar :: sidebar"></nav>
+        <nav th:replace="~{sales/stats/sidebar :: sidebar}"></nav>
         <main class="col-sm-9 ml-sm-auto col-md-10 p-5" role="main">
             <div class="row" th:each="product : ${products}">
                 <div class="col">
diff --git a/src/main/resources/templates/sales/stats/sidebar.html b/src/main/resources/templates/sales/stats/sidebar.html
index 70b0ba33..24f61331 100644
--- a/src/main/resources/templates/sales/stats/sidebar.html
+++ b/src/main/resources/templates/sales/stats/sidebar.html
@@ -7,14 +7,12 @@
 <nav class="col-sm-3 col-md-2 d-none d-sm-block sidebar" th:fragment="sidebar">
     <ul class="nav nav-pills flex-column">
         <li class="nav-item">
-            <a th:href="@{'/sales/stats/event/' + ${key}}" class="nav-link"
-               th:classappend="${#httpServletRequest.getRequestURI().contains('/sales/stats/event/') ? 'active':''}">
+            <a th:href="@{'/sales/stats/event/' + ${key}}" class="nav-link">
                 <i class="fa fa-calendar fa-fw" aria-hidden="true"></i> Event
             </a>
         </li>
         <li class="nav-item">
-            <a th:href="@{'/sales/stats/products/'+${key}}" class="nav-link"
-               th:classappend="${#httpServletRequest.getRequestURI().contains('/sales/stats/product/') ? 'active':''}">
+            <a th:href="@{'/sales/stats/products/'+${key}}" class="nav-link">
                 <i class="fas fa-ticket-alt fa-fw" aria-hidden="true"></i> Products
             </a>
         </li>
diff --git a/src/main/resources/templates/webshop/checkout/create.html b/src/main/resources/templates/webshop/checkout/create.html
index c093c1b2..1a579839 100644
--- a/src/main/resources/templates/webshop/checkout/create.html
+++ b/src/main/resources/templates/webshop/checkout/create.html
@@ -33,12 +33,12 @@
 </head>
 
 <body>
-<nav th:replace="webshop/fragments/header :: header ('Checkout as guest', 'events_header.jpg')"></nav>
+<nav th:replace="~{webshop/fragments/header :: header ('Checkout as guest', 'events_header.jpg')}"></nav>
 
 <div class="container">
     <div class="row">
         <main class="col py-5" role="main">
-            <div th:replace="fragments/messages :: messages"></div>
+            <div th:replace="~{fragments/messages :: messages}"></div>
 
             <div class="row">
                 <div class="col">
diff --git a/src/main/resources/templates/webshop/checkout/customer.html b/src/main/resources/templates/webshop/checkout/customer.html
index 2ff8b9e3..8116fc53 100644
--- a/src/main/resources/templates/webshop/checkout/customer.html
+++ b/src/main/resources/templates/webshop/checkout/customer.html
@@ -33,12 +33,12 @@
 </head>
 
 <body>
-<nav th:replace="webshop/fragments/header :: header ('Checkout', 'events_header.jpg')"></nav>
+<nav th:replace="~{webshop/fragments/header :: header ('Checkout', 'events_header.jpg')}"></nav>
 
 <div class="container">
     <div class="row">
         <main class="col py-5" role="main">
-            <div th:replace="fragments/messages :: messages"></div>
+            <div th:replace="~{fragments/messages :: messages}"></div>
 
             <div class="row">
                 <div class="col-12 col-md-5">
diff --git a/src/main/resources/templates/webshop/checkout/index.html b/src/main/resources/templates/webshop/checkout/index.html
index 5cd5bb97..8f087bf3 100644
--- a/src/main/resources/templates/webshop/checkout/index.html
+++ b/src/main/resources/templates/webshop/checkout/index.html
@@ -33,12 +33,12 @@
 </head>
 
 <body>
-<nav th:replace="webshop/fragments/header :: header ('Checkout', 'events_header.jpg')"></nav>
+<nav th:replace="~{webshop/fragments/header :: header ('Checkout', 'events_header.jpg')}"></nav>
 
 <div class="container">
     <div class="row">
         <main class="col py-3" role="main">
-            <div th:replace="fragments/messages :: messages"></div>
+            <div th:replace="~{fragments/messages :: messages}"></div>
 
             <div class="row">
                 <div class="col my-4">
diff --git a/src/main/resources/templates/webshop/complete.html b/src/main/resources/templates/webshop/complete.html
index 188a79bc..08a0150a 100644
--- a/src/main/resources/templates/webshop/complete.html
+++ b/src/main/resources/templates/webshop/complete.html
@@ -35,22 +35,22 @@
 <body>
 
 <div th:if="${order.getStatus() == T(ch.wisv.events.core.model.order.OrderStatus).PAID}">
-    <nav th:replace="tickets/fragments/header :: header ('Thanks for ordering!', 'events_header.jpg')"></nav>
+    <nav th:replace="~{tickets/fragments/header :: header ('Thanks for ordering!', 'events_header.jpg')}"></nav>
 </div>
 
 <div th:if="${order.getStatus() == T(ch.wisv.events.core.model.order.OrderStatus).PENDING}">
-    <nav th:replace="tickets/fragments/header :: header ('Waiting for the payment', 'events_header.jpg')"></nav>
+    <nav th:replace="~{tickets/fragments/header :: header ('Waiting for the payment', 'events_header.jpg')}"></nav>
 </div>
 
 <div th:if="${order.getStatus() == T(ch.wisv.events.core.model.order.OrderStatus).CANCELLED}">
-    <nav th:replace="tickets/fragments/header :: header ('Order cancelled', 'events_header.jpg')"></nav>
+    <nav th:replace="~{tickets/fragments/header :: header ('Order cancelled', 'events_header.jpg')}"></nav>
 </div>
 
 
 <div class="container-fluid">
     <div class="row">
         <main class="col p-5" role="main">
-            <div th:replace="fragments/messages :: messages"></div>
+            <div th:replace="~{fragments/messages :: messages}"></div>
 
             <div class="row justify-content-center">
                 <div class="col-12 col-md-6 text-center"
diff --git a/src/main/resources/templates/webshop/event.html b/src/main/resources/templates/webshop/event.html
index 5bfd59f4..e6e9f61b 100644
--- a/src/main/resources/templates/webshop/event.html
+++ b/src/main/resources/templates/webshop/event.html
@@ -108,7 +108,7 @@ <h1 class="mb-3" th:text="${event.getTitle()}"></h1>
                 </div>
             </div>
 
-            <div th:replace="fragments/messages :: messages"></div>
+            <div th:replace="~{fragments/messages :: messages}"></div>
 
             <div class="card-deck" th:if="${!event.hasExternalProductUrl()}">
                 <div class="card mb-3" th:each="product : ${event.getProducts()}">
diff --git a/src/main/resources/templates/webshop/index.html b/src/main/resources/templates/webshop/index.html
index f7305df3..c3b8c5eb 100644
--- a/src/main/resources/templates/webshop/index.html
+++ b/src/main/resources/templates/webshop/index.html
@@ -33,7 +33,7 @@
 </head>
 
 <body>
-<nav th:replace="webshop/fragments/header :: header ('Webshop', 'events_header.jpg')"></nav>
+<nav th:replace="~{webshop/fragments/header :: header ('Webshop', 'events_header.jpg')}"></nav>
 
 <div class="container-fluid">
     <div class="row">
@@ -48,7 +48,7 @@
                 </div>
             </div>
 
-            <div th:replace="fragments/messages :: messages"></div>
+            <div th:replace="~{fragments/messages :: messages}"></div>
 
             <div class="row justify-content-left">
                 <!--/*@thymesVar id="event" type="ch.wisv.events.core.model.event.Event"*/-->
diff --git a/src/main/resources/templates/webshop/overview/index.html b/src/main/resources/templates/webshop/overview/index.html
index b500374b..76ce45ba 100644
--- a/src/main/resources/templates/webshop/overview/index.html
+++ b/src/main/resources/templates/webshop/overview/index.html
@@ -33,7 +33,7 @@
 </head>
 
 <body>
-<nav th:replace="webshop/fragments/header :: header ('my events', 'events_header.jpg')"></nav>
+<nav th:replace="~{webshop/fragments/header :: header ('my events', 'events_header.jpg')}"></nav>
 
 <div class="container-fluid">
     <div class="row pt-5">
@@ -43,7 +43,7 @@
             </a>
         </div>
     </div>
-    <div th:replace="fragments/messages :: messages"></div>
+    <div th:replace="~{fragments/messages :: messages}"></div>
 
     <div class="row">
         <div class="col-12 col-lg-3 mb-5">
diff --git a/src/main/resources/templates/webshop/payment/index.html b/src/main/resources/templates/webshop/payment/index.html
index 6f10afd1..710d3922 100644
--- a/src/main/resources/templates/webshop/payment/index.html
+++ b/src/main/resources/templates/webshop/payment/index.html
@@ -33,12 +33,12 @@
 </head>
 
 <body>
-<nav th:replace="webshop/fragments/header :: header ('Checkout', 'events_header.jpg')"></nav>
+<nav th:replace="~{webshop/fragments/header :: header ('Checkout', 'events_header.jpg')}"></nav>
 
 <div class="container">
     <div class="row">
         <main class="col py-5" role="main">
-            <div th:replace="fragments/messages :: messages"></div>
+            <div th:replace="~{fragments/messages :: messages}"></div>
 
             <div class="row mb-5">
                 <div class="col-12">
diff --git a/src/main/resources/templates/webshop/return/cancelled.html b/src/main/resources/templates/webshop/return/cancelled.html
index 9ddd59aa..d319d6e1 100644
--- a/src/main/resources/templates/webshop/return/cancelled.html
+++ b/src/main/resources/templates/webshop/return/cancelled.html
@@ -33,12 +33,13 @@
 </head>
 
 <body>
-<nav th:replace="webshop/fragments/header :: header ('Order has been cancelled!', 'events_order-cancelled-owl.jpg')"></nav>
+<nav
+        th:replace="~{webshop/fragments/header :: header ('Order has been cancelled!', 'events_order-cancelled-owl.jpg')}"></nav>
 
 <div class="container">
     <div class="row">
         <main class="col-12 col-lg-8 mx-auto py-5" role="main">
-            <div th:replace="fragments/messages :: messages"></div>
+            <div th:replace="~{fragments/messages :: messages}"></div>
 
             <div class="row">
                 <div class="col my-4">
diff --git a/src/main/resources/templates/webshop/return/error.html b/src/main/resources/templates/webshop/return/error.html
index 3d68c36b..e4b3a3a6 100644
--- a/src/main/resources/templates/webshop/return/error.html
+++ b/src/main/resources/templates/webshop/return/error.html
@@ -33,12 +33,12 @@
 </head>
 
 <body>
-<nav th:replace="webshop/fragments/header :: header ('Something went wrong', 'event_order-error.jpg')"></nav>
+<nav th:replace="~{webshop/fragments/header :: header ('Something went wrong', 'event_order-error.jpg')}"></nav>
 
 <div class="container">
     <div class="row">
         <main class="col-12 col-lg-8 mx-auto py-5" role="main">
-            <div th:replace="fragments/messages :: messages"></div>
+            <div th:replace="~{fragments/messages :: messages}"></div>
 
             <div class="row">
                 <div class="col my-4">
diff --git a/src/main/resources/templates/webshop/return/expired.html b/src/main/resources/templates/webshop/return/expired.html
index b97f91a5..c87630b2 100644
--- a/src/main/resources/templates/webshop/return/expired.html
+++ b/src/main/resources/templates/webshop/return/expired.html
@@ -33,12 +33,12 @@
 </head>
 
 <body>
-<nav th:replace="webshop/fragments/header :: header ('Payment is expired!', 'events_order-error.jpg')"></nav>
+<nav th:replace="~{webshop/fragments/header :: header ('Payment is expired!', 'events_order-error.jpg')}"></nav>
 
 <div class="container">
     <div class="row">
         <main class="col-12 col-lg-8 mx-auto py-5" role="main">
-            <div th:replace="fragments/messages :: messages"></div>
+            <div th:replace="~{fragments/messages :: messages}"></div>
 
             <div class="row">
                 <div class="col my-4">
diff --git a/src/main/resources/templates/webshop/return/pending.html b/src/main/resources/templates/webshop/return/pending.html
index 61f3b4b5..918fe120 100644
--- a/src/main/resources/templates/webshop/return/pending.html
+++ b/src/main/resources/templates/webshop/return/pending.html
@@ -33,12 +33,12 @@
 </head>
 
 <body>
-<nav th:replace="webshop/fragments/header :: header ('Payment pending', 'events_order-pending.jpg')"></nav>
+<nav th:replace="~{webshop/fragments/header :: header ('Payment pending', 'events_order-pending.jpg')}"></nav>
 
 <div class="container">
     <div class="row">
         <main class="col-12 col-lg-8 mx-auto py-5" role="main">
-            <div th:replace="fragments/messages :: messages"></div>
+            <div th:replace="~{fragments/messages :: messages}"></div>
 
             <div class="row">
                 <div class="col my-4  text-center">
diff --git a/src/main/resources/templates/webshop/return/reservation.html b/src/main/resources/templates/webshop/return/reservation.html
index 182a4416..f9d00764 100644
--- a/src/main/resources/templates/webshop/return/reservation.html
+++ b/src/main/resources/templates/webshop/return/reservation.html
@@ -33,12 +33,13 @@
 </head>
 
 <body>
-<nav th:replace="webshop/fragments/header :: header ('Reservation has been made!', 'events_order-reservation.jpg')"></nav>
+<nav
+        th:replace="~{webshop/fragments/header :: header ('Reservation has been made!', 'events_order-reservation.jpg')}"></nav>
 
 <div class="container">
     <div class="row">
         <main class="col-12 col-lg-8 mx-auto py-5" role="main">
-            <div th:replace="fragments/messages :: messages"></div>
+            <div th:replace="~{fragments/messages :: messages}"></div>
 
             <div class="row">
                 <div class="col my-4">
diff --git a/src/main/resources/templates/webshop/return/success.html b/src/main/resources/templates/webshop/return/success.html
index 067b715f..c14eb252 100644
--- a/src/main/resources/templates/webshop/return/success.html
+++ b/src/main/resources/templates/webshop/return/success.html
@@ -33,12 +33,12 @@
 </head>
 
 <body>
-<nav th:replace="webshop/fragments/header :: header ('Thanks for ordering!', 'events_order-complete.jpg')"></nav>
+<nav th:replace="~{webshop/fragments/header :: header ('Thanks for ordering!', 'events_order-complete.jpg')}"></nav>
 
 <div class="container">
     <div class="row">
         <main class="col-12 col-lg-8 mx-auto py-5" role="main">
-            <div th:replace="fragments/messages :: messages"></div>
+            <div th:replace="~{fragments/messages :: messages}"></div>
 
             <div class="row">
                 <div class="col my-4">
diff --git a/src/main/resources/templates/webshop/tickets/transfer.html b/src/main/resources/templates/webshop/tickets/transfer.html
index 949100ac..ae653b1b 100644
--- a/src/main/resources/templates/webshop/tickets/transfer.html
+++ b/src/main/resources/templates/webshop/tickets/transfer.html
@@ -33,7 +33,7 @@
 </head>
 
 <body>
-<nav th:replace="webshop/fragments/header :: header ('my events', 'events_header.jpg')"></nav>
+<nav th:replace="~{webshop/fragments/header :: header ('my events', 'events_header.jpg')}"></nav>
 
 <div class="container-fluid">
     <div class="row pt-5">
@@ -43,7 +43,7 @@
             </a>
         </div>
     </div>
-    <div th:replace="fragments/messages :: messages"></div>
+    <div th:replace="~{fragments/messages :: messages}"></div>
     <div class="row">
         <div class="col-6 col-lg-4">
             <div class="card">
diff --git a/src/test/java/ch/wisv/events/ControllerTest.java b/src/test/java/ch/wisv/events/ControllerTest.java
index 8de6e504..504154a0 100644
--- a/src/test/java/ch/wisv/events/ControllerTest.java
+++ b/src/test/java/ch/wisv/events/ControllerTest.java
@@ -30,7 +30,6 @@
 import java.util.List;
 import java.util.UUID;
 import org.apache.commons.lang3.RandomStringUtils;
-import org.aspectj.weaver.ast.Or;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
@@ -129,6 +128,8 @@ protected Event createEvent() {
         event.setStart(LocalDateTime.now().plusMonths(1));
         event.setEnding(LocalDateTime.now().plusMonths(1).plusHours(1));
         event.setTarget(100);
+        event.setDescription("description");
+        event.setShortDescription("short description");
 
         eventRepository.saveAndFlush(event);
 
diff --git a/src/test/java/ch/wisv/events/admin/controller/DashboardEventControllerTest.java b/src/test/java/ch/wisv/events/admin/controller/DashboardEventControllerTest.java
index 6f489165..70c9815d 100644
--- a/src/test/java/ch/wisv/events/admin/controller/DashboardEventControllerTest.java
+++ b/src/test/java/ch/wisv/events/admin/controller/DashboardEventControllerTest.java
@@ -3,14 +3,9 @@
 import ch.wisv.events.ControllerTest;
 import ch.wisv.events.EventsApplicationTest;
 import ch.wisv.events.core.model.event.Event;
-import ch.wisv.events.core.model.event.EventCategory;
-import ch.wisv.events.core.model.event.EventStatus;
-import ch.wisv.events.utils.LdapGroup;
 import com.google.common.collect.ImmutableList;
 import java.time.LocalDateTime;
-import java.util.Optional;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -19,11 +14,9 @@
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.flash;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.model;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.redirectedUrl;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.redirectedUrlPattern;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.view;
 
@@ -79,7 +72,7 @@ public void testCreateGetAlreadySet() throws Exception {
 
     @Test
     public void testCreatePost() throws Exception {
-        mockMvc.perform(MockMvcRequestBuilders.fileUpload("/administrator/events/create/")
+        mockMvc.perform(MockMvcRequestBuilders.multipart("/administrator/events/create/")
                                 .file(new MockMultipartFile("file", "orig", null, new byte[0]))
                                 .param("title", "Events")
                                 .param("shortDescription", "Short description")
@@ -96,7 +89,7 @@ public void testCreatePost() throws Exception {
 
     @Test
     public void testCreatePostMissingTitle() throws Exception {
-        mockMvc.perform(MockMvcRequestBuilders.fileUpload("/administrator/events/create/")
+        mockMvc.perform(MockMvcRequestBuilders.multipart("/administrator/events/create/")
                                 .file(new MockMultipartFile("file", "orig", null, new byte[0]))
                                 .param("shortDescription", "Short description")
                                 .param("description", "Description")
@@ -112,7 +105,7 @@ public void testCreatePostMissingTitle() throws Exception {
 
     @Test
     public void testCreatePostMissingShortDescription() throws Exception {
-        mockMvc.perform(MockMvcRequestBuilders.fileUpload("/administrator/events/create/")
+        mockMvc.perform(MockMvcRequestBuilders.multipart("/administrator/events/create/")
                                 .file(new MockMultipartFile("file", "orig", null, new byte[0]))
                                 .param("title", "Events")
                                 .param("description", "Description")
@@ -128,7 +121,7 @@ public void testCreatePostMissingShortDescription() throws Exception {
 
     @Test
     public void testCreatePostMissingDescription() throws Exception {
-        mockMvc.perform(MockMvcRequestBuilders.fileUpload("/administrator/events/create/")
+        mockMvc.perform(MockMvcRequestBuilders.multipart("/administrator/events/create/")
                                 .file(new MockMultipartFile("file", "orig", null, new byte[0]))
                                 .param("title", "Events")
                                 .param("shortDescription", "Short description")
@@ -144,7 +137,7 @@ public void testCreatePostMissingDescription() throws Exception {
 
     @Test
     public void testCreatePostMissingStart() throws Exception {
-        mockMvc.perform(MockMvcRequestBuilders.fileUpload("/administrator/events/create/")
+        mockMvc.perform(MockMvcRequestBuilders.multipart("/administrator/events/create/")
                                 .file(new MockMultipartFile("file", "orig", null, new byte[0]))
                                 .param("title", "Events")
                                 .param("shortDescription", "Short description")
@@ -160,7 +153,7 @@ public void testCreatePostMissingStart() throws Exception {
 
     @Test
     public void testCreatePostMissingEnd() throws Exception {
-        mockMvc.perform(MockMvcRequestBuilders.fileUpload("/administrator/events/create/")
+        mockMvc.perform(MockMvcRequestBuilders.multipart("/administrator/events/create/")
                                 .file(new MockMultipartFile("file", "orig", null, new byte[0]))
                                 .param("title", "Events")
                                 .param("shortDescription", "Short description")
@@ -176,7 +169,7 @@ public void testCreatePostMissingEnd() throws Exception {
 
     @Test
     public void testCreatePostMissingTarget() throws Exception {
-        mockMvc.perform(MockMvcRequestBuilders.fileUpload("/administrator/events/create/")
+        mockMvc.perform(MockMvcRequestBuilders.multipart("/administrator/events/create/")
                                 .file(new MockMultipartFile("file", "orig", null, new byte[0]))
                                 .param("title", "Events")
                                 .param("shortDescription", "Short description")
@@ -192,7 +185,7 @@ public void testCreatePostMissingTarget() throws Exception {
 
     @Test
     public void testCreatePostMissingMaxSoldLowerThenTarget() throws Exception {
-        mockMvc.perform(MockMvcRequestBuilders.fileUpload("/administrator/events/create/")
+        mockMvc.perform(MockMvcRequestBuilders.multipart("/administrator/events/create/")
                                 .file(new MockMultipartFile("file", "orig", null, new byte[0]))
                                 .param("title", "Events")
                                 .param("shortDescription", "Short description")
@@ -209,7 +202,7 @@ public void testCreatePostMissingMaxSoldLowerThenTarget() throws Exception {
 
     @Test
     public void testCreatePostMissingEndBeforeStart() throws Exception {
-        mockMvc.perform(MockMvcRequestBuilders.fileUpload("/administrator/events/create/")
+        mockMvc.perform(MockMvcRequestBuilders.multipart("/administrator/events/create/")
                                 .file(new MockMultipartFile("file", "orig", null, new byte[0]))
                                 .param("title", "Events")
                                 .param("shortDescription", "Short description")
@@ -246,7 +239,7 @@ public void testEditGetNotFound() throws Exception {
     public void testEditPost() throws Exception {
         Event event = this.createEvent();
 
-        mockMvc.perform(MockMvcRequestBuilders.fileUpload("/administrator/events/edit/" + event.getKey())
+        mockMvc.perform(MockMvcRequestBuilders.multipart("/administrator/events/edit/" + event.getKey())
                                 .file(new MockMultipartFile("file", "orig", null, new byte[0]))
                                 .param("title", "Symposium")
                                 .param("shortDescription", "Short description of Symposium")
@@ -274,7 +267,7 @@ public void testEditPost() throws Exception {
     public void testEditPostMissingTitle() throws Exception {
         Event event = this.createEvent();
 
-        mockMvc.perform(MockMvcRequestBuilders.fileUpload("/administrator/events/edit/" + event.getKey())
+        mockMvc.perform(MockMvcRequestBuilders.multipart("/administrator/events/edit/" + event.getKey())
                                 .file(new MockMultipartFile("file", "orig", null, new byte[0]))
                                 .param("title", "")
                                 .param("shortDescription", "Short description of Symposium")
@@ -293,7 +286,7 @@ public void testEditPostMissingTitle() throws Exception {
     public void testEditPostMissingShortDescription() throws Exception {
         Event event = this.createEvent();
 
-        mockMvc.perform(MockMvcRequestBuilders.fileUpload("/administrator/events/edit/" + event.getKey())
+        mockMvc.perform(MockMvcRequestBuilders.multipart("/administrator/events/edit/" + event.getKey())
                                 .file(new MockMultipartFile("file", "orig", null, new byte[0]))
                                 .param("title", "Events")
                                 .param("description", "Description")
@@ -311,7 +304,7 @@ public void testEditPostMissingShortDescription() throws Exception {
     public void testEditPostMissingDescription() throws Exception {
         Event event = this.createEvent();
 
-        mockMvc.perform(MockMvcRequestBuilders.fileUpload("/administrator/events/edit/" + event.getKey())
+        mockMvc.perform(MockMvcRequestBuilders.multipart("/administrator/events/edit/" + event.getKey())
                                 .file(new MockMultipartFile("file", "orig", null, new byte[0]))
                                 .param("title", "Events")
                                 .param("shortDescription", "Short description")
@@ -329,7 +322,7 @@ public void testEditPostMissingDescription() throws Exception {
     public void testEditPostMissingStart() throws Exception {
         Event event = this.createEvent();
 
-        mockMvc.perform(MockMvcRequestBuilders.fileUpload("/administrator/events/edit/" + event.getKey())
+        mockMvc.perform(MockMvcRequestBuilders.multipart("/administrator/events/edit/" + event.getKey())
                                 .file(new MockMultipartFile("file", "orig", null, new byte[0]))
                                 .param("title", "Events")
                                 .param("shortDescription", "Short description")
@@ -347,7 +340,7 @@ public void testEditPostMissingStart() throws Exception {
     public void testEditPostMissingEnd() throws Exception {
         Event event = this.createEvent();
 
-        mockMvc.perform(MockMvcRequestBuilders.fileUpload("/administrator/events/edit/" + event.getKey())
+        mockMvc.perform(MockMvcRequestBuilders.multipart("/administrator/events/edit/" + event.getKey())
                                 .file(new MockMultipartFile("file", "orig", null, new byte[0]))
                                 .param("title", "Events")
                                 .param("shortDescription", "Short description")
@@ -365,7 +358,7 @@ public void testEditPostMissingEnd() throws Exception {
     public void testEditPostMissingTarget() throws Exception {
         Event event = this.createEvent();
 
-        mockMvc.perform(MockMvcRequestBuilders.fileUpload("/administrator/events/edit/" + event.getKey())
+        mockMvc.perform(MockMvcRequestBuilders.multipart("/administrator/events/edit/" + event.getKey())
                                 .file(new MockMultipartFile("file", "orig", null, new byte[0]))
                                 .param("title", "Events")
                                 .param("shortDescription", "Short description")
@@ -383,7 +376,7 @@ public void testEditPostMissingTarget() throws Exception {
     public void testEditPostMissingMaxSoldLowerThenTarget() throws Exception {
         Event event = this.createEvent();
 
-        mockMvc.perform(MockMvcRequestBuilders.fileUpload("/administrator/events/edit/" + event.getKey())
+        mockMvc.perform(MockMvcRequestBuilders.multipart("/administrator/events/edit/" + event.getKey())
                                 .file(new MockMultipartFile("file", "orig", null, new byte[0]))
                                 .param("title", "Events")
                                 .param("shortDescription", "Short description")
diff --git a/src/test/java/ch/wisv/events/admin/controller/DashboardOrderControllerTest.java b/src/test/java/ch/wisv/events/admin/controller/DashboardOrderControllerTest.java
index dbd04bc2..629b5264 100644
--- a/src/test/java/ch/wisv/events/admin/controller/DashboardOrderControllerTest.java
+++ b/src/test/java/ch/wisv/events/admin/controller/DashboardOrderControllerTest.java
@@ -118,7 +118,7 @@ public void testResendConfirmationMail() throws Exception {
 
     @Test
     public void testResendConfirmationMailNotFound() throws Exception {
-        Order order = this.createOrder(this.createCustomer(), ImmutableList.of(this.createProduct()), OrderStatus.RESERVATION, "tests");
+        this.createOrder(this.createCustomer(), ImmutableList.of(this.createProduct()), OrderStatus.RESERVATION, "tests");
 
         mockMvc.perform(get("/administrator/orders/resend-confirmation-mail/not-found"))
                 .andExpect(status().is3xxRedirection())
diff --git a/src/test/java/ch/wisv/events/admin/controller/DashboardProductControllerTest.java b/src/test/java/ch/wisv/events/admin/controller/DashboardProductControllerTest.java
index 587be518..49fd0feb 100644
--- a/src/test/java/ch/wisv/events/admin/controller/DashboardProductControllerTest.java
+++ b/src/test/java/ch/wisv/events/admin/controller/DashboardProductControllerTest.java
@@ -5,7 +5,6 @@
 import ch.wisv.events.core.model.product.Product;
 import com.google.common.collect.ImmutableList;
 import static org.hamcrest.Matchers.any;
-import static org.hamcrest.Matchers.contains;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
diff --git a/src/test/java/ch/wisv/events/admin/controller/DashboardTasksControllerTest.java b/src/test/java/ch/wisv/events/admin/controller/DashboardTasksControllerTest.java
index 01b25908..187320c7 100644
--- a/src/test/java/ch/wisv/events/admin/controller/DashboardTasksControllerTest.java
+++ b/src/test/java/ch/wisv/events/admin/controller/DashboardTasksControllerTest.java
@@ -2,10 +2,8 @@
 
 import ch.wisv.events.ControllerTest;
 import ch.wisv.events.EventsApplicationTest;
-import ch.wisv.events.core.model.webhook.Webhook;
 import ch.wisv.events.core.model.webhook.WebhookTask;
 import com.google.common.collect.ImmutableList;
-import static org.junit.Assert.*;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
diff --git a/src/test/java/ch/wisv/events/admin/controller/DashboardTreasurerControllerTest.java b/src/test/java/ch/wisv/events/admin/controller/DashboardTreasurerControllerTest.java
index 94c3882f..ca73ad39 100644
--- a/src/test/java/ch/wisv/events/admin/controller/DashboardTreasurerControllerTest.java
+++ b/src/test/java/ch/wisv/events/admin/controller/DashboardTreasurerControllerTest.java
@@ -9,12 +9,9 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import java.time.LocalDate;
-import java.util.ArrayList;
 import java.util.Map;
 import java.util.TreeMap;
 
-import org.apache.commons.lang3.tuple.ImmutablePair;
-import org.apache.commons.lang3.tuple.Pair;
 import org.apache.commons.lang3.tuple.ImmutableTriple;
 import org.apache.commons.lang3.tuple.Triple;
 import org.junit.Test;
diff --git a/src/test/java/ch/wisv/events/core/model/order/PaymentMethodTest.java b/src/test/java/ch/wisv/events/core/model/order/PaymentMethodTest.java
index 8bbe0fee..d292602c 100644
--- a/src/test/java/ch/wisv/events/core/model/order/PaymentMethodTest.java
+++ b/src/test/java/ch/wisv/events/core/model/order/PaymentMethodTest.java
@@ -1,16 +1,10 @@
 package ch.wisv.events.core.model.order;
 
-import ch.wisv.events.core.model.customer.Customer;
-import ch.wisv.events.core.model.product.Product;
-import ch.wisv.events.core.util.VatRate;
-import com.google.common.collect.ImmutableList;
-import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.junit.MockitoJUnitRunner;
 
 import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.mock;
 
 @RunWith(MockitoJUnitRunner.class)
 public class PaymentMethodTest {
diff --git a/src/test/java/ch/wisv/events/core/service/TicketServiceTest.java b/src/test/java/ch/wisv/events/core/service/TicketServiceTest.java
index 1657e7ee..8f9568fa 100644
--- a/src/test/java/ch/wisv/events/core/service/TicketServiceTest.java
+++ b/src/test/java/ch/wisv/events/core/service/TicketServiceTest.java
@@ -119,7 +119,7 @@ public void generateQrCodeException() throws Exception {
         Ticket ticket = new Ticket();
         ticket.setUniqueCode(uniqueCode);
 
-        BufferedImage qrCode = ticketService.generateQrCode(ticket);
+        ticketService.generateQrCode(ticket);
     }
 
     /**
diff --git a/src/test/java/ch/wisv/events/core/service/TicketTransferTest.java b/src/test/java/ch/wisv/events/core/service/TicketTransferTest.java
index 7eeb3501..61addfe4 100644
--- a/src/test/java/ch/wisv/events/core/service/TicketTransferTest.java
+++ b/src/test/java/ch/wisv/events/core/service/TicketTransferTest.java
@@ -10,9 +10,7 @@
 import ch.wisv.events.core.model.ticket.TicketStatus;
 import ch.wisv.events.core.repository.TicketRepository;
 import ch.wisv.events.core.service.auth.AuthenticationService;
-import ch.wisv.events.core.service.customer.CustomerService;
 import ch.wisv.events.core.service.event.EventService;
-import ch.wisv.events.core.service.mail.MailService;
 import ch.wisv.events.core.service.ticket.TicketService;
 import ch.wisv.events.core.service.ticket.TicketServiceImpl;
 
diff --git a/src/test/java/ch/wisv/events/core/tasks/OrderTaskSchedulerTest.java b/src/test/java/ch/wisv/events/core/tasks/OrderTaskSchedulerTest.java
index f94413c8..cbc4471f 100644
--- a/src/test/java/ch/wisv/events/core/tasks/OrderTaskSchedulerTest.java
+++ b/src/test/java/ch/wisv/events/core/tasks/OrderTaskSchedulerTest.java
@@ -4,7 +4,6 @@
 import ch.wisv.events.core.model.order.Order;
 import ch.wisv.events.core.model.order.OrderStatus;
 import ch.wisv.events.core.service.order.OrderService;
-import ch.wisv.events.webshop.service.PaymentsService;
 import com.google.common.collect.ImmutableList;
 import java.time.LocalDateTime;
 import org.junit.After;
diff --git a/src/test/java/ch/wisv/events/sales/controller/stats/SalesStatsControllersTest.java b/src/test/java/ch/wisv/events/sales/controller/stats/SalesStatsControllersTest.java
index d384e0e0..3befa714 100644
--- a/src/test/java/ch/wisv/events/sales/controller/stats/SalesStatsControllersTest.java
+++ b/src/test/java/ch/wisv/events/sales/controller/stats/SalesStatsControllersTest.java
@@ -2,7 +2,6 @@
 
 import ch.wisv.events.ControllerTest;
 import ch.wisv.events.EventsApplicationTest;
-import ch.wisv.events.core.exception.normal.EventNotFoundException;
 import ch.wisv.events.core.model.customer.Customer;
 import ch.wisv.events.core.model.event.Event;
 import ch.wisv.events.core.model.order.Order;
@@ -13,7 +12,6 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Mock;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -24,7 +22,6 @@
 import static org.hamcrest.Matchers.is;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
-import static org.mockito.Mockito.*;
 
 
 /**