diff --git a/README.md b/README.md
index f245c9f07..6134a8651 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@
 [![GitHub last commit](https://img.shields.io/github/last-commit/softwaremagico/KendoTournamentManager)](https://github.com/softwaremagico/KendoTournamentManager)
 [![Issues](https://img.shields.io/github/issues/softwaremagico/KendoTournamentManager.svg)](https://github.com/softwaremagico/KendoTournamentManager/issues)
 [![CircleCI](https://circleci.com/gh/softwaremagico/KendoTournamentManager.svg?style=shield)](https://circleci.com/gh/softwaremagico/KendoTournamentManager)
-[![Time](https://img.shields.io/badge/development-710.5h-blueviolet.svg)]()
+[![Time](https://img.shields.io/badge/development-711.5h-blueviolet.svg)]()
 
 [![Powered by](https://img.shields.io/badge/powered%20by%20java-orange.svg?logo=OpenJDK&logoColor=white)]()
 [![Vulnerabilities](https://sonarcloud.io/api/project_badges/measure?project=kendo-tournament-backend&metric=vulnerabilities)](https://sonarcloud.io/summary/new_code?id=kendo-tournament-backend)
diff --git a/backend/kendo-tournament-rest/src/main/java/com/softwaremagico/kt/websockets/WebSocketController.java b/backend/kendo-tournament-rest/src/main/java/com/softwaremagico/kt/websockets/WebSocketController.java
index 51990023a..63cab871f 100644
--- a/backend/kendo-tournament-rest/src/main/java/com/softwaremagico/kt/websockets/WebSocketController.java
+++ b/backend/kendo-tournament-rest/src/main/java/com/softwaremagico/kt/websockets/WebSocketController.java
@@ -71,7 +71,6 @@ private <T> String toJson(T object) throws JsonProcessingException {
      * Sends an Element to {@value com.softwaremagico.kt.websockets.WebSocketConfiguration#SOCKET_SEND_PREFIX} + {@value #CREATING_MAPPING}.
      *
      * @param element the element created.
-     * @return
      */
     public void elementCreated(@Payload ElementDTO element, String actor, String session) {
         try {
@@ -87,7 +86,6 @@ public void elementCreated(@Payload ElementDTO element, String actor, String ses
      * Sends an Element to {@value com.softwaremagico.kt.websockets.WebSocketConfiguration#SOCKET_SEND_PREFIX} + {@value #CREATING_MAPPING}.
      *
      * @param element the element created.
-     * @return
      */
     public void elementUpdated(@Payload ElementDTO element, String actor, String session) {
         try {
@@ -103,7 +101,6 @@ public void elementUpdated(@Payload ElementDTO element, String actor, String ses
      * Sends an Element to {@value com.softwaremagico.kt.websockets.WebSocketConfiguration#SOCKET_SEND_PREFIX} + {@value #CREATING_MAPPING}.
      *
      * @param element the element created.
-     * @return
      */
     public void elementDeleted(@Payload ElementDTO element, String actor, String session) {
         try {
@@ -119,7 +116,6 @@ public void elementDeleted(@Payload ElementDTO element, String actor, String ses
      * Sends a fightDTO to {@value com.softwaremagico.kt.websockets.WebSocketConfiguration#SOCKET_SEND_PREFIX} + {@value #FIGHTS_MAPPING}.
      *
      * @param fight the fight to send.
-     * @return
      */
     public void fightUpdated(@Payload FightDTO fight, String actor, String session) {
         try {
@@ -135,7 +131,6 @@ public void fightUpdated(@Payload FightDTO fight, String actor, String session)
      * Sends a fightDTO to {@value com.softwaremagico.kt.websockets.WebSocketConfiguration#SOCKET_SEND_PREFIX} + {@value #FIGHTS_MAPPING}.
      *
      * @param fights the fight to send.
-     * @return
      */
     public void fightsCreated(@Payload List<FightDTO> fights, String actor, String session) {
         try {
@@ -152,7 +147,6 @@ public void fightsCreated(@Payload List<FightDTO> fights, String actor, String s
      * + {@value #GROUPS_MAPPING}.
      *
      * @param tournamentDTO the tournament that is modified.
-     * @return
      */
     public void groupsUpdated(@Payload TournamentDTO tournamentDTO, String actor, String session) {
         try {
diff --git a/backend/pom.xml b/backend/pom.xml
index 20f4c6a04..efd541b96 100644
--- a/backend/pom.xml
+++ b/backend/pom.xml
@@ -78,9 +78,14 @@
 
     <properties>
         <main.basedir>${project.basedir}</main.basedir>
-        <java.version>17</java.version>
-        <sonar.organization>softwaremagico</sonar.organization>
-        <sonar.host.url>https://sonarcloud.io</sonar.host.url>
+        <java.version>21</java.version>
+        <maven-scm-provider-gitexe.version>1.9.2</maven-scm-provider-gitexe.version>
+        <maven-release-plugin.version>2.5.3</maven-release-plugin.version>
+        <maven-jar-plugin.version>3.3.0</maven-jar-plugin.version>
+        <maven-surefire-plugin.version>3.1.0</maven-surefire-plugin.version>
+        <maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
+        <maven-sources.version>3.3.0</maven-sources.version>
+        <maven-javadoc-plugin.version>3.3.2</maven-javadoc-plugin.version>
         <checkstyle.version>3.3.0</checkstyle.version>
         <spotbugs.version>4.7.3.4</spotbugs.version>
         <org.testng.version>7.8.0</org.testng.version>
@@ -88,10 +93,6 @@
         <springdoc.version>1.7.0</springdoc.version>
         <license-maven-plugin.version>2.7.0</license-maven-plugin.version>
         <modelmapper.version>2.3.9</modelmapper.version>
-        <maven-scm-provider-gitexe.version>1.9.2</maven-scm-provider-gitexe.version>
-        <maven-release-plugin.version>2.5.3</maven-release-plugin.version>
-        <maven-jar-plugin.version>3.3.0</maven-jar-plugin.version>
-        <maven-surefire-plugin.version>3.1.0</maven-surefire-plugin.version>
         <javax-interceptor.version>1.2.2</javax-interceptor.version>
         <jjwt.version>0.9.1</jjwt.version>
         <openpdf.version>1.3.30</openpdf.version>
@@ -104,7 +105,6 @@
         <javassist.version>3.25.0-GA</javassist.version>
         <qr-code.version>0.4.0</qr-code.version>
         <apache-batik.version>1.17</apache-batik.version>
-        <maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
     </properties>
 
     <build>
@@ -202,6 +202,43 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>${maven-javadoc-plugin.version}</version>
+                <executions>
+                    <execution>
+                        <id>attach-javadocs</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <version>${maven-sources.version}</version>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <phase>verify</phase>
+                        <goals>
+                            <goal>jar-no-fork</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.sonatype.central</groupId>
+                <artifactId>central-publishing-maven-plugin</artifactId>
+                <version>0.9.0</version>
+                <extensions>true</extensions>
+                <configuration>
+                    <publishingServerId>central</publishingServerId>
+                    <autoPublish>true</autoPublish>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 
@@ -268,13 +305,10 @@
             </properties>
             <distributionManagement>
                 <repository>
-                    <id>ossrh</id>
-                    <url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+                    <id>central</id>
+                    <name>Maven Central</name>
+                    <url>https://repo.maven.apache.org/maven2</url>
                 </repository>
-                <snapshotRepository>
-                    <id>ossrh</id>
-                    <url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
-                </snapshotRepository>
             </distributionManagement>
         </profile>
     </profiles>
diff --git a/frontend/src/app/components/fight/fight.component.html b/frontend/src/app/components/fight/fight.component.html
index 1146f6109..564b880e0 100644
--- a/frontend/src/app/components/fight/fight.component.html
+++ b/frontend/src/app/components/fight/fight.component.html
@@ -1,6 +1,6 @@
 <div class="fight-container">
   <div *ngIf="this.fight?.tournament?.teamSize?this.fight.tournament.teamSize > 1:true" [class.red-ribbon]="!swapColors"
-       [class.white-ribbon]="swapColors"
+       [class.white-ribbon]="swapColors" [ngStyle]="{'max-height': this.fight.tournament.teamSize*50+'px' }"
        class="left-team">
     {{ !swapTeams ? fight.team1.name : fight.team2.name }}
   </div>
@@ -26,7 +26,7 @@
           class="duel"></duel>
   </div>
   <div *ngIf="this.fight?.tournament?.teamSize?this.fight.tournament.teamSize > 1:true" [class.red-ribbon]="swapColors"
-       [class.white-ribbon]="!swapColors"
+       [class.white-ribbon]="!swapColors" [ngStyle]="{'max-height': this.fight.tournament.teamSize*50+'px' }"
        class="right-team">
     {{ !swapTeams ? fight.team2.name : fight.team1.name }}
   </div>
diff --git a/frontend/src/app/components/fight/fight.component.scss b/frontend/src/app/components/fight/fight.component.scss
index aeb977756..af85d0a02 100644
--- a/frontend/src/app/components/fight/fight.component.scss
+++ b/frontend/src/app/components/fight/fight.component.scss
@@ -1,5 +1,5 @@
 .fight {
-  border-width: 2px;
+  border-width: 2px 0 2px 0;
   border-color: var(--fight-border-color);
   border-style: solid;
   padding: 5px;
@@ -18,37 +18,48 @@
   transform: rotate(180deg);
   text-align: center;
   padding: 20px;
-  border-width: 2px;
-  border-color: var(--ribbon-border);
   border-style: solid;
-  background-color: var(--ribbon-background);
+  //background-color: var(--ribbon-background);
+  text-transform: uppercase;
+  border-width: 2px 2px 2px 0;
+  border-color: var(--fight-border-color);
+  line-height: 25px;
+  max-width: 56px;
+  overflow: clip;
 }
 
 .red-ribbon {
-  color: red;
+  color: var(--ribbon-background);
+  //To be below the timer
+  z-index: -1;
+  background-color: var(--red-team-color);
+}
+
+.white-ribbon {
+  color: var(--ribbon-background);
   //To be below the timer
   z-index: -1;
+  background-color: var(--white-team-color);
 }
 
 .ribbon-icon {
   transform: rotate(0deg);
+  border-width: 2px 0 2px 2px;
 }
 
 .right-team {
   writing-mode: vertical-rl;
   text-align: center;
   padding: 20px;
-  border-width: 2px;
-  border-color: var(--ribbon-border);
   border-style: solid;
-  text-shadow: -1px -1px 0 #000, 1px -1px 0 #000, -1px 1px 0 #000, 1px 1px 0 #000;
-  background-color: var(--ribbon-background);
-}
-
-.white-ribbon {
-  color: white;
-  //To be below the timer
-  z-index: -1;
+  //text-shadow: -1px -1px 0 #000, 1px -1px 0 #000, -1px 1px 0 #000, 1px 1px 0 #000;
+  //background-color: var(--ribbon-background);
+  text-transform: uppercase;
+  border-width: 2px 2px 2px 0;
+  border-color: var(--fight-border-color);
+  line-height: 25px;
+  max-width: 56px;
+  overflow: clip;
 }
 
 .fight-container {
diff --git a/frontend/src/app/views/fight-list/fight-list.component.scss b/frontend/src/app/views/fight-list/fight-list.component.scss
index 6a7857945..eff7d4a27 100644
--- a/frontend/src/app/views/fight-list/fight-list.component.scss
+++ b/frontend/src/app/views/fight-list/fight-list.component.scss
@@ -3,6 +3,7 @@
   max-height: 80vh;
   min-height: 50vh;
   overflow-y: auto;
+  padding: 20px;
 }
 
 .upper-menu {
diff --git a/frontend/src/basic-colors.scss b/frontend/src/basic-colors.scss
index 074266347..adb183e66 100644
--- a/frontend/src/basic-colors.scss
+++ b/frontend/src/basic-colors.scss
@@ -33,6 +33,8 @@
   --link-visited: #012f67;
   --link-hover: #8097b3;
   --link-active: #012f67;
+  --red-team-color: #f20d0d;
+  --white-team-color: #ffffff;
 }
 
 :root .dark-mode {
@@ -68,5 +70,7 @@
   --link-visited: #afa5d5;
   --link-hover: #9f98b9;
   --link-active: #8d7fc3;
+  --red-team-color: #c20a0a;
+  --white-team-color: #bbbbbb;
 }