Merge branch 'master' into develop

„README.md“ ändern
update some libraries
2020-12-17 17:53:31 +01:00 · 2020-12-17 17:44:38 +01:00 · 2020-06-20 00:18:27 +02:00 · 2019-11-27 16:21:00 +01:00 · 2019-09-08 20:19:28 +02:00 · 2019-06-28 17:35:22 +02:00
36 changed files with 4754 additions and 4841 deletions
--- a/.classpath
+++ b/.classpath
@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" output="target/classes" path="src/main/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" path="src/test/main"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-9">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry exported="true" kind="con" path="org.eclipse.fx.ide.jdt.core.JAVAFX_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
--- a/.drone.yml
+++ b/.drone.yml
@ -0,0 +1,8 @@
+kind: pipeline
+name: default
+
+steps:
+- name: package
+  image: maven
+  commands:
+  - mvn clean package
--- a/.gitignore
+++ b/.gitignore
@ -50,3 +50,6 @@ client_secret.json
 .directory
 target/
 cemu_UI.jar
+.classpath
+.project
+.settings/*
--- a/.project
+++ b/.project
@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>cemu_UI</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
--- a/.settings/org.eclipse.core.resources.prefs
+++ b/.settings/org.eclipse.core.resources.prefs
@ -1,5 +0,0 @@
-eclipse.preferences.version=1
-encoding//src/main/java=UTF-8
-encoding//src/main/resources=UTF-8
-encoding//src/test/java=UTF-8
-encoding/<project>=UTF-8
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@ -1,13 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=9
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=9
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=9
--- a/.settings/org.eclipse.m2e.core.prefs
+++ b/.settings/org.eclipse.m2e.core.prefs
@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
--- a/.travis.yml
+++ b/.travis.yml
@ -1,4 +0,0 @@
-language: java
-jdk:
-  - oraclejdk9
-  - oraclejdk10
--- a/README.md
+++ b/README.md
@ -1,10 +1,8 @@
 # cemu_UI

-![Total Downloads](https://img.shields.io/github/downloads/Seil0/cemu_UI/total.svg?style=flat-square)
-[![Build](https://img.shields.io/travis/Seil0/cemu_UI/master.svg?style=flat-square)](https://travis-ci.org/Seil0/cemu_UI)
-[![Latest](https://img.shields.io/github/release/Seil0/cemu_UI/all.svg?style=flat-square)](https://github.com/Seil0/cemu_UI/releases)
-[![HitCount](http://hits.dwyl.io/Seil0/cemu_UI.svg)](http://hits.dwyl.io/Seil0/cemu_UI)
-[![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg?style=flat-square)](https://www.gnu.org/licenses/gpl-3.0)
+[![Build Status](https://drone.mosad.xyz/api/badges/Seil0/cemu_UI/status.svg)](https://drone.mosad.xyz/Seil0/cemu_UI)
+[![Latest](https://img.shields.io/github/release/Seil0/cemu_UI/all.svg)](https://git.mosad.xyz/Seil0/cemu_UI/releases)
+[![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)

 cemu_UI is a simple, material design graphical frontend for [cemu](http://cemu.info/), a Wii U emulator. Downloads can be found [here](https://git.mosad.xyz/Seil0/cemu_UI/releases).

@ -32,8 +30,8 @@ If you want to use the cloud sync function read the [wiki](https://git.mosad.xyz

 ### If you have another idea, make a new issue!

-### [building from source](https://git.mosad.xyz/Seil0/cemu_UI/wiki/Documantation)
+### [building from source](https://git.mosad.xyz/Seil0/cemu_UI/wiki/Documentation)
  
 ## Screenshots

-![Screenshot](https://git.mosad.xyz/Seil0/cemu_UI/raw/branch/master/downloadContent/cemu_UI4.png)
+![Screenshot](https://www.mosad.xyz/images/cemu_UI_MainWindow.webp)
--- a/downloadContent/cemu_UI3.png
+++ b/downloadContent/cemu_UI3.png
--- a/downloadContent/cemu_UI4.png
+++ b/downloadContent/cemu_UI4.png
--- a/downloadContent/games.csv
+++ b/downloadContent/games.csv
--- a/pom.xml
+++ b/pom.xml
@ -1,220 +1,212 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>

-  <groupId>com</groupId>
-  <artifactId>cemu_UI</artifactId>
-  <version>0.3.0-SNAPSHOT</version>
-  <packaging>jar</packaging>
-  <name>cemu_UI</name>
-  <description>cemu_UI is a simple, material design graphical frontend for cemu, a Wii U emulator</description>
-  <url>http://www.kellerkinder.xyz</url>
+	<groupId>com</groupId>
+	<artifactId>cemu_UI</artifactId>
+	<version>0.3.2-SNAPSHOT</version>
+	<packaging>jar</packaging>
+	<name>cemu_UI</name>
+	<description>cemu_UI is a simple, material design graphical frontend for cemu, a Wii U emulator</description>
+	<url>https://www.mosad.xyz</url>

-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-  </properties>
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<openjfx.version>14.0.1</openjfx.version>
+	</properties>

-  <dependencies>
-      
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
-      <scope>test</scope>
-    </dependency>
+	<dependencies>

-    <dependency>
-        <groupId>com.jfoenix</groupId>
-        <artifactId>jfoenix</artifactId>
-        <version>9.0.4</version>
-    </dependency>
-        
-    <dependency>
-        <groupId>com.eclipsesource.minimal-json</groupId>
-        <artifactId>minimal-json</artifactId>
-        <version>0.9.5</version>
-    </dependency>
-        
-    <dependency>
-        <groupId>org.xerial</groupId>
-        <artifactId>sqlite-jdbc</artifactId>
-        <version>3.23.1</version>
-    </dependency>
-	
-    <dependency>
-        <groupId>org.apache.logging.log4j</groupId>
-        <artifactId>log4j-api</artifactId>
-        <version>2.11.0</version>
-    </dependency>
-    
-    <dependency>
-        <groupId>org.apache.logging.log4j</groupId>
-        <artifactId>log4j-core</artifactId>
-        <version>2.11.0</version>
-    </dependency>
-    
-    <dependency>
-        <groupId>commons-io</groupId>
-        <artifactId>commons-io</artifactId>
-        <version>2.6</version>
-    </dependency>
-    
-    <!-- https://mvnrepository.com/artifact/org.apache.commons/commons-vfs2 -->
-    <dependency>
-        <groupId>org.apache.commons</groupId>
-        <artifactId>commons-vfs2</artifactId>
-        <version>2.2</version>
-    </dependency>
-    
-    <!-- https://mvnrepository.com/artifact/commons-codec/commons-codec -->
-    <dependency>
-        <groupId>commons-codec</groupId>
-        <artifactId>commons-codec</artifactId>
-        <version>1.11</version>
-    </dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.12</version>
+			<scope>test</scope>
+		</dependency>

-    <!-- https://mvnrepository.com/artifact/io.datafx/flow -->
-    <dependency>
-        <groupId>io.datafx</groupId>
-        <artifactId>flow</artifactId>
-        <version>8.0.1</version>
-    </dependency>
+		<dependency>
+			<groupId>org.openjfx</groupId>
+			<artifactId>javafx-controls</artifactId>
+			<version>${openjfx.version}</version>
+		</dependency>

+		<dependency>
+			<groupId>org.openjfx</groupId>
+			<artifactId>javafx-fxml</artifactId>
+			<version>${openjfx.version}</version>
+		</dependency>

-    <!-- https://mvnrepository.com/artifact/net.lingala.zip4j/zip4j -->
-    <dependency>
-        <groupId>net.lingala.zip4j</groupId>
-        <artifactId>zip4j</artifactId>
-        <version>1.3.2</version>
-    </dependency>
+		<dependency>
+			<groupId>org.openjfx</groupId>
+			<artifactId>javafx-media</artifactId>
+			<version>${openjfx.version}</version>
+		</dependency>

-    <!-- Google Drive-API libraries-->
-    <!-- https://mvnrepository.com/artifact/commons-logging/commons-logging -->
-    <dependency>
-        <groupId>commons-logging</groupId>
-        <artifactId>commons-logging</artifactId>
-        <version>1.1.1</version>
-    </dependency>
-    
-    <!-- https://mvnrepository.com/artifact/com.google.api-client/google-api-client -->
-    <dependency>
-        <groupId>com.google.api-client</groupId>
-        <artifactId>google-api-client</artifactId>
-        <version>1.23.0</version>
-    </dependency>
+		<dependency>
+			<groupId>com.jfoenix</groupId>
+			<artifactId>jfoenix</artifactId>
+			<version>9.0.10</version>
+		</dependency>

-    <!-- https://mvnrepository.com/artifact/com.google.apis/google-api-services-drive -->
-    <dependency>
-        <groupId>com.google.apis</groupId>
-        <artifactId>google-api-services-drive</artifactId>
-        <version>v3-rev120-1.23.0</version>
-    </dependency>
+		<dependency>
+			<groupId>com.eclipsesource.minimal-json</groupId>
+			<artifactId>minimal-json</artifactId>
+			<version>0.9.5</version>
+		</dependency>

-    <!-- https://mvnrepository.com/artifact/com.google.http-client/google-http-client -->
-    <dependency>
-        <groupId>com.google.http-client</groupId>
-        <artifactId>google-http-client</artifactId>
-        <version>1.23.0</version>
-    </dependency>
-    
-    <!-- https://mvnrepository.com/artifact/com.google.http-client/google-http-client-jackson2 -->
-    <dependency>
-        <groupId>com.google.http-client</groupId>
-        <artifactId>google-http-client-jackson2</artifactId>
-        <version>1.23.0</version>
-    </dependency>
+		<dependency>
+			<groupId>org.xerial</groupId>
+			<artifactId>sqlite-jdbc</artifactId>
+			<version>3.31.1</version>
+		</dependency>

-    <!-- https://mvnrepository.com/artifact/com.google.oauth-client/google-oauth-client -->
-    <dependency>
-        <groupId>com.google.oauth-client</groupId>
-        <artifactId>google-oauth-client</artifactId>
-        <version>1.23.0</version>
-    </dependency>
+		<dependency>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-api</artifactId>
+			<version>2.13.3</version>
+		</dependency>

+		<dependency>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-core</artifactId>
+			<version>2.13.3</version>
+		</dependency>

-    <!-- https://mvnrepository.com/artifact/com.google.oauth-client/google-oauth-client-java6 -->
-    <dependency>
-        <groupId>com.google.oauth-client</groupId>
-        <artifactId>google-oauth-client-java6</artifactId>
-        <version>1.23.0</version>
-    </dependency>
+		<dependency>
+			<groupId>commons-io</groupId>
+			<artifactId>commons-io</artifactId>
+			<version>2.6</version>
+		</dependency>

-    <!-- https://mvnrepository.com/artifact/com.google.oauth-client/google-oauth-client-jetty -->
-    <dependency>
-        <groupId>com.google.oauth-client</groupId>
-        <artifactId>google-oauth-client-jetty</artifactId>
-        <version>1.23.0</version>
-    </dependency>
-    
-    <!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-core -->
-    <dependency>
-        <groupId>com.fasterxml.jackson.core</groupId>
-        <artifactId>jackson-core</artifactId>
-        <version>2.9.5</version>
-    </dependency>
+		<!-- https://mvnrepository.com/artifact/org.apache.commons/commons-vfs2 -->
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-vfs2</artifactId>
+			<version>2.6.0</version>
+		</dependency>

-    <!-- https://mvnrepository.com/artifact/javax.servlet/javax.servlet-api -->
-    <dependency>
-        <groupId>javax.servlet</groupId>
-        <artifactId>javax.servlet-api</artifactId>
-        <version>4.0.0</version>
-        <scope>provided</scope>
-    </dependency>
+		<!-- https://mvnrepository.com/artifact/commons-codec/commons-codec -->
+		<dependency>
+			<groupId>commons-codec</groupId>
+			<artifactId>commons-codec</artifactId>
+			<version>1.14</version>
+		</dependency>
+
+		<!-- https://mvnrepository.com/artifact/net.lingala.zip4j/zip4j -->
+		<dependency>
+			<groupId>net.lingala.zip4j</groupId>
+			<artifactId>zip4j</artifactId>
+			<version>1.3.2</version>
+		</dependency>
+
+		<!-- Google Drive-API libraries -->
+		<!-- https://mvnrepository.com/artifact/commons-logging/commons-logging -->
+		<dependency>
+			<groupId>commons-logging</groupId>
+			<artifactId>commons-logging</artifactId>
+			<version>1.1.1</version>
+		</dependency>
+
+		<!-- https://mvnrepository.com/artifact/com.google.apis/google-api-services-drive -->
+		<dependency>
+			<groupId>com.google.apis</groupId>
+			<artifactId>google-api-services-drive</artifactId>
+			<version>v3-rev136-1.25.0</version>
+		</dependency>
+
+		<!-- https://mvnrepository.com/artifact/com.google.http-client/google-http-client -->
+		<dependency>
+			<groupId>com.google.http-client</groupId>
+			<artifactId>google-http-client</artifactId>
+			<version>1.25.0</version>
+		</dependency>
+
+		<!-- https://mvnrepository.com/artifact/com.google.http-client/google-http-client-jackson2 -->
+		<dependency>
+			<groupId>com.google.http-client</groupId>
+			<artifactId>google-http-client-jackson2</artifactId>
+			<version>1.25.0</version>
+		</dependency>
+
+		<!-- https://mvnrepository.com/artifact/com.google.oauth-client/google-oauth-client-jetty -->
+		<dependency>
+			<groupId>com.google.oauth-client</groupId>
+			<artifactId>google-oauth-client-jetty</artifactId>
+			<version>1.25.0</version>
+		</dependency>
+
+		<!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-core -->
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-core</artifactId>
+			<version>2.9.7</version>
+		</dependency>
+
+		<!-- https://mvnrepository.com/artifact/org.mortbay.jetty/jetty -->
+		<dependency>
+			<groupId>org.mortbay.jetty</groupId>
+			<artifactId>jetty</artifactId>
+			<version>6.1.26</version>
+		</dependency>
+
+	</dependencies>
+
+	<build>
+		<plugins>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.8.1</version>
+				<configuration>
+					<source>11</source>
+					<target>11</target>
+					<showWarnings>true</showWarnings>
+					<showDeprecation>true</showDeprecation>
+				</configuration>
+			</plugin>
+			
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>exec-maven-plugin</artifactId>
+				<version>1.6.0</version>
+				<executions>
+					<execution>
+						<goals>
+							<goal>java</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+					<mainClass>com.cemu_UI.application.Main</mainClass>
+				</configuration>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-shade-plugin</artifactId>
+				<version>3.2.2</version>
+				<executions>
+					<execution>
+						<phase>package</phase>
+						<goals>
+							<goal>shade</goal>
+						</goals>
+						<configuration>
+							<finalName>cemu_UI</finalName>
+							<shadedArtifactAttached>true</shadedArtifactAttached>
+							<transformers>
+								<transformer
+									implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+									<mainClass>com.cemu_UI.application.JavaFX11Main</mainClass>
+								</transformer>
+							</transformers>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>

-    <!-- https://mvnrepository.com/artifact/org.mortbay.jetty/jetty -->
-    <dependency>
-        <groupId>org.mortbay.jetty</groupId>
-        <artifactId>jetty</artifactId>
-        <version>6.1.26</version>
-    </dependency>
-    
-    <!-- https://mvnrepository.com/artifact/org.mortbay.jetty/jetty-util -->
-    <dependency>
-        <groupId>org.mortbay.jetty</groupId>
-        <artifactId>jetty-util</artifactId>
-        <version>6.1.26</version>
-    </dependency>
-    
-  </dependencies>
-  
-  <build>
-    <plugins>
-        
-        <plugin> 
-            <groupId>org.apache.maven.plugins</groupId> 
-            <artifactId>maven-compiler-plugin</artifactId> 
-            <version>3.7.0</version> 
-            <configuration> 
-                <source>9</source> 
-                <target>9</target> 
-                <showWarnings>true</showWarnings> 
-                <showDeprecation>true</showDeprecation> 
-            </configuration> 
-        </plugin>
-        
-        <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-shade-plugin</artifactId>
-            <version>3.1.1</version>
-                <executions>
-                    <execution>
-                    <phase>package</phase>
-                    <goals>
-                        <goal>shade</goal>
-                    </goals>
-                    <configuration>
-                        <finalName>cemu_UI</finalName>
-                        <shadedArtifactAttached>true</shadedArtifactAttached>
-                        <transformers>
-                            <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                                <mainClass>com.cemu_UI.application.Main</mainClass>
-                            </transformer>
-                        </transformers>
-                    </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-    
 </project>
--- a/src/main/java/com/cemu_UI/application/JavaFX11Main.java
+++ b/src/main/java/com/cemu_UI/application/JavaFX11Main.java
@ -0,0 +1,8 @@
+package com.cemu_UI.application;
+
+public class JavaFX11Main {
+	
+	public static void main(String[] args) {
+		Main.main(args);
+	}
+}
--- a/src/main/java/com/cemu_UI/application/Main.java
+++ b/src/main/java/com/cemu_UI/application/Main.java
@ -1,7 +1,7 @@
 /**
 * cemu_UI
 * 
- * Copyright 2017-2018  <@Seil0>
+ * Copyright 2017-2019  <@Seil0>
 * 
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@ -18,6 +18,7 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 * MA 02110-1301, USA.
 */
+
 package com.cemu_UI.application;
 	
 import java.io.File;
@ -26,7 +27,6 @@ import java.io.IOException;
 import java.net.URL;
 import java.nio.channels.Channels;
 import java.nio.channels.ReadableByteChannel;
-import java.util.Optional;
 import java.util.Timer;
 import java.util.TimerTask;

@ -34,51 +34,44 @@ import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

 import com.cemu_UI.controller.CloudController;
+import com.cemu_UI.controller.XMLController;
+import com.cemu_UI.uiElements.JFXInfoAlert;
+import com.cemu_UI.uiElements.JFXOkayCancelAlert;

 import javafx.application.Application;
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
 import javafx.fxml.FXMLLoader;
-import javafx.stage.DirectoryChooser;
-import javafx.stage.Stage;
 import javafx.scene.Scene;
 import javafx.scene.control.Alert;
-import javafx.scene.control.ButtonType;
 import javafx.scene.control.Alert.AlertType;
 import javafx.scene.layout.AnchorPane;
+import javafx.stage.DirectoryChooser;
+import javafx.stage.Stage;

 public class Main extends Application {
 	
-	private Stage primaryStage;
+	private final String gamesDBdownloadURL = "https://git.mosad.xyz/Seil0/cemu_UI/raw/branch/master/downloadContent/games.db";
+	private static Main main;
+	private static XMLController xmlController;
 	private MainWindowController mainWindowController;
 	private CloudController cloudController;
+	private Stage primaryStage;
 	private AnchorPane pane;
 	private Scene scene;
-	private static String userHome = System.getProperty("user.home");
-	private static String userName = System.getProperty("user.name");
-	private static String osName = System.getProperty("os.name");
-	private static String osArch = System.getProperty("os.arch");
-	private static String osVers = System.getProperty("os.version");
-	private static String javaVers = System.getProperty("java.version");
-	private static String javaVend= System.getProperty("java.vendor");
-	private String gamesDBdownloadURL = "https://github.com/Seil0/cemu_UI/raw/master/downloadContent/games.db";
-	private static String dirCemuUI;
-	private static File directory;
-	private static File configFile;
-	private static File gamesDBFile;
-	private static File reference_gamesFile;
-	private static File pictureCache;
+
    private static Logger LOGGER;
 	
 	@Override
 	public void start(Stage primaryStage) {
 		try {
-			LOGGER.info("OS: " + osName + " " + osVers + " " + osArch);
-			LOGGER.info("Java: " + javaVend + " " + javaVers);
-			LOGGER.info("User: " + userName + " " + userHome);
+			LOGGER.info("OS: " + XMLController.getOsName() + " " + XMLController.getOsVers() + " " + XMLController.getOsVers());
+			LOGGER.info("Java: " + XMLController.getJavaVend() + " " + XMLController.getJavaVers());
+			LOGGER.info("User: " + XMLController.getUserName() + " " + XMLController.getUserHome());
 			
 			this.primaryStage = primaryStage;
-			mainWindowController = new MainWindowController(this);
+			mainWindowController = new MainWindowController();
+			main = this;
 			
 			mainWindow();
 			initActions();
@ -91,14 +84,14 @@ public class Main extends Application {
 	private void mainWindow(){
 		try {
 			FXMLLoader loader = new FXMLLoader();
-			loader.setLocation(ClassLoader.getSystemResource("fxml/MainWindow.fxml"));
+			loader.setLocation(getClass().getResource("/fxml/MainWindow.fxml"));
 			loader.setController(mainWindowController);
 			pane = (AnchorPane) loader.load();
-			primaryStage.setMinWidth(265.00);
-			primaryStage.setMinHeight(425.00);
+			primaryStage.setMinWidth(1130);
+			primaryStage.setMinHeight(600 + 34);
 			primaryStage.setTitle("cemu_UI");
 //			primaryStage.getIcons().add(new Image(Main.class.getResourceAsStream(""))); //adds application icon
-			primaryStage.setOnCloseRequest(event -> System.exit(1));
+			primaryStage.setOnCloseRequest(event -> System.exit(0));
 			
 			// generate window
 			scene = new Scene(pane); // create new scene, append pane to scene
@ -106,51 +99,46 @@ public class Main extends Application {
 			primaryStage.setScene(scene); // append scene to stage
 			primaryStage.show(); // show stage
 			
-			cloudController = new CloudController(mainWindowController); // call cloudController constructor
+			cloudController = CloudController.getInstance(mainWindowController); // call cloudController constructor
 			
 			// startup checks
 			// check if client_secret.json is present
 			if (Main.class.getResourceAsStream("/client_secret.json") == null) {
 				LOGGER.error("client_secret is missing!!!!!");
 				
-				Alert alert = new Alert(AlertType.ERROR);
-		    	alert.setTitle("cemu_UI");
-		    	alert.setHeaderText("Error");
-		    	alert.setContentText("client_secret is missing! Please contact the maintainer. \nIf you compiled cemu_UI by yourself see: \nhttps://github.com/Seil0/cemu_UI/wiki/Documantation");
-		    	alert.showAndWait();
+				JFXInfoAlert noCSAlert = new JFXInfoAlert("Error",
+						"client_secret is missing! Please contact the maintainer. \n"
+						+ "If you compiled cemu_UI by yourself see: \n"
+						+ "https://git.mosad.xyz/Seil0/cemu_UI/wiki/Documantation",
+						"-fx-button-type: RAISED; -fx-background-color: #00a8cc; -fx-text-fill: BLACK;", primaryStage);
+				noCSAlert.showAndWait();
 			}

-			if (!directory.exists()) {
+			if (!XMLController.getDirCemuUI().exists()) {
 				LOGGER.info("creating cemu_UI directory");
-				directory.mkdir();
-				pictureCache.mkdir();
+				XMLController.getDirCemuUI().mkdir();
+				XMLController.getPictureCache().mkdir();
 			}
 			
-			if (!configFile.exists()) {
+			if (!XMLController.getConfigFile().exists()) {
 				LOGGER.info("firststart, setting default values");
 				firstStart();
-				mainWindowController.setColor("00a8cc");
-				mainWindowController.setAutoUpdate(false);
-				mainWindowController.setLanguage("en_US");
-				mainWindowController.setLastLocalSync(0);
-				mainWindowController.setxPosHelper(0);
-				mainWindowController.saveSettings();
+				xmlController.saveSettings();
 			}
 			
-			if (!pictureCache.exists()) {
-				pictureCache.mkdir();
+			if (!XMLController.getPictureCache().exists()) {
+				XMLController.getPictureCache().mkdir();
 			}
 			
-			
-			if (!reference_gamesFile.exists()) {
-				if (gamesDBFile.exists()) {
-					gamesDBFile.delete();
+			if (!XMLController.getRference_gamesFile().exists()) {
+				if (XMLController.getGamesDBFile().exists()) {
+					XMLController.getGamesDBFile().delete();
 				}
 				try {
 					LOGGER.info("downloading ReferenceGameList.db... ");
 					URL website = new URL(gamesDBdownloadURL);
 					ReadableByteChannel rbc = Channels.newChannel(website.openStream());
-					FileOutputStream fos = new FileOutputStream(reference_gamesFile);
+					FileOutputStream fos = new FileOutputStream(XMLController.getRference_gamesFile());
 					fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
 					fos.close();
 					LOGGER.info("finished downloading games.db");
@ -161,12 +149,11 @@ public class Main extends Application {
 			
 			// init here as it loads the games to the mwc and the gui, therefore the window must exist
 			mainWindowController.init();
-			mainWindowController.getDbController().init();
 			
 			// if cloud sync is activated start sync
-			if(mainWindowController.isCloudSync()) {
-				cloudController.initializeConnection(mainWindowController.getCloudService(), mainWindowController.getCemuPath());
-				cloudController.sync(mainWindowController.getCloudService(), mainWindowController.getCemuPath(), directory.getPath());
+			if (XMLController.isCloudSync()) {
+				cloudController.initializeConnection(XMLController.getCloudService(), XMLController.getCemuPath());
+				cloudController.sync(XMLController.getCloudService(), XMLController.getCemuPath(), XMLController.getDirCemuUIPath());
 			}
 			
 		} catch (IOException e) {
@ -175,56 +162,53 @@ public class Main extends Application {
 	}
 	
 	public static void main(String[] args) {
+		String logPath = "";
 		
-		if (osName.contains("Windows")) {
-			dirCemuUI = userHome + "/Documents/cemu_UI";
+		if (System.getProperty("os.name").contains("Windows")) {
+			logPath = System.getProperty("user.home") + "/Documents/cemu_UI/app.log";
 		} else {
-			dirCemuUI = userHome + "/cemu_UI";
+			logPath = System.getProperty("user.home") + "/cemu_UI/app.log";
 		}
 		
-		directory = new File(dirCemuUI);
-		configFile = new File(dirCemuUI + "/config.xml");
-		gamesDBFile = new File(dirCemuUI + "/games.db");
-		reference_gamesFile = new File(dirCemuUI + "/reference_games.db");
-		pictureCache= new File(dirCemuUI+"/picture_cache");
-		
-		// delete old log file and create new
-		System.setProperty("logFilename", dirCemuUI + "/app.log");
-		File logFile = new File(dirCemuUI + "/app.log");
+		System.setProperty("logFilename", logPath);
+		File logFile = new File(logPath);
 		logFile.delete();
 		LOGGER = LogManager.getLogger(Main.class.getName());
+		
+		xmlController = new XMLController();
 		launch(args);
 	}
 	
 	private void firstStart() {
-		Alert alert = new Alert(AlertType.CONFIRMATION); // new alert with file-chooser
-		alert.setTitle("cemu_UI");
-		alert.setHeaderText("cemu installation");
-		alert.setContentText("please select your cemu installation");
-
-		Optional<ButtonType> result = alert.showAndWait();
-		if (result.get() == ButtonType.OK) {
+	
+		JFXOkayCancelAlert cemuInstallAlert = new JFXOkayCancelAlert("cemu installation",
+				"please select your cemu installation",
+				"-fx-button-type: RAISED; -fx-background-color: #00a8cc; -fx-text-fill: BLACK;", primaryStage);
+		cemuInstallAlert.setOkayAction(e -> {
 			DirectoryChooser directoryChooser = new DirectoryChooser();
            File selectedDirectory = directoryChooser.showDialog(primaryStage);
-            mainWindowController.setCemuPath(selectedDirectory.getAbsolutePath());
-            
-		} else {
-			mainWindowController.setCemuPath(null);
-		}
+            XMLController.setCemuPath(selectedDirectory.getAbsolutePath());
+		});
+		cemuInstallAlert.setCancelAction(e -> {
+			XMLController.setCemuPath(null);
+			LOGGER.info("Action canceld by user!");
+		});
+		cemuInstallAlert.showAndWait();
 		
-		Alert alert2 = new Alert(AlertType.CONFIRMATION); // new alert with file-chooser
-		alert2.setTitle("cemu_UI");
-		alert2.setHeaderText("rom directory");
-		alert2.setContentText("please select your rom directory");
-
-		Optional<ButtonType> result2 = alert2.showAndWait();
-		if (result2.get() == ButtonType.OK) {
+		JFXOkayCancelAlert romDirectoryAlert = new JFXOkayCancelAlert("rom directory",
+				"please select your rom directory",
+				"-fx-button-type: RAISED; -fx-background-color: #00a8cc; -fx-text-fill: BLACK;", primaryStage);
+		romDirectoryAlert.setOkayAction(e -> {
 			DirectoryChooser directoryChooser = new DirectoryChooser();
 			File selectedDirectory = directoryChooser.showDialog(primaryStage);
-			mainWindowController.setRomDirectoryPath(selectedDirectory.getAbsolutePath());
-		} else {
-			mainWindowController.setRomDirectoryPath(null);
-		}
+			XMLController.setRomDirectoryPath(selectedDirectory.getAbsolutePath());
+		});
+		romDirectoryAlert.setCancelAction(e -> {
+			XMLController.setRomDirectoryPath(null);
+			LOGGER.info("Action canceld by user!");
+		});
+		romDirectoryAlert.showAndWait();
+		
 	}
 	
 	private void initActions() {
@ -236,12 +220,6 @@ public class Main extends Application {
 			
 			@Override
 			public void changed(ObservableValue<? extends Number> observable, Number oldValue, final Number newValue) {
-				int xPosHelperMax = (int) Math.floor((mainWindowController.getMainAnchorPane().getWidth() - 36) / 217);
-				
-				// call only if there is enough space for a new row
-				if (mainWindowController.getOldXPosHelper() != xPosHelperMax) {
-					mainWindowController.refreshUIData();
-				}
 				
 				// if saveTask is already running kill it
 				if (saveTask != null) saveTask.cancel();
@ -249,7 +227,8 @@ public class Main extends Application {
 				saveTask = new TimerTask() {
 					@Override
 				    public void run() {
-						mainWindowController.saveSettings();
+						XMLController.setWindowWidth(mainWindowController.getMainAnchorPane().getWidth());
+						xmlController.saveSettings();
 					}
 				};
 				timer.schedule(saveTask, delayTime);
@ -270,7 +249,8 @@ public class Main extends Application {
 				saveTask = new TimerTask() {
 					@Override
 				    public void run() {
-						mainWindowController.saveSettings();
+						XMLController.setWindowHeight(mainWindowController.getMainAnchorPane().getHeight());
+						xmlController.saveSettings();
 					}
 				};
 				timer.schedule(saveTask, delayTime);
@ -299,48 +279,16 @@ public class Main extends Application {
 		primaryStage.heightProperty().addListener(heightListener);
 		primaryStage.maximizedProperty().addListener(maximizeListener);
 	}
-
-	public Stage getPrimaryStage() {
-		return primaryStage;
-	}
-
-	public void setPrimaryStage(Stage primaryStage) {
-		this.primaryStage = primaryStage;
+	
+	public static Main getMain() {
+		return main;
 	}

 	public CloudController getCloudController() {
 		return cloudController;
 	}

-	public void setCloudController(CloudController cloudController) {
-		this.cloudController = cloudController;
-	}
-
 	public AnchorPane getPane() {
 		return pane;
 	}
-
-	public void setPane(AnchorPane pane) {
-		this.pane = pane;
-	}
-
-	public File getDirectory() {
-		return directory;
-	}
-
-	public File getConfigFile() {
-		return configFile;
-	}
-
-	public File getGamesDBFile() {
-		return gamesDBFile;
-	}
-
-	public File getReference_gamesFile() {
-		return reference_gamesFile;
-	}
-
-	public File getPictureCache() {
-		return pictureCache;
-	}
 }
--- a/src/main/java/com/cemu_UI/application/MainWindowController.java
+++ b/src/main/java/com/cemu_UI/application/MainWindowController.java
--- a/src/main/java/com/cemu_UI/application/playGame.java
+++ b/src/main/java/com/cemu_UI/application/playGame.java
@ -1,7 +1,7 @@
 /**
 * cemu_UI
 * 
- * Copyright 2017-2018  <@Seil0>
+ * Copyright 2017-2019  <@Seil0>
 * 
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@ -18,6 +18,7 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 * MA 02110-1301, USA.
 */
+
 package com.cemu_UI.application;

 import java.io.IOException;
@ -26,11 +27,13 @@ import java.time.Instant;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

+import com.cemu_UI.controller.CloudController;
 import com.cemu_UI.controller.DBController;
+import com.cemu_UI.controller.XMLController;

 import javafx.application.Platform;

-public class playGame extends Thread{
+public class playGame extends Thread {

 	private MainWindowController mainWindowController;
 	private DBController dbController;
@ -44,7 +47,7 @@ public class playGame extends Thread{
 	@Override
 	public void run() {
 		String selectedGameTitleID = mainWindowController.getSelectedGameTitleID();
-		String cemuBin = mainWindowController.getCemuPath() + "/Cemu.exe";
+		String cemuBin = XMLController.getCemuPath() + "/Cemu.exe";
 		String gameExec = "\"" + mainWindowController.getGameExecutePath() + "\"";
 		long startTime;
    	long endTime;
@ -53,18 +56,18 @@ public class playGame extends Thread{
 		Process p;
 		
 		Platform.runLater(() -> {
-			mainWindowController.getMain().getPrimaryStage().setIconified(true); // minimize cemu_UI
+			mainWindowController.getPrimaryStage().setIconified(true); // minimize cemu_UI
 		});
    	startTime = System.currentTimeMillis();
    	try {
 			if (System.getProperty("os.name").equals("Linux")) {
-				if(mainWindowController.isFullscreen()){
+				if(XMLController.isFullscreen()){
 					p = new ProcessBuilder("wine", cemuBin, "-f", "-g", gameExec).start();
 				} else {
 					p = new ProcessBuilder("wine", cemuBin, "-g", gameExec).start();
 				}
 			} else {
-				if(mainWindowController.isFullscreen()){
+				if(XMLController.isFullscreen()){
 					p = new ProcessBuilder(cemuBin, "-f", "-g", gameExec).start();
 				} else {
 					p = new ProcessBuilder(cemuBin, "-g", gameExec).start();
@ -85,14 +88,14 @@ public class playGame extends Thread{
 				} else {
 					mainWindowController.totalPlaytimeBtn.setText(dbController.getTotalPlaytime(selectedGameTitleID) + " min");
 				}
-				mainWindowController.getMain().getPrimaryStage().setIconified(false); // maximize cemu_UI
+				mainWindowController.getPrimaryStage().setIconified(false); // maximize cemu_UI
 			});
    		
    		//sync savegame with cloud service
-			if (mainWindowController.isCloudSync()) {
-				mainWindowController.setLastLocalSync(Instant.now().getEpochSecond());
-				mainWindowController.getMain().getCloudController().sync(mainWindowController.getCloudService(),
-						mainWindowController.getCemuPath(), mainWindowController.getMain().getDirectory().getPath());
+			if (XMLController.isCloudSync()) {
+				XMLController.setLastLocalSync(Instant.now().getEpochSecond());
+				CloudController.getInstance(mainWindowController).sync(XMLController.getCloudService(),
+						XMLController.getCemuPath(), XMLController.getDirCemuUIPath());
 			}
    		
 		} catch (IOException | InterruptedException e) {
--- a/src/main/java/com/cemu_UI/controller/CloudController.java
+++ b/src/main/java/com/cemu_UI/controller/CloudController.java
@ -1,7 +1,7 @@
 /**
 * cemu_UI
 * 
- * Copyright 2017-2018  <@Seil0>
+ * Copyright 2017-2019  <@Seil0>
 * 
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@ -18,6 +18,7 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 * MA 02110-1301, USA.
 */
+
 package com.cemu_UI.controller;

 import java.io.File;
@ -32,6 +33,7 @@ import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

 import com.cemu_UI.application.MainWindowController;
+import com.cemu_UI.datatypes.GlobalDataTypes.CloudService;
 import com.cemu_UI.vendorCloudController.GoogleDriveController;

 import javafx.application.Platform;
@ -39,20 +41,32 @@ import net.lingala.zip4j.core.ZipFile;
 import net.lingala.zip4j.exception.ZipException;

 public class CloudController {
-
+	
+	// TODO make singleton
+	
+	private MainWindowController mwc;
+	private static CloudController instance = null;
+	private XMLController xmlController = new XMLController();
+	private GoogleDriveController googleDriveController = new GoogleDriveController();
+	private static final Logger LOGGER = LogManager.getLogger(CloudController.class.getName());
+	
 	public CloudController(MainWindowController mwc) {
 		this.mwc = mwc;
 	}
 	
-	private MainWindowController mwc;
-	private GoogleDriveController googleDriveController = new GoogleDriveController();
-	private static final Logger LOGGER = LogManager.getLogger(CloudController.class.getName());
+	public static CloudController getInstance(MainWindowController mwc) {
+		if (instance == null) {
+			instance = new CloudController(mwc);
+		}
+		
+		return instance;
+	}
 	
-	public boolean initializeConnection(String cloudService, String cemuDirectory) {
+	public boolean initializeConnection(CloudService cloudService, String cemuDirectory) {
 		boolean success = false;
 		LOGGER.info("sartting cloud initialisation ...");
 		
-		if(cloudService.equals("GoogleDrive")) {
+		if(cloudService == CloudService.GoogleDrive) {
 			LOGGER.info("selected service is Google Drive");
 			try {
 				googleDriveController.main(cemuDirectory);
@ -63,7 +77,7 @@ public class CloudController {
 			success = true;		
 		}
 		
-		if(cloudService.equals("Dropbox")) {
+		if(cloudService == CloudService.Dropbox) {
 			LOGGER.info("selected service is Dropbox");
 		}
 		LOGGER.info("cloud initialisation done!");
@ -76,7 +90,7 @@ public class CloudController {
 	 * @param cemuDirectory
 	 * @param cemu_UIDirectory
 	 */
-	public void sync(String cloudService, String cemuDirectory, String cemu_UIDirectory) {
+	public void sync(CloudService cloudService, String cemuDirectory, String cemu_UIDirectory) {

 		// running sync in a new thread, instead of blocking the main thread
 		Thread thread = new Thread(new Runnable() {
@ -88,61 +102,59 @@ public class CloudController {
 						mwc.getPlayBtn().setText("syncing...");
 					});
 					LOGGER.info("starting synchronization in new thread ...");
-					
+
 					// zip the saves folder
 					File zipFile = zipSavegames(cemu_UIDirectory, cemuDirectory);

 					// upload the zip
 					switch (cloudService) {
-					
+
 					// use GoogleDriveController
-					case "GoogleDrive":
+					case GoogleDrive:
 						LOGGER.info("using GoogleDriveController");
 						long lastCloudSync = googleDriveController.getLastCloudSync();
-						
+
 						if (!googleDriveController.checkFolder()) {
 							LOGGER.info("cloud sync folder dosen't exist, creating one!");
 							googleDriveController.creatFolder();
 							googleDriveController.uploadZipFile(zipFile);
-						} else if (mwc.getLastLocalSync() > lastCloudSync) {
+						} else if (XMLController.getLastLocalSync() > lastCloudSync) {
 							LOGGER.info("local is new, going to upload zip");
 							googleDriveController.uploadZipFile(zipFile);
-						} else if(mwc.getLastLocalSync() < lastCloudSync) {
+						} else if (XMLController.getLastLocalSync() < lastCloudSync) {
 							LOGGER.info("cloud is new, going to download zip");
 							unzipSavegames(cemuDirectory, googleDriveController.downloadZipFile(cemu_UIDirectory));
-							mwc.setLastLocalSync(lastCloudSync);
+							XMLController.setLastLocalSync(lastCloudSync);
 							break;
 						} else {
 							LOGGER.info("nothing to do");
 							break;
 						}
-						mwc.setLastLocalSync(Long.parseLong(zipFile.getName().substring(0, zipFile.getName().length()-4))); // set time of last sucessfull sync
-						break;
-						
-						
-
-					case "Dropbox":
-
+						XMLController.setLastLocalSync(Long.parseLong(zipFile.getName().substring(0, zipFile.getName().length() - 4))); // set time of last sucessfull sync
+						break;
+
+					case Dropbox:
+						// do the thing
 						break;

-						
 					default:
 						LOGGER.warn("no cloud vendor found!");
 						break;
 					}
-					
+
 					zipFile.delete(); // delete zipfile in cem_UI directory

 					Platform.runLater(() -> {
 						mwc.getPlayBtn().setText("play");
 						mwc.getPlayBtn().setDisable(false);
-						mwc.saveSettings();
+						xmlController.saveSettings();
 					});
-					

 					LOGGER.info("synchronization successful!");
 				} catch (Exception e) {
-					LOGGER.error("There was an error during syncronisation! Please open a new issue on the cemu_UI github page:", e);
+					LOGGER.error(
+							"There was an error during syncronisation! Please open a new issue on the cemu_UI github page:",
+							e);
 				}
 			}
 		});
@ -199,28 +211,17 @@ public class CloudController {
 		}
 	}
 	
-	public String getFolderID(String cloudService) {
+	public String getFolderID(CloudService cloudService) {
 		String folderID = "";
 		if (cloudService != null) {
-			if (cloudService.equals("GoogleDrive")) {
+			if (cloudService == CloudService.GoogleDrive) {
 				folderID = googleDriveController.getFolderID();
 			}
-			if (cloudService.equals("Dropbox")) {
+			if (cloudService == CloudService.Dropbox) {

 			}
 		}
 		return folderID;
 	}
-
-	public void setFolderID(String folderID, String cloudService) {
-		if (cloudService != null) {
-			if (cloudService.equals("GoogleDrive")) {
-				googleDriveController.setFolderID(folderID);
-			}
-			if (cloudService.equals("Dropbox")) {
-
-			}
-		}
-	}
 	
 }
--- a/src/main/java/com/cemu_UI/controller/DBController.java
+++ b/src/main/java/com/cemu_UI/controller/DBController.java
@ -1,7 +1,7 @@
 /**
 * cemu_UI
 * 
- * Copyright 2017-2018  <@Seil0>
+ * Copyright 2017-2019  <@Seil0>
 * 
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@ -18,6 +18,7 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 * MA 02110-1301, USA.
 */
+
 package com.cemu_UI.controller;

 import java.awt.Graphics2D;
@ -27,6 +28,7 @@ import java.io.IOException;
 import java.net.URL;
 import java.sql.Connection;
 import java.sql.DriverManager;
+import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
@ -44,95 +46,94 @@ import org.apache.logging.log4j.Logger;
 import org.w3c.dom.Document;
 import org.xml.sax.SAXException;

-import com.cemu_UI.application.Main;
-import com.cemu_UI.application.MainWindowController;
+import com.cemu_UI.datatypes.UIROMDataType;
+
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;

 public class DBController {
-	
-	public DBController(Main main, MainWindowController mainWindowController) {
-		this.main = main;
-		this.mainWindowController = mainWindowController;
-	}
-	
-	private Main main;
-	private MainWindowController mainWindowController;
+
+	private static DBController instance = null;
 	private ArrayList<String> entries = new ArrayList<>();
-	private String DB_PATH_localRoms;
-	private String DB_PATH_games;
-	private Connection connection = null;
-	private Connection connectionGames = null;
+	private String DB_PATH_LocalGames;
+	private String DB_PATH_ReverenceGames;
+	private Connection connectionLocal = null;
+	private Connection connectionReverence = null;
 	private static final Logger LOGGER = LogManager.getLogger(DBController.class.getName());
 	
-	/**
-	 * initialize the sqlite database controller
-	 * load ROM and games database
-	 * load all games
-	 */
-	public void init() {
-		LOGGER.info("<========== starting loading sql ==========>");
-		loadRomDatabase();
-		loadGamesDatabase();
-		createRomDatabase();
-		LOGGER.info("<========== finished loading sql ==========>");
+	public DBController() {
+		
+	}
+	
+	public static DBController getInstance() {
+		if (instance == null) {
+			instance = new DBController();
+		}
+		
+		return instance;
 	}
 	
 	/**
-	 * set the path to the localRoms.db file and initialize the connection
+	 * initialize the {@link DBController} with the database connection check if
+	 * there is a need to create a new database refresh the database
+	 */
+	public void init() {
+		initDatabaseConnection();
+		createRomDatabase();
+	}
+	
+	/**
+	 * create a new connection to the HomeFlix.db database
+	 * AutoCommit is set to false to prevent some issues, so manual commit is active!
 	 * 
 	 * TODO this should be called LocalGames
 	 */
-	private void loadRomDatabase() {
-		if (System.getProperty("os.name").equals("Linux")) {
-			DB_PATH_localRoms = System.getProperty("user.home") + "/cemu_UI/localRoms.db";
-		} else {
-			DB_PATH_localRoms = System.getProperty("user.home") + "\\Documents\\cemu_UI" + "\\" + "localRoms.db";
-		}
+	private void initDatabaseConnection() {
+		DB_PATH_LocalGames = XMLController.getDirCemuUI() + "/localRoms.db";
+		DB_PATH_ReverenceGames = XMLController.getRference_gamesFile().getAbsolutePath();
+		
 		try {
 			// create a database connection
-			connection = DriverManager.getConnection("jdbc:sqlite:" + DB_PATH_localRoms);
-			connection.setAutoCommit(false); // AutoCommit to false -> manual commit is active
+			connectionLocal = DriverManager.getConnection("jdbc:sqlite:" + DB_PATH_LocalGames);
+			connectionLocal.setAutoCommit(false);
+			
+			connectionReverence = DriverManager.getConnection("jdbc:sqlite:" + DB_PATH_ReverenceGames);
+			connectionReverence.setAutoCommit(false);
 		} catch (SQLException e) {
-			// if the error message is "out of memory", probably no database file is found
-			LOGGER.error("error while loading the ROM database", e);
+			// if the error message is "out of memory", it probably means no database file is found
+			LOGGER.error("error while loading the Local- or ReverenceGames database", e);
 		}
-		LOGGER.info("ROM database loaded successfull");
+		
+		LOGGER.info("Local- and ReverenceGames database loaded successfull");
 	}
 	
-	/**
-	 * set the path to the localRoms.db file and initialize the connection
-	 * games.db contains a reverence list to for the automatic detection mode
-	 */
-	private void loadGamesDatabase() {
-		DB_PATH_games = main.getReference_gamesFile().getAbsolutePath();
-		try {
-			// create a database connection
-			connectionGames = DriverManager.getConnection("jdbc:sqlite:" + DB_PATH_games);
-			connectionGames.setAutoCommit(false); // AutoCommit to false -> manual commit is active
-		} catch (SQLException e) {
-			LOGGER.error("error while loading the games database", e);
-		}
-		LOGGER.info("games database loaded successfull");
-	}
-	
-
 	/**
 	 * creating the local_roms table in localRoms.db
 	 * if the table has no entries, call loadRomDirectory
 	 * 
-	 * TODO the local_roms table should be called local_games
+	 * TODO the local_roms table should be called LocalGames
 	 */
 	void createRomDatabase() {
 		try {
-			Statement stmt = connection.createStatement();
+			Statement stmt = connectionLocal.createStatement();
 			stmt.executeUpdate("create table if not exists local_roms (title, coverPath, romPath, titleID, productCode, region, lastPlayed, timePlayed)");
+			connectionLocal.commit();
 			stmt.close();
-			connection.commit();
 		} catch (SQLException e) {
-			LOGGER.error("error while creating ROM database", e);
+			LOGGER.error("error while creating local-games database", e);
 		}
-
+	}
+	
+	/**
+	 * refresh database to contain all (new added) games
+	 */
+	public void refreshDataBase() {
+		LOGGER.info("<========== starting refreshing database ==========>");
+		
+		entries.clear();
+		
 		try {
-			Statement stmt = connection.createStatement();
+			Statement stmt = connectionLocal.createStatement();
 			ResultSet rs = stmt.executeQuery("SELECT * FROM local_roms");
 			while (rs.next()) {
 				entries.add(rs.getString(2));
@ -142,63 +143,80 @@ public class DBController {
 		} catch (SQLException e) {
 			LOGGER.error("error while loading ROMs from ROM database, local_roms table", e);
 		}
+		
 		if (entries.size() == 0) {
-			mainWindowController.reloadRoms();
-		} else {
 			loadAllGames();
-			mainWindowController.refreshUIData();
 		}
+		
+		LOGGER.info("<========== finished refreshing database ==========>");
 	}

 	// add a game to the database
 	public void addGame(String title, String coverPath, String romPath, String titleID, String productCode, String region, String lastPlayed, String timePlayed) throws SQLException{
-		Statement stmt = connection.createStatement();
+		Statement stmt = connectionLocal.createStatement();
 		stmt.executeUpdate("insert into local_roms values ('"+title+"','"+coverPath+"','"+romPath+"','"+titleID+"',"
 				+ "'"+productCode+"','"+region+"','"+lastPlayed+"','"+timePlayed+"')");
-		connection.commit();
+		connectionLocal.commit();
 		stmt.close();
 		LOGGER.info("added \""+title+"\" to ROM database");
 	}
 	
 	// remove a game from the database
 	public void removeGame(String titleID) throws SQLException{
-		Statement stmt = connection.createStatement();
+		Statement stmt = connectionLocal.createStatement();
 		stmt.executeUpdate("delete from local_roms where titleID = '"+titleID+"'");
-		connection.commit();
+		connectionLocal.commit();
 		stmt.close();
 		LOGGER.info("removed \""+titleID+"\" from ROM database");
 	}
 	
-	//load all ROMs to the mainWindowController
-	public void loadAllGames(){
-		LOGGER.info("loading all games on startup into the mainWindowController ...");
-		try { 
-			Statement stmt = connection.createStatement(); 
+	/**
+	 * load all games from the database to a ObservableList, order entries by title
+	 * @return a ObservableList that contains all local games from the database
+	 */
+	public ObservableList<UIROMDataType> loadAllGames() {
+		ObservableList<UIROMDataType> games = FXCollections.observableArrayList();
+		LOGGER.info("loading all local games from the database ...");
+		try {
+			Statement stmt = connectionLocal.createStatement(); 
 			ResultSet rs = stmt.executeQuery("SELECT * FROM local_roms"); 
 			while (rs.next()) {
-				mainWindowController.addGame(rs.getString(1), rs.getString(2), rs.getString(3), rs.getString(4));
+				games.add(new UIROMDataType(rs.getString("romPath"), rs.getString("titleID"), rs.getString("title"),
+						rs.getString("coverPath")));
 			}
 			stmt.close();
 			rs.close();
-		}catch (Exception e){
-			LOGGER.error("error while loading all games into the mainWindowController", e);
+		} catch (Exception e) {
+			LOGGER.error("error while loading all local games from the database", e);
 		}
+		
+		return games;
 	}
 	
-	//load a single ROM to the mainWindowController
-	public void loadSingleGame(String titleID){
-		LOGGER.info("loading a single game (ID: "+titleID+") into the mainWindowController ..."); 
+	/**
+	 * load one game from the database
+	 * @param titleID	the titleID of the game you wish to get
+	 * @return			the game you asked for
+	 */
+	public UIROMDataType loadSingleGame(String titleID) {
+		UIROMDataType game = null;
+		LOGGER.info("loading a single game (ID: {}) from the database ...", titleID);
 		try { 
-			Statement stmt = connection.createStatement(); 
-			ResultSet rs = stmt.executeQuery("SELECT * FROM local_roms where titleID = '"+titleID+"'"); 
+			PreparedStatement ps = connectionLocal.prepareStatement("SELECT * FROM local_roms where titleID = ?");
+			ps.setString(1, titleID);
+			ResultSet rs = ps.executeQuery();
+			
 			while (rs.next()) {
-				mainWindowController.addGame(rs.getString(1), rs.getString(2), rs.getString(3), rs.getString(4));
+				game = new UIROMDataType(rs.getString("romPath"), rs.getString("titleID"), rs.getString("title"),
+						rs.getString("coverPath"));
 			}
-			stmt.close();
 			rs.close();
+			ps.close();
 		}catch (Exception e){
 			LOGGER.error("error while loading a single game into the mainWindowController", e);
 		}
+		
+		return game;
 	}
 	
 	/**
@ -209,10 +227,10 @@ public class DBController {
 		File dir = new File(directory);
 		File appFile;
 		String[] extensions = new String[] { "rpx", "jsp" };
-		File pictureCache = main.getPictureCache();
+		File pictureCache = XMLController.getPictureCache();
 		String coverPath;	
 		try {
-			Statement stmt = connectionGames.createStatement();
+			Statement stmt = connectionReverence.createStatement();
 			List<File> files = (List<File>) FileUtils.listFiles(dir, extensions, true);
 			LOGGER.info("<============================== start loading ROM Directory ==============================>");
 			LOGGER.info("Getting all .rpx files in " + dir.getCanonicalPath()+" including those in subdirectories");
@ -258,7 +276,7 @@ public class DBController {
 	 * @throws SQLException
 	 */
 	private boolean checkAddEntry(String title) throws SQLException{
-		Statement stmt = connection.createStatement();
+		Statement stmt = connectionLocal.createStatement();
 		boolean check = false;
 		ResultSet rs = stmt.executeQuery("SELECT * FROM local_roms WHERE title = '"+title+"';");
 		while (rs.next()) {
@ -276,15 +294,6 @@ public class DBController {
 		//LOGGER.info("check if entry removed not done yet!");
 	}
 	
-	private static BufferedImage resizeImage(BufferedImage originalImage, int type, int IMG_WIDTH, int IMG_HEIGHT) {
-	    BufferedImage resizedImage = new BufferedImage(IMG_WIDTH, IMG_HEIGHT, type);
-	    Graphics2D g = resizedImage.createGraphics();
-	    g.drawImage(originalImage, 0, 0, IMG_WIDTH, IMG_HEIGHT, null);
-	    g.dispose();
-
-	    return resizedImage;
-	}
-	
 	/**
 	 * getting info for a game with titleID
 	 * @param titleID Title-ID of the Game
@ -294,7 +303,7 @@ public class DBController {
 		String[] gameInfo = new String[4];
 		LOGGER.info("getting game info for titleID: "+titleID+" ..."); 
 		try { 
-			Statement stmt = connection.createStatement(); 
+			Statement stmt = connectionLocal.createStatement(); 
 			ResultSet rs = stmt.executeQuery("SELECT * FROM local_roms where titleID = '"+titleID+"'"); 
 			while (rs.next()) {
 				gameInfo[0] = rs.getString(1);// title
@ -313,10 +322,10 @@ public class DBController {
 	public void setGameInfo(String title, String coverPath, String romPath, String titleID){
 		LOGGER.info("setting game info for titleID: "+titleID+" ..."); 
 		try { 
-			Statement stmt = connection.createStatement(); 
+			Statement stmt = connectionLocal.createStatement(); 
 			stmt.executeUpdate("UPDATE local_roms SET title = '" + title + "', coverPath = '" + coverPath + "',"
 					+ " romPath = '" + romPath + "' WHERE titleID = '"+titleID+"';");
-			connection.commit();
+			connectionLocal.commit();
 			stmt.close();	
 		}catch (Exception e){
 			LOGGER.error("error while setting game info", e);
@ -325,9 +334,9 @@ public class DBController {
 	
 	public void setLastPlayed(String titleID){
 		try{
-			Statement stmt = connection.createStatement(); 
+			Statement stmt = connectionLocal.createStatement(); 
 			stmt.executeUpdate("UPDATE local_roms SET lastPlayed=date('now') WHERE titleID = '"+titleID+"';");
-			connection.commit();
+			connectionLocal.commit();
 			stmt.close();
 		}catch(SQLException e){
 			LOGGER.error("failed to set the last played", e);
@ -337,7 +346,7 @@ public class DBController {
 	public String getLastPlayed(String titleID){
 		String lastPlayed = null;
 		try{
-			Statement stmt = connection.createStatement(); 
+			Statement stmt = connectionLocal.createStatement(); 
 			ResultSet rs = stmt.executeQuery("SELECT lastPlayed FROM local_roms WHERE titleID = '"+titleID+"';" );
 			lastPlayed = rs.getString(1);
 			stmt.close();
@ -350,9 +359,9 @@ public class DBController {
 	
 	public void setTotalPlaytime(String timePlayed, String titleID){
 		try{
-			Statement stmt = connection.createStatement(); 
+			Statement stmt = connectionLocal.createStatement(); 
 			stmt.executeUpdate("UPDATE local_roms SET timePlayed='"+timePlayed+"' WHERE titleID = '"+titleID+"';");
-			connection.commit();
+			connectionLocal.commit();
 			stmt.close();
 		}catch(SQLException e){
 			LOGGER.error("failed to set total play time", e);
@ -363,7 +372,7 @@ public class DBController {
 	public String getTotalPlaytime(String titleID){
 		String timePlayed = null;
 		try{
-			Statement stmt = connection.createStatement(); 
+			Statement stmt = connectionLocal.createStatement(); 
 			ResultSet rs = stmt.executeQuery("SELECT timePlayed FROM local_roms WHERE titleID = '"+titleID+"';" );
 			timePlayed = rs.getString(1);
 			stmt.close();
@ -374,5 +383,13 @@ public class DBController {
 		return timePlayed;
 	}
 	
+	private static BufferedImage resizeImage(BufferedImage originalImage, int type, int IMG_WIDTH, int IMG_HEIGHT) {
+	    BufferedImage resizedImage = new BufferedImage(IMG_WIDTH, IMG_HEIGHT, type);
+	    Graphics2D g = resizedImage.createGraphics();
+	    g.drawImage(originalImage, 0, 0, IMG_WIDTH, IMG_HEIGHT, null);
+	    g.dispose();
+
+	    return resizedImage;
+	}
 	
 }
--- a/src/main/java/com/cemu_UI/controller/SmmdbAPIController.java
+++ b/src/main/java/com/cemu_UI/controller/SmmdbAPIController.java
@ -1,7 +1,7 @@
 /**
 * cemu_UI
 * 
- * Copyright 2017-2018  <@Seil0>
+ * Copyright 2017-2019  <@Seil0>
 * 
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@ -18,6 +18,7 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 * MA 02110-1301, USA.
 */
+
 package com.cemu_UI.controller;

 import java.io.BufferedReader;
--- a/src/main/java/com/cemu_UI/controller/UpdateController.java
+++ b/src/main/java/com/cemu_UI/controller/UpdateController.java
@ -1,7 +1,7 @@
 /**
 * cemu_UI
 * 
- * Copyright 2017-2018  <@Seil0>
+ * Copyright 2017-2019  <@Seil0>
 * 
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@ -18,6 +18,7 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 * MA 02110-1301, USA.
 */
+
 package com.cemu_UI.controller;

 import java.io.BufferedReader;
@ -39,21 +40,22 @@ import com.eclipsesource.json.Json;
 import com.eclipsesource.json.JsonArray;
 import com.eclipsesource.json.JsonObject;
 import com.eclipsesource.json.JsonValue;
+
 import javafx.application.Platform;

 public class UpdateController implements Runnable {

 	private MainWindowController mainWindowController;
-	private String buildNumber;
+	private int buildNumber;
+	private int updateBuildNumber; // tag_name from gitea
 	private String apiOutput;
-	private String updateBuildNumber; // tag_name from Github
-//	private String updateName;
-//	private String updateChanges;
-	private String browserDownloadUrl; // update download link
-	private String githubApiRelease = "https://api.github.com/repos/Seil0/cemu_UI/releases/latest";
-	private String githubApiBeta = "https://api.github.com/repos/Seil0/cemu_UI/releases";
-	
-	private URL githubApiUrl;
+	@SuppressWarnings("unused")
+	private String updateName;
+	@SuppressWarnings("unused")
+	private String updateChanges;
+	private String browserDownloadUrl; // update download link	
+	private String giteaApiRelease = "https://git.mosad.xyz/api/v1/repos/Seil0/cemu_UI/releases";
+	private URL giteaApiUrl;
 	private boolean useBeta;
 	private static final Logger LOGGER = LogManager.getLogger(UpdateController.class.getName());

@ -62,7 +64,7 @@ public class UpdateController implements Runnable {
 	 */
 	public UpdateController(MainWindowController mwc, String buildNumber, boolean useBeta) {
 		mainWindowController = mwc;
-		this.buildNumber = buildNumber;
+		this.buildNumber = Integer.parseInt(buildNumber);
 		this.useBeta = useBeta;
 	}

@ -70,19 +72,13 @@ public class UpdateController implements Runnable {
 	public void run() {
 		LOGGER.info("beta:" + useBeta + "; checking for updates ...");
 		Platform.runLater(() -> {
-			mainWindowController.getUpdateBtn().setText(mainWindowController.getBundle().getString("updateBtnChecking"));
+			mainWindowController.getUpdateBtn().setText(XMLController.getLocalBundle().getString("updateBtnChecking"));
 		});

 		try {
-
-			if (useBeta) {
-				githubApiUrl = new URL(githubApiBeta);
-			} else {
-				githubApiUrl = new URL(githubApiRelease);
-			}
-
-			// URL githubApiUrl = new URL(githubApiRelease);
-			BufferedReader ina = new BufferedReader(new InputStreamReader(githubApiUrl.openStream()));
+			giteaApiUrl = new URL(giteaApiRelease);
+			
+			BufferedReader ina = new BufferedReader(new InputStreamReader(giteaApiUrl.openStream()));
 			apiOutput = ina.readLine();
 			ina.close();
 		} catch (IOException e) {
@ -90,50 +86,42 @@ public class UpdateController implements Runnable {
 				LOGGER.error("could not check update version", e);
 			});
 		}
-
-		if (useBeta) {
-			JsonArray objectArray = Json.parse("{\"items\": " + apiOutput + "}").asObject().get("items").asArray();
-			JsonValue object = objectArray.get(0);
-			JsonArray objectAssets = object.asObject().get("assets").asArray();
-
-			updateBuildNumber = object.asObject().getString("tag_name", "");
-//			updateName = object.asObject().getString("name", "");
-//			updateChanges = object.asObject().getString("body", "");
-
-			for (JsonValue asset : objectAssets) {
-				browserDownloadUrl = asset.asObject().getString("browser_download_url", "");
-			}
-
-		} else {
-			JsonObject object = Json.parse(apiOutput).asObject();
-			JsonArray objectAssets = Json.parse(apiOutput).asObject().get("assets").asArray();
-
-			updateBuildNumber = object.getString("tag_name", "");
-//			updateName = object.getString("name", "");
-//			updateChanges = object.getString("body", "");
-			for (JsonValue asset : objectAssets) {
-				browserDownloadUrl = asset.asObject().getString("browser_download_url", "");
-
+		
+		JsonArray objectArray = Json.parse("{\"items\": " + apiOutput + "}").asObject().get("items").asArray();
+		JsonValue object = objectArray.get(0).asObject(); // set to the latest release as default
+		JsonObject objectAsset = object.asObject().get("assets").asArray().get(0).asObject();
+		
+		for(JsonValue objectIt : objectArray) {
+			// TODO note this will download still the pre-release if there's a more recent stable version
+			if(objectIt.asObject().getBoolean("prerelease", false) == useBeta) {
+				// we found the needed release either beta or not
+				object = objectIt;
+				objectAsset = objectIt.asObject().get("assets").asArray().get(0).asObject();
+				break;
 			}
 		}
+		
+		updateBuildNumber = Integer.parseInt(object.asObject().getString("tag_name", ""));
+		updateName = object.asObject().getString("name", "");
+		updateChanges = object.asObject().getString("body", "");

 		LOGGER.info("Build: " + buildNumber + ", Update: " + updateBuildNumber);

-		// Compares the program BuildNumber with the current BuildNumber if program
-		// BuildNumber < current BuildNumber then perform a update
-		int iversion = Integer.parseInt(buildNumber);
-		int iaktVersion = Integer.parseInt(updateBuildNumber.replace(".", ""));
-
-		if (iversion >= iaktVersion) {
+		/**
+		 * Compare the program BuildNumber with the current BuildNumber
+		 * if buildNumber < updateBuildNumber then perform a update
+		 */
+		if (buildNumber >= updateBuildNumber) {
 			Platform.runLater(() -> {
-				mainWindowController.getUpdateBtn().setText(mainWindowController.getBundle().getString("updateBtnNoUpdateAvailable"));
+				mainWindowController.getUpdateBtn().setText(XMLController.getLocalBundle().getString("updateBtnNoUpdateAvailable"));
 			});
 			LOGGER.info("no update available");
 		} else {
 			Platform.runLater(() -> {
-				mainWindowController.getUpdateBtn().setText(mainWindowController.getBundle().getString("updateBtnUpdateAvailable"));
+				mainWindowController.getUpdateBtn().setText(XMLController.getLocalBundle().getString("updateBtnUpdateAvailable"));
 			});
 			LOGGER.info("update available");
+			browserDownloadUrl = objectAsset.getString("browser_download_url", "");
 			LOGGER.info("download link: " + browserDownloadUrl);
 			try {
 				// open new Http connection, ProgressMonitorInputStream for downloading the data
@ -148,7 +136,7 @@ public class UpdateController implements Runnable {
 				org.apache.commons.io.FileUtils.copyFile(new File("cemu_UI_update.jar"), new File("cemu_UI.jar"));
 				org.apache.commons.io.FileUtils.deleteQuietly(new File("cemu_UI_update.jar")); // delete update
 				new ProcessBuilder("java", "-jar", "cemu_UI.jar").start(); // start the new application
-				System.exit(0); // finishes itself
+				System.exit(0); // close the current application
 			} catch (IOException e) {
 				Platform.runLater(() -> {
 					LOGGER.info("could not download update files", e);
--- a/src/main/java/com/cemu_UI/controller/XMLController.java
+++ b/src/main/java/com/cemu_UI/controller/XMLController.java
@ -0,0 +1,419 @@
+/**
+ * cemu_UI
+ * 
+ * Copyright 2017-2019  <@Seil0>
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+package com.cemu_UI.controller;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.Locale;
+import java.util.Properties;
+import java.util.ResourceBundle;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import com.cemu_UI.datatypes.GlobalDataTypes.CloudService;
+
+public class XMLController {
+
+	private static final String userHome = System.getProperty("user.home");
+	private static final String userName = System.getProperty("user.name");
+	private static final String osName = System.getProperty("os.name");
+	private static final String osArch = System.getProperty("os.arch");
+	private static final String osVers = System.getProperty("os.version");
+	private static final String javaVers = System.getProperty("java.version");
+	private static final String javaVend = System.getProperty("java.vendor");
+	private static final String sysLocal = System.getProperty("user.language") + "_" + System.getProperty("user.country");
+	private static String dirCemuUIPath;
+	private static File dirCemuUI;
+	private static File configFile;
+	private static File gamesDBFile;
+	private static File reference_gamesFile;
+	private static File pictureCache;
+	
+	// user settings
+	private static String color = "00a8cc";
+	private static String usrLocal = sysLocal;
+	private static boolean autoUpdate = false;
+	private static boolean useBeta = false;
+	private static boolean fullscreen = false;
+	private static boolean cloudSync = false;
+	private static ResourceBundle localBundle = ResourceBundle.getBundle("locals.cemu_UI-Local", Locale.US);
+	
+	private static String cemuPath;
+	private static String romDirectoryPath;
+	private static String folderID;
+	private static CloudService cloudService;
+	private static long lastLocalSync;
+	private static double windowWidth;
+	private static double windowHeight;
+	
+	
+	private static final Logger LOGGER = LogManager.getLogger(XMLController.class.getName());
+	private Properties props = new Properties();
+
+	public XMLController() {
+		
+		if (osName.contains("Windows")) {
+			dirCemuUIPath = userHome + "/Documents/cemu_UI";
+		} else {
+			dirCemuUIPath = userHome + "/cemu_UI";
+		}
+		
+		// set the concrete files
+		dirCemuUI = new File(dirCemuUIPath);
+		configFile = new File(dirCemuUI + "/config.xml");
+		gamesDBFile = new File(dirCemuUI + "/games.db");
+		reference_gamesFile = new File(dirCemuUI + "/reference_games.db");
+		pictureCache= new File(dirCemuUI+"/picture_cache");
+	}
+	
+	/**
+     * save settings to the config.xml file
+     */
+	public void saveSettings() {
+		LOGGER.info("saving Settings ...");
+
+		try {
+			props.setProperty("cemuPath", getCemuPath());
+			props.setProperty("romPath", getRomDirectoryPath());
+			props.setProperty("color", getColor());
+			props.setProperty("language", getUsrLocal());
+			props.setProperty("fullscreen", String.valueOf(isFullscreen()));
+			props.setProperty("cloudSync", String.valueOf(isCloudSync()));
+			props.setProperty("autoUpdate", String.valueOf(isAutoUpdate()));
+			props.setProperty("useBeta", String.valueOf(isUseBeta()));
+			if (getCloudService() == null) {
+				props.setProperty("cloudService", "");
+				props.setProperty("folderID", "");
+				props.setProperty("lastLocalSync", "");
+			} else {
+				props.setProperty("cloudService", getCloudService().toString());
+				props.setProperty("folderID", getFolderID());
+				props.setProperty("lastLocalSync", Long.toString(getLastLocalSync()));
+			}
+
+			props.setProperty("windowWidth", Double.toString(getWindowWidth()));
+			props.setProperty("windowHeight", Double.toString(getWindowHeight()));
+
+			OutputStream outputStream = new FileOutputStream(XMLController.getConfigFile()); // new output-stream
+			props.storeToXML(outputStream, "cemu_UI settings"); // write new .xml
+			outputStream.close();
+			LOGGER.info("saving Settings done!");
+		} catch (IOException e) {
+			LOGGER.error("an error occured", e);
+		}
+	}
+	
+	/**
+     * loading saved settings from the config.xml file
+     * if a value is not present, default is used instead
+     */
+	public void loadSettings() {
+		LOGGER.info("loading settings ...");
+		try {
+			InputStream inputStream = new FileInputStream(XMLController.getConfigFile());
+			props.loadFromXML(inputStream); // new input-stream from .xml
+
+			try {
+				setCemuPath(props.getProperty("cemuPath"));
+			} catch (Exception e) {
+				LOGGER.error("cloud not load cemuPath", e);
+				setCemuPath("");
+			}
+
+			try {
+				setRomDirectoryPath(props.getProperty("romPath"));
+			} catch (Exception e) {
+				LOGGER.error("could not load romPath", e);
+				setRomDirectoryPath("");
+			}
+
+			try {
+				setColor(props.getProperty("color"));
+			} catch (Exception e) {
+				LOGGER.error("could not load color value, setting default instead", e);
+				setColor("00a8cc");
+			}
+
+			if (props.getProperty("language") == null) {
+				LOGGER.error("cloud not load language, setting default instead");
+				setUsrLocal("en_US");
+			} else {
+				setUsrLocal(props.getProperty("language"));
+			}
+
+			try {
+				setFullscreen(Boolean.parseBoolean(props.getProperty("fullscreen")));
+			} catch (Exception e) {
+				LOGGER.error("could not load fullscreen, setting default instead", e);
+				setFullscreen(false);
+			}
+
+			try {
+				setCloudSync(Boolean.parseBoolean(props.getProperty("cloudSync")));
+			} catch (Exception e) {
+				LOGGER.error("could not load cloudSync, setting default instead", e);
+				setCloudSync(false);
+			}
+
+			try {
+				setAutoUpdate(Boolean.parseBoolean(props.getProperty("autoUpdate")));
+			} catch (Exception e) {
+				LOGGER.error("cloud not load autoUpdate", e);
+				setAutoUpdate(false);
+			}
+
+			try {
+				setUseBeta(Boolean.parseBoolean(props.getProperty("useBeta")));
+			} catch (Exception e) {
+				LOGGER.error("cloud not load autoUpdate", e);
+				setUseBeta(false);
+			}
+
+			try {
+				switch (props.getProperty("cloudService")) {
+				case "GoogleDrive":
+					setCloudService(CloudService.GoogleDrive);
+					break;
+				case "Dropbox":
+					setCloudService(CloudService.Dropbox);
+					break;
+				default:
+					break;
+				}
+			} catch (Exception e) {
+				LOGGER.error("could not load cloudSync", e);
+				setCloudService(null);
+			}
+
+			try {
+				setFolderID(props.getProperty("folderID"));
+			} catch (Exception e) {
+				LOGGER.error("could not load folderID, disable cloud sync. Please contact an developer", e);
+				setCloudSync(false);
+			}
+
+			try {
+				setLastLocalSync(Long.parseLong(props.getProperty("lastLocalSync")));
+			} catch (Exception e) {
+				LOGGER.error("could not load lastSuccessSync, setting default instead", e);
+				setLastLocalSync(0);
+			}
+
+			try {
+				setWindowWidth(Double.parseDouble(props.getProperty("windowWidth")));
+			} catch (Exception e) {
+				LOGGER.error("could not load windowWidth, setting default instead", e);
+				setWindowWidth(904);
+			}
+
+			try {
+				setWindowHeight(Double.parseDouble(props.getProperty("windowHeight")));
+			} catch (Exception e) {
+				LOGGER.error("could not load windowHeight, setting default instead", e);
+				setWindowHeight(600);
+			}
+
+			inputStream.close();
+			LOGGER.info("loading settings done!");
+		} catch (IOException e) {
+			LOGGER.error("an error occured", e);
+		}
+	}
+	
+	// getters for application variables
+
+	public static String getUserHome() {
+		return userHome;
+	}
+
+	public static String getUserName() {
+		return userName;
+	}
+
+	public static String getOsName() {
+		return osName;
+	}
+
+	public static String getOsArch() {
+		return osArch;
+	}
+
+	public static String getOsVers() {
+		return osVers;
+	}
+
+	public static String getJavaVers() {
+		return javaVers;
+	}
+
+	public static String getJavaVend() {
+		return javaVend;
+	}
+
+	public static String getSysLocal() {
+		return sysLocal;
+	}
+
+	public static String getDirCemuUIPath() {
+		return dirCemuUIPath;
+	}
+
+	public static File getDirCemuUI() {
+		return dirCemuUI;
+	}
+
+	public static File getConfigFile() {
+		return configFile;
+	}
+
+	public static File getGamesDBFile() {
+		return gamesDBFile;
+	}
+
+	public static File getRference_gamesFile() {
+		return reference_gamesFile;
+	}
+
+	public static File getPictureCache() {
+		return pictureCache;
+	}
+
+	// getters & setters for user settings
+
+	public static String getColor() {
+		return color;
+	}
+
+	public static void setColor(String color) {
+		XMLController.color = color;
+	}
+
+	public static String getUsrLocal() {
+		return usrLocal;
+	}
+
+	public static void setUsrLocal(String usrLocal) {
+		XMLController.usrLocal = usrLocal;
+	}
+
+	public static boolean isAutoUpdate() {
+		return autoUpdate;
+	}
+
+	public static void setAutoUpdate(boolean autoUpdate) {
+		XMLController.autoUpdate = autoUpdate;
+	}
+
+	public static boolean isUseBeta() {
+		return useBeta;
+	}
+
+	public static void setUseBeta(boolean useBeta) {
+		XMLController.useBeta = useBeta;
+	}
+
+	public static boolean isFullscreen() {
+		return fullscreen;
+	}
+
+	public static void setFullscreen(boolean fullscreen) {
+		XMLController.fullscreen = fullscreen;
+	}
+
+	public static boolean isCloudSync() {
+		return cloudSync;
+	}
+
+	public static void setCloudSync(boolean cloudSync) {
+		XMLController.cloudSync = cloudSync;
+	}
+	
+	public static ResourceBundle getLocalBundle() {
+		return localBundle;
+	}
+
+	public static void setLocalBundle(ResourceBundle localBundle) {
+		XMLController.localBundle = localBundle;
+	}
+
+	public static String getCemuPath() {
+		return cemuPath;
+	}
+
+	public static void setCemuPath(String cemuPath) {
+		XMLController.cemuPath = cemuPath;
+	}
+
+	public static String getRomDirectoryPath() {
+		return romDirectoryPath;
+	}
+
+	public static void setRomDirectoryPath(String romDirectoryPath) {
+		XMLController.romDirectoryPath = romDirectoryPath;
+	}
+	
+	
+	public static String getFolderID() {
+		return folderID;
+	}
+
+	public static void setFolderID(String folderID) {
+		XMLController.folderID = folderID;
+	}
+
+	public static CloudService getCloudService() {
+		return cloudService;
+	}
+
+	public static void setCloudService(CloudService cloudService) {
+		XMLController.cloudService = cloudService;
+	}
+
+	public static long getLastLocalSync() {
+		return lastLocalSync;
+	}
+
+	public static void setLastLocalSync(long lastLocalSync) {
+		XMLController.lastLocalSync = lastLocalSync;
+	}
+
+	public static double getWindowWidth() {
+		return windowWidth;
+	}
+
+	public static void setWindowWidth(double windowWidth) {
+		XMLController.windowWidth = windowWidth;
+	}
+
+	public static double getWindowHeight() {
+		return windowHeight;
+	}
+
+	public static void setWindowHeight(double windowHeight) {
+		XMLController.windowHeight = windowHeight;
+	}
+}
--- a/src/main/java/com/cemu_UI/datatypes/CourseTableDataType.java
+++ b/src/main/java/com/cemu_UI/datatypes/CourseTableDataType.java
@ -1,7 +1,7 @@
 /**
 * cemu_UI
 * 
- * Copyright 2017-2018  <@Seil0>
+ * Copyright 2017-2019  <@Seil0>
 * 
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@ -18,6 +18,7 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 * MA 02110-1301, USA.
 */
+
 package com.cemu_UI.datatypes;

 import com.jfoenix.controls.datamodels.treetable.RecursiveTreeObject;
--- a/src/main/java/com/cemu_UI/datatypes/GlobalDataTypes.java
+++ b/src/main/java/com/cemu_UI/datatypes/GlobalDataTypes.java
@ -0,0 +1,29 @@
+/**
+ * cemu_UI
+ * 
+ * Copyright 2017-2019  <@Seil0>
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+package com.cemu_UI.datatypes;
+
+public class GlobalDataTypes {
+
+	public enum CloudService {
+		GoogleDrive, Dropbox
+	}
+}
--- a/src/main/java/com/cemu_UI/datatypes/SmmdbApiDataType.java
+++ b/src/main/java/com/cemu_UI/datatypes/SmmdbApiDataType.java
@ -1,7 +1,7 @@
 /**
 * cemu_UI
 * 
- * Copyright 2017-2018  <@Seil0>
+ * Copyright 2017-2019  <@Seil0>
 * 
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@ -18,6 +18,7 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 * MA 02110-1301, USA.
 */
+
 package com.cemu_UI.datatypes;

 import javafx.beans.property.IntegerProperty;
--- a/src/main/java/com/cemu_UI/datatypes/UIROMDataType.java
+++ b/src/main/java/com/cemu_UI/datatypes/UIROMDataType.java
@ -1,7 +1,7 @@
 /**
 * cemu_UI
 * 
- * Copyright 2017-2018  <@Seil0>
+ * Copyright 2017-2019  <@Seil0>
 * 
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@ -18,109 +18,114 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 * MA 02110-1301, USA.
 */
+
 package com.cemu_UI.datatypes;

+import java.io.File;
+
 import com.jfoenix.controls.JFXButton;

-import javafx.beans.property.SimpleObjectProperty;
-import javafx.beans.property.SimpleStringProperty;
-import javafx.beans.property.StringProperty;
+import javafx.geometry.Insets;
+import javafx.scene.control.ContextMenu;
 import javafx.scene.control.Label;
+import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
 import javafx.scene.layout.VBox;
+import javafx.scene.text.Font;
+import javafx.scene.text.FontWeight;

-public class UIROMDataType {
+public class UIROMDataType extends VBox {
+	
+	private String romPath;
+	private String titleID;
+	private String name;
+	private Label label = new Label();
+	private JFXButton button = new JFXButton();
+	private ImageView imageView = new ImageView();
+	
+	public UIROMDataType(String romPath, String titleID, String name, String coverPath) {
+		this();
+		
+		this.romPath = romPath;
+		this.titleID = titleID;
+		this.name = name;
+		
+		label.setText(name);
+		imageView.setImage(new Image(new File(coverPath).toURI().toString()));
+	}
+	
+	public UIROMDataType(String romPath, String titleID, String name, String coverPath, ContextMenu contextMenu) {
+		this();
+		
+		this.romPath = romPath;
+		this.titleID = titleID;	
+		this.name = name;
+		
+		label.setText(name);
+		imageView.setImage(new Image(new File(coverPath).toURI().toString()));
+		button.setContextMenu(contextMenu);
+	}
+	
+	public UIROMDataType() {
+		super.getChildren().addAll(label, button);
+		
+		label.setMaxWidth(200);
+		label.setPadding(new Insets(0,0,0,8));
+		label.setFont(Font.font("System", FontWeight.BOLD, 14));
+		
+		imageView.setFitHeight(300);
+		imageView.setFitWidth(200);
+		
+		button.setStyle("-fx-effect: dropshadow(three-pass-box, rgba(0,0,0,0.8), 10, 0, 0, 3); ");
+		button.setGraphic(imageView);
+	}

-	private final SimpleObjectProperty<VBox> vBox = new SimpleObjectProperty<>();
-	private final SimpleObjectProperty<Label> label = new SimpleObjectProperty<>();
-	private final SimpleObjectProperty<JFXButton> button = new SimpleObjectProperty<>();
-	private final SimpleObjectProperty<ImageView> imageView = new SimpleObjectProperty<>();
-	private final StringProperty titleID = new SimpleStringProperty();
-	private final StringProperty romPath = new SimpleStringProperty();
-	
-	/**
-	 * Data type used for UI ROM elements all uiROMElemts are of this data type
-	 */
-	public UIROMDataType (final VBox vBox, final Label label, final JFXButton button, final ImageView imageView, final String titleID, final String romPath){
-		this.vBox.set(vBox);
-		this.label.set(label);
-		this.button.set(button);
-		this.imageView.set(imageView);
-		this.titleID.set(titleID);
-		this.romPath.set(romPath);
-	}
-	
-	public SimpleObjectProperty<VBox> vBoxProperty(){
-		return vBox;
-	}
-	
-	public SimpleObjectProperty<Label> labelProperty(){
-		return label;
-	}
-	
-	public SimpleObjectProperty<JFXButton> buttonProperty(){
-		return button;
-	}
-	
-	public SimpleObjectProperty<ImageView> imageViewProperty(){
-		return imageView;
-	}
-	
-	public StringProperty titleIDProperty(){
-		return titleID;
-	}
-	
-	public StringProperty romPathProperty(){
+	public String getRomPath() {
 		return romPath;
 	}
 	
-	
-	public final VBox getVBox() {
-		return vBoxProperty().get();
+	public String getTitleID() {
+		return titleID;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public Label getLabel() {
+		return label;
+	}
+
+	public JFXButton getButton() {
+		return button;
+	}
+
+	public ImageView getImageView() {
+		return imageView;
 	}
 	
-	public final Label getLabel() {
-		return labelProperty().get();
+	public void setRomPath(String romPath) {
+		this.romPath = romPath;
+	}
+
+	public void setTitleID(String titleID) {
+		this.titleID = titleID;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public void setLabel(Label label) {
+		this.label = label;
+	}
+
+	public void setButton(JFXButton button) {
+		this.button = button;
+	}
+
+	public void setImageView(ImageView imageView) {
+		this.imageView = imageView;
 	}
 	
-	public final JFXButton getButton() {
-		return buttonProperty().get();
-	}
-	
-	public final ImageView getImageView() {
-		return imageViewProperty().get();
-	}
-	
-	public final String getTitleID(){
-		return titleIDProperty().get();
-	}
-	
-	public final String getRomPath(){
-		return romPathProperty().get();
-	}
-	
-	
-	public final void setVBox(VBox vBox) {
-		vBoxProperty().set(vBox);
-	}
-	
-	public final void setLabel(Label label) {
-		labelProperty().set(label);
-	}
-	
-	public final void setButton(JFXButton button) {
-		buttonProperty().set(button);
-	}
-	
-	public final void setImageView(ImageView imageView) {
-		imageViewProperty().set(imageView);
-	}
-	
-	public final void setTitleID(String titleID){
-		titleIDProperty().set(titleID);
-	}
-	
-	public final void setRomPath(String romPath){
-		romPathProperty().set(romPath);
-	}
 }
--- a/src/main/java/com/cemu_UI/uiElements/JFXEditGameAlert.java
+++ b/src/main/java/com/cemu_UI/uiElements/JFXEditGameAlert.java
@ -0,0 +1,250 @@
+/**
+ * cemu_UI
+ * 
+ * Copyright 2017-2019  <@Seil0>
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+package com.cemu_UI.uiElements;
+
+import java.io.File;
+
+import com.cemu_UI.application.MainWindowController;
+import com.cemu_UI.controller.XMLController;
+import com.jfoenix.controls.JFXAlert;
+import com.jfoenix.controls.JFXButton;
+import com.jfoenix.controls.JFXDialogLayout;
+
+import javafx.event.ActionEvent;
+import javafx.geometry.Insets;
+import javafx.scene.control.Label;
+import javafx.scene.control.TextField;
+import javafx.scene.layout.GridPane;
+import javafx.scene.layout.VBox;
+import javafx.scene.text.Text;
+import javafx.stage.FileChooser;
+import javafx.stage.Stage;
+
+public class JFXEditGameAlert {
+	
+	private String headingText;
+	private String bodyText;
+	private String title = "";
+	private String coverPath = "";
+	private String romPath = "";
+	private String titleID = "";
+	private String btnStyle;
+	private int mode;
+	private Stage stage;
+	private MainWindowController mwc; // TODO remove this!
+	
+	/**
+	 * Creates a new JFoenix Alert to show some information with okay and cancel option
+	 * @param headingText	Heading text of the alert
+	 * @param bodyText		Content text of the alert
+	 * @param btnStyle		Style of the buttons
+	 * @param mode			Set to 0 for add and 1 for edit mode
+	 * @param stage			Stage to which the Alert belongs
+	 * @param mwc			a mwc dep, it's horrible i know
+	 */
+	public JFXEditGameAlert(String headingText, String bodyText, String btnStyle, int mode, Stage stage, MainWindowController mwc) {
+		this.headingText = headingText;
+		this.bodyText = bodyText;
+		this.btnStyle = btnStyle;
+		this.mode = mode;
+		this.stage = stage;
+		this.mwc = mwc;
+	}
+	
+	public void showAndWait( ) {
+		JFXAlert<Void> alert = new JFXAlert<>(stage);
+		
+    	TextField gameTitleTF = new TextField();
+    	gameTitleTF.setPromptText(XMLController.getLocalBundle().getString("gameTitle"));
+    	TextField gameTitleIDTF = new TextField();
+    	gameTitleIDTF.setPromptText(XMLController.getLocalBundle().getString("titleID"));
+    	TextField romPathTF = new TextField();
+    	romPathTF.setPromptText(XMLController.getLocalBundle().getString("romPath"));
+    	TextField gameCoverTF = new TextField();
+    	gameCoverTF.setPromptText(XMLController.getLocalBundle().getString("coverPath"));
+    	
+    	if (mode == 1) {
+			gameTitleTF.setText(title);
+			gameTitleIDTF.setText(titleID);
+			romPathTF.setText(romPath);
+			gameCoverTF.setText(coverPath);
+			
+			gameTitleIDTF.setEditable(false);
+		}
+    	
+    	JFXButton okayBtn = new JFXButton(XMLController.getLocalBundle().getString("okayBtnText"));
+		okayBtn.setOnAction(event -> {
+			if (romPathTF.getText().toString().length() == 0 || gameCoverTF.getText().toString().length() == 0
+					|| gameTitleTF.getText().toString().length() == 0
+					|| gameTitleIDTF.getText().toString().length() == 0) {
+
+				// addGame error dialog
+				JFXInfoAlert errorDialog = new JFXInfoAlert(
+						XMLController.getLocalBundle().getString("editGameDialogHeadingTextError"),
+						XMLController.getLocalBundle().getString("editGameDialogBodyTextError"), btnStyle, stage);
+				errorDialog.showAndWait();
+			} else {
+				switch (mode) {
+				case 0:
+					// add-mode title, coverPath, romPath, titleID
+					mwc.addBtnReturn(gameTitleTF.getText().toString(), gameCoverTF.getText().toString(),
+							romPathTF.getText().toString(), gameTitleIDTF.getText().toString());
+					break;
+				case 1:
+					// edit mode
+					mwc.editBtnReturn(gameTitleTF.getText().toString(), gameCoverTF.getText().toString(),
+							romPathTF.getText().toString(), gameTitleIDTF.getText().toString());
+					break;
+				default:
+					break;
+				}
+
+				alert.close();
+			}
+		});
+    	okayBtn.setButtonType(com.jfoenix.controls.JFXButton.ButtonType.RAISED);
+    	okayBtn.setPrefHeight(32);
+    	okayBtn.setStyle(btnStyle);
+    	
+    	JFXButton cancelBtn = new JFXButton(XMLController.getLocalBundle().getString("cancelBtnText"));
+    	cancelBtn.addEventHandler(ActionEvent.ACTION, (e)-> alert.close());
+    	cancelBtn.setButtonType(com.jfoenix.controls.JFXButton.ButtonType.RAISED);
+    	cancelBtn.setPrefHeight(32);
+    	cancelBtn.setStyle(btnStyle);
+    	
+		JFXButton selectPathBtn = new JFXButton(XMLController.getLocalBundle().getString("editGameDialogSelectPathBtn"));
+		selectPathBtn.setPrefWidth(110);
+		selectPathBtn.setStyle(btnStyle);
+		selectPathBtn.setOnAction(event -> {
+			FileChooser romDirectoryChooser = new FileChooser();
+			File romDirectory = romDirectoryChooser.showOpenDialog(stage);
+			romPathTF.setText(romDirectory.getAbsolutePath());
+		});
+    	
+    	JFXButton selectCoverBtn = new JFXButton(XMLController.getLocalBundle().getString("editGameDialogSelectCoverBtn"));
+    	selectCoverBtn.setPrefWidth(110);
+    	selectCoverBtn.setStyle(btnStyle);
+		selectCoverBtn.setOnAction(event -> {
+			FileChooser coverDirectoryChooser = new FileChooser();
+			File coverDirectory = coverDirectoryChooser.showOpenDialog(stage);
+			gameCoverTF.setText(coverDirectory.getAbsolutePath());
+		});
+		
+		GridPane grid = new GridPane();
+    	grid.setHgap(10);
+    	grid.setVgap(10);
+    	grid.setPadding(new Insets(15, 10, 10, 10));
+    	grid.add(new Label(XMLController.getLocalBundle().getString("gameTitle") + ":"), 0, 0);
+    	grid.add(gameTitleTF, 1, 0);
+    	grid.add(new Label(XMLController.getLocalBundle().getString("titleID") + ":"), 0, 1);
+    	grid.add(gameTitleIDTF, 1, 1);
+    	grid.add(new Label(XMLController.getLocalBundle().getString("romPath") + ":"), 0, 2);
+    	grid.add(romPathTF, 1, 2);
+    	grid.add(selectPathBtn, 2, 2);
+    	grid.add(new Label(XMLController.getLocalBundle().getString("coverPath") + ":"), 0, 3);
+    	grid.add(gameCoverTF, 1, 3);
+    	grid.add(selectCoverBtn, 2, 3);
+    	
+    	VBox vbox = new VBox();
+    	vbox.getChildren().addAll(new Text(bodyText), grid);
+		
+		JFXDialogLayout content = new JFXDialogLayout();
+		content.setActions(cancelBtn, okayBtn);
+		content.setHeading(new Text(headingText));
+		content.setBody(vbox);
+		alert.setContent(content);
+		alert.showAndWait();
+	}
+
+	public String getHeadingText() {
+		return headingText;
+	}
+
+	public String getBodyText() {
+		return bodyText;
+	}
+
+	public String getTitle() {
+		return title;
+	}
+
+	public String getCoverPath() {
+		return coverPath;
+	}
+
+	public String getRomPath() {
+		return romPath;
+	}
+
+	public String getTitleID() {
+		return titleID;
+	}
+
+	public String getBtnStyle() {
+		return btnStyle;
+	}
+
+	public int getMode() {
+		return mode;
+	}
+
+	public Stage getStage() {
+		return stage;
+	}
+
+	public void setHeadingText(String headingText) {
+		this.headingText = headingText;
+	}
+
+	public void setBodyText(String bodyText) {
+		this.bodyText = bodyText;
+	}
+
+	public void setTitle(String title) {
+		this.title = title;
+	}
+
+	public void setCoverPath(String coverPath) {
+		this.coverPath = coverPath;
+	}
+
+	public void setRomPath(String romPath) {
+		this.romPath = romPath;
+	}
+
+	public void setTitleID(String titleID) {
+		this.titleID = titleID;
+	}
+
+	public void setBtnStyle(String btnStyle) {
+		this.btnStyle = btnStyle;
+	}
+
+	public void setMode(int mode) {
+		this.mode = mode;
+	}
+
+	public void setStage(Stage stage) {
+		this.stage = stage;
+	}
+
+}
--- a/src/main/java/com/cemu_UI/uiElements/JFXEditGameDialog.java
+++ b/src/main/java/com/cemu_UI/uiElements/JFXEditGameDialog.java
@ -1,227 +0,0 @@
-/**
- * cemu_UI
- * 
- * Copyright 2017-2018  <@Seil0>
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-package com.cemu_UI.uiElements;
-
-import java.io.File;
-
-import com.cemu_UI.application.MainWindowController;
-import com.jfoenix.controls.JFXButton;
-import com.jfoenix.controls.JFXDialog;
-import com.jfoenix.controls.JFXDialogLayout;
-
-import javafx.event.ActionEvent;
-import javafx.event.EventHandler;
-import javafx.geometry.Insets;
-import javafx.scene.control.Label;
-import javafx.scene.control.TextField;
-import javafx.scene.layout.AnchorPane;
-import javafx.scene.layout.GridPane;
-import javafx.scene.layout.Pane;
-import javafx.scene.layout.StackPane;
-import javafx.scene.layout.VBox;
-import javafx.scene.text.Text;
-import javafx.stage.FileChooser;
-import javafx.stage.Stage;
-
-public class JFXEditGameDialog {
-	
-	private String headingText;
-	private String bodyText;
-	private String dialogBtnStyle;
-	private String title = "";
-	private String coverPath = "";
-	private String romPath = "";
-	private String titleID = "";
-	private int dialogWidth;
-	private int dialogHeight;
-	private int mode;
-	private Stage stage;
-	private Pane pane;
-	private MainWindowController mwc;
-
-	/**
-	 * Creates a new JFoenix Dialog to show some information with okay and cancel option
-	 * @param headingText Heading Text, just the heading
-	 * @param bodyText body Text, all other text belongs here
-	 * @param dialogBtnStyle Style of the okay button
-	 * @param dialogWidth dialog width
-	 * @param dialogHeight dialog height
-	 * @param mode set to 0 for add and 1 for edit mode
-	 * @param stage the primary stage
-	 * @param pane pane to which the dialog belongs
-	 */
-	public JFXEditGameDialog(String headingText, String bodyText, String dialogBtnStyle, int dialogWidth,
-			int dialogHeight, int mode, MainWindowController mwc, Stage stage, Pane pane) {
-		this.headingText = headingText;
-		this.bodyText = bodyText;
-		this.dialogBtnStyle = dialogBtnStyle;
-		this.dialogWidth = dialogWidth;
-		this.dialogHeight = dialogHeight;
-		this.mode = mode;
-		this.mwc = mwc;
-		this.stage = stage;
-		this.pane = pane;
-	}
-
-	public void show() { 
-		JFXDialogLayout content = new JFXDialogLayout();
-    	StackPane stackPane = new StackPane();
-    	stackPane.autosize();
-    	JFXDialog dialog = new JFXDialog(stackPane, content, JFXDialog.DialogTransition.LEFT, true);
-
-    	TextField gameTitleTF = new TextField();
-    	gameTitleTF.setPromptText(mwc.getBundle().getString("gameTitle"));
-    	TextField gameTitleIDTF = new TextField();
-    	gameTitleIDTF.setPromptText(mwc.getBundle().getString("titleID"));
-    	TextField romPathTF = new TextField();
-    	romPathTF.setPromptText(mwc.getBundle().getString("romPath"));
-    	TextField gameCoverTF = new TextField();
-    	gameCoverTF.setPromptText(mwc.getBundle().getString("coverPath"));
-    	
-    	if (mode == 1) {
-			gameTitleTF.setText(title);
-			gameTitleIDTF.setText(titleID);
-			romPathTF.setText(romPath);
-			gameCoverTF.setText(coverPath);
-			
-			gameTitleIDTF.setEditable(false);
-		}
-    	
-    	JFXButton okayBtn = new JFXButton(mwc.getBundle().getString("okayBtnText"));
-		okayBtn.setOnAction(new EventHandler<ActionEvent>() {
-			@Override
-			public void handle(ActionEvent event) {
-				if (romPathTF.getText().toString().length() == 0 || gameCoverTF.getText().toString().length() == 0
-						|| gameTitleTF.getText().toString().length() == 0 || gameTitleIDTF.getText().toString().length() == 0) {
-
-					// LOGGER.info("No parameter set!");
-
-					// addGame error dialog
-					String headingTextError = mwc.getBundle().getString("editGameDialogHeadingTextError");
-					String bodyTextError = mwc.getBundle().getString("editGameDialogBodyTextError");
-					JFXInfoAlert errorDialog = new JFXInfoAlert(headingTextError, bodyTextError, dialogBtnStyle, stage);
-					errorDialog.showAndWait();
-				} else {
-					switch (mode) {
-					case 0:
-						// add-mode 	title, coverPath, romPath, titleID
-						mwc.addBtnReturn(gameTitleTF.getText().toString(), gameCoverTF.getText().toString(),
-										 romPathTF.getText().toString(), gameTitleIDTF.getText().toString());
-						dialog.close();
-						break;
-					case 1:
-						// edit mode
-						mwc.editBtnReturn(gameTitleTF.getText().toString(), gameCoverTF.getText().toString(),
-								 		  romPathTF.getText().toString(), gameTitleIDTF.getText().toString());
-						dialog.close();
-						break;
-					default:
-						dialog.close();
-						break;
-					}
-				}
-			}
-		});
-    	okayBtn.setButtonType(com.jfoenix.controls.JFXButton.ButtonType.RAISED);
-    	okayBtn.setPrefHeight(32);
-    	okayBtn.setStyle(dialogBtnStyle);
-    	
-    	JFXButton cancelBtn = new JFXButton(mwc.getBundle().getString("cancelBtnText"));
-    	cancelBtn.setOnAction(new EventHandler<ActionEvent>() {
-			@Override
-			public void handle(ActionEvent event) {
-				dialog.close();
-			}
-		});
-    	cancelBtn.setButtonType(com.jfoenix.controls.JFXButton.ButtonType.RAISED);
-    	cancelBtn.setPrefHeight(32);
-    	cancelBtn.setStyle(dialogBtnStyle);
-    	
-    	JFXButton selectPathBtn = new JFXButton(mwc.getBundle().getString("editGameDialogSelectPathBtn"));
-    	selectPathBtn.setPrefWidth(110);
-    	selectPathBtn.setStyle(dialogBtnStyle);
-    	selectPathBtn.setOnAction(new EventHandler<ActionEvent>() {
-            @Override
-            public void handle(ActionEvent event) {
-            	FileChooser romDirectoryChooser = new FileChooser();
-                File romDirectory =  romDirectoryChooser.showOpenDialog(stage);
-                romPathTF.setText(romDirectory.getAbsolutePath());
-            }
-    	});
-    	
-    	JFXButton selectCoverBtn = new JFXButton(mwc.getBundle().getString("editGameDialogSelectCoverBtn"));
-    	selectCoverBtn.setPrefWidth(110);
-    	selectCoverBtn.setStyle(dialogBtnStyle);
-    	selectCoverBtn.setOnAction(new EventHandler<ActionEvent>() {
-            @Override
-            public void handle(ActionEvent event) {
-            	FileChooser coverDirectoryChooser = new FileChooser();
-                File coverDirectory =  coverDirectoryChooser.showOpenDialog(stage);
-                gameCoverTF.setText(coverDirectory.getAbsolutePath());
-            }
-    	});
-    	
-    	GridPane grid = new GridPane();
-    	grid.setHgap(10);
-    	grid.setVgap(10);
-    	grid.setPadding(new Insets(15, 10, 10, 10));
-    	grid.add(new Label(mwc.getBundle().getString("gameTitle") + ":"), 0, 0);
-    	grid.add(gameTitleTF, 1, 0);
-    	grid.add(new Label(mwc.getBundle().getString("titleID") + ":"), 0, 1);
-    	grid.add(gameTitleIDTF, 1, 1);
-    	grid.add(new Label(mwc.getBundle().getString("romPath") + ":"), 0, 2);
-    	grid.add(romPathTF, 1, 2);
-    	grid.add(selectPathBtn, 2, 2);
-    	grid.add(new Label(mwc.getBundle().getString("coverPath") + ":"), 0, 3);
-    	grid.add(gameCoverTF, 1, 3);
-    	grid.add(selectCoverBtn, 2, 3);
-    	
-    	Text bdyText = new Text(bodyText);
-    	
-    	VBox vbox = new VBox();
-    	vbox.getChildren().addAll(bdyText, grid);
-    	
-		content.setHeading(new Text(headingText));
-    	content.setBody(vbox);
-    	content.setActions(cancelBtn, okayBtn);
-    	content.setPrefSize(dialogWidth, dialogHeight);
-    	pane.getChildren().add(stackPane);
-    	AnchorPane.setTopAnchor(stackPane, (pane.getHeight()-content.getPrefHeight())/2);
-    	AnchorPane.setLeftAnchor(stackPane, (pane.getWidth()-content.getPrefWidth())/2);
-    	dialog.show();
-	}
-
-	public void setTitle(String title) {
-		this.title = title;
-	}
-	
-	public void setCoverPath(String coverPath) {
-		this.coverPath = coverPath;
-	}
-
-	public void setRomPath(String romPath) {
-		this.romPath = romPath;
-	}
-
-	public void setTitleID(String titleID) {
-		this.titleID = titleID;
-	}
-}
--- a/src/main/java/com/cemu_UI/uiElements/JFXInfoAlert.java
+++ b/src/main/java/com/cemu_UI/uiElements/JFXInfoAlert.java
@ -1,7 +1,7 @@
 /**
- * Kellerkinder Framework Alerts
+ * cemu_UI
 * 
- * Copyright 2018  <@Seil0>
+ * Copyright 2017-2019  <@Seil0>
 * 
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@ -18,6 +18,7 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 * MA 02110-1301, USA.
 */
+
 package com.cemu_UI.uiElements;

 import com.jfoenix.controls.JFXAlert;
@ -25,7 +26,6 @@ import com.jfoenix.controls.JFXButton;
 import com.jfoenix.controls.JFXDialogLayout;

 import javafx.event.ActionEvent;
-import javafx.event.EventHandler;
 import javafx.scene.text.Text;
 import javafx.stage.Stage;

@ -39,9 +39,9 @@ public class JFXInfoAlert {
 	/**
 	 * Creates a new JFoenix Alert to show some information
 	 * @param headerText	Heading text of the alert
-	 * @param bodyText	Content text of the alert
+	 * @param bodyText		Content text of the alert
 	 * @param btnStyle		Style of the okay button
-	 * @param stage			stage to which the dialog belongs
+	 * @param stage			Stage to which the Alert belongs
 	 */
 	public JFXInfoAlert(String headingText, String bodyText, String btnStyle, Stage stage) {
 		setHeadingText(headingText);
@ -58,12 +58,7 @@ public class JFXInfoAlert {
 		JFXAlert<Void> alert = new JFXAlert<>(stage);
 		
 		JFXButton button = new JFXButton("Okay");
-		button.setOnAction(new EventHandler<ActionEvent>() {
-			@Override
-			public void handle(ActionEvent event) {
-				alert.close();
-			}
-		});
+		button.addEventHandler(ActionEvent.ACTION, (e)-> alert.close());
 		button.setButtonType(com.jfoenix.controls.JFXButton.ButtonType.RAISED);
 		button.setPrefHeight(32);
 		button.setStyle(btnStyle);
--- a/src/main/java/com/cemu_UI/uiElements/JFXOkayCancelDialog.java
+++ b/src/main/java/com/cemu_UI/uiElements/JFXOkayCancelDialog.java
@ -1,7 +1,7 @@
 /**
 * cemu_UI
 * 
- * Copyright 2017-2018  <@Seil0>
+ * Copyright 2017-2019  <@Seil0>
 * 
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@ -18,92 +18,96 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 * MA 02110-1301, USA.
 */
+
 package com.cemu_UI.uiElements;

-import java.util.ResourceBundle;
-
+import com.cemu_UI.controller.XMLController;
+import com.jfoenix.controls.JFXAlert;
 import com.jfoenix.controls.JFXButton;
-import com.jfoenix.controls.JFXDialog;
 import com.jfoenix.controls.JFXDialogLayout;

 import javafx.event.ActionEvent;
 import javafx.event.EventHandler;
-import javafx.scene.layout.AnchorPane;
-import javafx.scene.layout.Pane;
-import javafx.scene.layout.StackPane;
 import javafx.scene.text.Text;
+import javafx.stage.Stage;

-public class JFXOkayCancelDialog {
+public class JFXOkayCancelAlert {
 	
 	private String headingText;
 	private String bodyText;
-	private String dialogBtnStyle;
-	private String okayText;
-	private String cancelText;
-	private int dialogWidth;
-	private int dialogHeight;
+	private String btnStyle;
+	private Stage stage;
+	
 	private EventHandler<ActionEvent> okayAction;
 	private EventHandler<ActionEvent> cancelAction;
-	private Pane pane;
+	
+	private String okayText = XMLController.getLocalBundle().getString("okayBtnText");
+	private String cancelText = XMLController.getLocalBundle().getString("cancelBtnText");
 	
 	/**
-	 * Creates a new JFoenix Dialog to show some information with okay and cancel option
-	 * @param headingText Heading Text, just the heading
-	 * @param bodyText body Text, all other text belongs here
-	 * @param dialogBtnStyle Style of the okay button
-	 * @param dialogWidth dialog width
-	 * @param dialogHeight dialog height
-	 * @param okayAction action which is performed if the okay button is clicked
-	 * @param cancelAction action which is performed if the cancel button is clicked
-	 * @param pane pane to which the dialog belongs
+	 * 
+	 * @param headingText	Heading text of the alert
+	 * @param bodyText		Content text of the alert
+	 * @param btnStyle		Style of the buttons
+	 * @param stage			Stage to which the Alert belongs
 	 */
-	public JFXOkayCancelDialog(String headingText, String bodyText, String dialogBtnStyle, int dialogWidth,
-			int dialogHeight, EventHandler<ActionEvent> okayAction, EventHandler<ActionEvent> cancelAction, Pane pane,
-			ResourceBundle bundle) {
-		this.headingText = headingText;
-		this.bodyText = bodyText;
-		this.dialogBtnStyle = dialogBtnStyle;
-		this.dialogWidth = dialogWidth;
-		this.dialogHeight = dialogHeight;
-		this.okayAction = okayAction;
-		this.cancelAction = cancelAction;
-		this.pane = pane;
-		okayText = bundle.getString("okayBtnText");
-		cancelText = bundle.getString("cancelBtnText");
+	public JFXOkayCancelAlert(String headingText, String bodyText, String btnStyle, Stage stage) {
+		setHeadingText(headingText);
+		setBodyText(bodyText);
+		setBtnStyle(btnStyle);
+		setStage(stage);
 	}
 	
-	public void show() {
+	public void showAndWait( ) {
+		JFXAlert<Void> alert = new JFXAlert<>(stage);
 		
-		JFXDialogLayout content = new JFXDialogLayout();
-    	content.setHeading(new Text(headingText));
-    	content.setBody(new Text(bodyText));
-    	StackPane stackPane = new StackPane();
-    	stackPane.autosize();
-    	JFXDialog dialog = new JFXDialog(stackPane, content, JFXDialog.DialogTransition.LEFT, true);
    	JFXButton okayBtn = new JFXButton(okayText);
-    	okayBtn.addEventHandler(ActionEvent.ACTION, (e)-> {
-    		dialog.close();
-    	});
+    	okayBtn.addEventHandler(ActionEvent.ACTION, (e)-> alert.close());
    	okayBtn.addEventHandler(ActionEvent.ACTION, okayAction);
    	okayBtn.setButtonType(com.jfoenix.controls.JFXButton.ButtonType.RAISED);
    	okayBtn.setPrefHeight(32);
-    	okayBtn.setStyle(dialogBtnStyle);
+    	okayBtn.setStyle(btnStyle);
+    	
    	JFXButton cancelBtn = new JFXButton(cancelText);
-    	cancelBtn.addEventHandler(ActionEvent.ACTION, (e)-> {
-    		dialog.close();
-    	});
+    	cancelBtn.addEventHandler(ActionEvent.ACTION, (e)-> alert.close());
    	cancelBtn.addEventHandler(ActionEvent.ACTION, cancelAction);
    	cancelBtn.setButtonType(com.jfoenix.controls.JFXButton.ButtonType.RAISED);
    	cancelBtn.setPrefHeight(32);
-    	cancelBtn.setStyle(dialogBtnStyle);
-    	content.setActions(cancelBtn, okayBtn);
-    	content.setPrefSize(dialogWidth, dialogHeight);
-    	pane.getChildren().add(stackPane);
-    	AnchorPane.setTopAnchor(stackPane, (pane.getHeight()-content.getPrefHeight())/2);
-    	AnchorPane.setLeftAnchor(stackPane, (pane.getWidth()-content.getPrefWidth())/2);
-    	dialog.show();
+    	cancelBtn.setStyle(btnStyle);
+    	
+		
+		JFXDialogLayout content = new JFXDialogLayout();
+		content.setActions(cancelBtn, okayBtn);
+		content.setHeading(new Text(headingText));
+		content.setBody(new Text(bodyText));
+		alert.setContent(content);
+		alert.showAndWait();
 	}

+	public String getHeadingText() {
+		return headingText;
+	}
+
+	public void setHeadingText(String headingText) {
+		this.headingText = headingText;
+	}
+
+	public String getBodyText() {
+		return bodyText;
+	}
+
+	public void setBodyText(String bodyText) {
+		this.bodyText = bodyText;
+	}
+	
+	public String getBtnStyle() {
+		return btnStyle;
+	}
+
+	public void setBtnStyle(String btnStyle) {
+		this.btnStyle = btnStyle;
+	}
+	
 	public String getOkayText() {
 		return okayText;
 	}
@ -111,7 +115,7 @@ public class JFXOkayCancelDialog {
 	public void setOkayText(String okayText) {
 		this.okayText = okayText;
 	}
-
+	
 	public String getCancelText() {
 		return cancelText;
 	}
@ -119,6 +123,14 @@ public class JFXOkayCancelDialog {
 	public void setCancelText(String cancelText) {
 		this.cancelText = cancelText;
 	}
+	
+	public Stage getStage() {
+		return stage;
+	}
+
+	public void setStage(Stage stage) {
+		this.stage = stage;
+	}

 	public EventHandler<ActionEvent> getOkayAction() {
 		return okayAction;
@ -137,4 +149,3 @@ public class JFXOkayCancelDialog {
 	}

 }
-
--- a/src/main/java/com/cemu_UI/uiElements/JFXTextAreaAlert.java
+++ b/src/main/java/com/cemu_UI/uiElements/JFXTextAreaAlert.java
@ -0,0 +1,104 @@
+/**
+ * cemu_UI
+ * 
+ * Copyright 2017-2019  <@Seil0>
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+
+package com.cemu_UI.uiElements;
+
+import com.jfoenix.controls.JFXAlert;
+import com.jfoenix.controls.JFXButton;
+import com.jfoenix.controls.JFXDialogLayout;
+import com.jfoenix.controls.JFXTextArea;
+
+import javafx.scene.text.Text;
+import javafx.stage.Stage;
+
+public class JFXTextAreaAlert {
+	
+	private String headingText;
+	private String textAreaText;
+	private String btnStyle;
+	private Stage stage;
+	
+	/**
+	 * Creates a new JFoenix Alert to show some information on a TextArea
+	 * @param headingText	Heading text of the alert
+	 * @param textAreaText	Content text of the alert
+	 * @param btnStyle		Style of the okay button
+	 * @param stage			Stage to which the Alert belongs
+	 */
+	public JFXTextAreaAlert(String headingText, String textAreaText, String btnStyle, Stage stage) {
+		setHeadingText(headingText);
+		setTextAreaText(textAreaText);
+		setBtnStyle(btnStyle);
+		setStage(stage);
+	}
+	
+	public void showAndWait( ) {
+		JFXAlert<Void> alert = new JFXAlert<>(stage);
+		JFXTextArea textArea = new JFXTextArea(textAreaText);
+		textArea.setMinWidth(450);
+		
+		JFXButton button = new JFXButton("Okay");
+		button.setOnAction(event -> alert.close());
+		button.setButtonType(com.jfoenix.controls.JFXButton.ButtonType.RAISED);
+		button.setPrefHeight(32);
+		button.setStyle(btnStyle);
+		
+		JFXDialogLayout content = new JFXDialogLayout();
+		content.setActions(button);
+		content.setHeading(new Text(headingText));
+		content.setBody(textArea);
+		alert.setContent(content);
+		alert.showAndWait();
+	}
+
+	public String getHeadingText() {
+		return headingText;
+	}
+
+	public String getTextAreaText() {
+		return textAreaText;
+	}
+
+	public String getBtnStyle() {
+		return btnStyle;
+	}
+
+	public Stage getStage() {
+		return stage;
+	}
+
+	public void setHeadingText(String headingText) {
+		this.headingText = headingText;
+	}
+
+	public void setTextAreaText(String textAreaText) {
+		this.textAreaText = textAreaText;
+	}
+
+	public void setBtnStyle(String btnStyle) {
+		this.btnStyle = btnStyle;
+	}
+
+	public void setStage(Stage stage) {
+		this.stage = stage;
+	}
+
+}
--- a/src/main/java/com/cemu_UI/uiElements/JFXTextAreaInfoDialog.java
+++ b/src/main/java/com/cemu_UI/uiElements/JFXTextAreaInfoDialog.java
@ -1,97 +0,0 @@
-/**
- * cemu_UI
- * 
- * Copyright 2017-2018  <@Seil0>
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-package com.cemu_UI.uiElements;
-
-import com.jfoenix.controls.JFXButton;
-import com.jfoenix.controls.JFXDialog;
-import com.jfoenix.controls.JFXDialogLayout;
-import com.jfoenix.controls.JFXTextArea;
-
-import javafx.event.ActionEvent;
-import javafx.event.EventHandler;
-import javafx.scene.layout.AnchorPane;
-import javafx.scene.layout.Pane;
-import javafx.scene.layout.StackPane;
-import javafx.scene.text.Text;
-
-public class JFXTextAreaInfoDialog {
-	
-	private String headingText;
-	private String bodyText;
-	private String dialogBtnStyle;
-	private int dialogWidth;
-	private int dialogHeight;
-	private JFXTextArea textArea;
-	private Pane pane;
-
-	/**
-	 * Creates a new JFoenix Dialog to show some information
-	 * @param headingText Heading Text, just the heading
-	 * @param bodyText body Text, all other text belongs here
-	 * @param dialogBtnStyle Style of the okay button
-	 * @param dialogWidth dialog width
-	 * @param dialogHeight dialog height
-	 * @param pane pane to which the dialog belongs
-	 */
-	public JFXTextAreaInfoDialog(String headingText, String bodyText, String dialogBtnStyle, int dialogWidth, int dialogHeight, Pane pane) {
-		this.headingText = headingText;
-		this.bodyText = bodyText;
-		this.dialogBtnStyle = dialogBtnStyle;
-		this.dialogWidth = dialogWidth;
-		this.dialogHeight = dialogHeight;
-		this.pane = pane;
-	}
-
-	public void show() {
-		textArea = new JFXTextArea(bodyText);
-		
-		JFXDialogLayout content = new JFXDialogLayout();
-		content.setHeading(new Text(headingText));
-		content.setBody(textArea);
-		content.setPrefSize(dialogWidth, dialogHeight);
-		StackPane stackPane = new StackPane();
-		stackPane.autosize();
-		JFXDialog dialog = new JFXDialog(stackPane, content, JFXDialog.DialogTransition.LEFT, true);
-		JFXButton button = new JFXButton("Okay");
-		button.setOnAction(new EventHandler<ActionEvent>() {
-			@Override
-			public void handle(ActionEvent event) {
-				dialog.close();
-			}
-		});
-		button.setButtonType(com.jfoenix.controls.JFXButton.ButtonType.RAISED);
-		button.setPrefHeight(32);
-		button.setStyle(dialogBtnStyle);
-		content.setActions(button);
-		pane.getChildren().add(stackPane);
-		AnchorPane.setTopAnchor(stackPane, (pane.getHeight() - content.getPrefHeight()) / 2);
-		AnchorPane.setLeftAnchor(stackPane, (pane.getWidth() - content.getPrefWidth()) / 2);
-		dialog.show();
-	}
-
-	public JFXTextArea getTextArea() {
-		return textArea;
-	}
-
-	public void setTextArea(JFXTextArea textArea) {
-		this.textArea = textArea;
-	}
-}
--- a/src/main/java/com/cemu_UI/vendorCloudController/GoogleDriveController.java
+++ b/src/main/java/com/cemu_UI/vendorCloudController/GoogleDriveController.java
@ -1,7 +1,7 @@
 /**
 * cemu_UI
 * 
- * Copyright 2017-2018  <@Seil0>
+ * Copyright 2017-2019  <@Seil0>
 * 
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@ -18,6 +18,7 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 * MA 02110-1301, USA.
 */
+
 package com.cemu_UI.vendorCloudController;

 import java.io.FileOutputStream;
@ -29,6 +30,7 @@ import java.util.Collections;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

+import com.cemu_UI.controller.XMLController;
 import com.google.api.client.auth.oauth2.Credential;
 import com.google.api.client.extensions.java6.auth.oauth2.AuthorizationCodeInstalledApp;
 import com.google.api.client.extensions.jetty.auth.oauth2.LocalServerReceiver;
@ -50,7 +52,7 @@ import com.google.api.services.drive.model.FileList;
 public class GoogleDriveController {
 	
 	Drive service;
-	private String folderID;
+	private String folderID = XMLController.getFolderID();
 	private File downloadFile;
 	private static final Logger LOGGER = LogManager.getLogger(GoogleDriveController.class.getName());
 	
@ -77,43 +79,41 @@ public class GoogleDriveController {
        try {
            HTTP_TRANSPORT = GoogleNetHttpTransport.newTrustedTransport();
            DATA_STORE_FACTORY = new FileDataStoreFactory(DATA_STORE_DIR);
-            folderID = "";
+            folderID = ""; // TODO why do we do this?
        } catch (Throwable t) {
        	LOGGER.error("error", t);
            System.exit(1);
        }
    }
 	 
-    /**
-	  * Creates an authorized Credential object.
-	  * @return an authorized Credential object.
-	  * @throws IOException
-	  */
-	 public Credential authorize() throws IOException {
-		 // Load client secrets.
-	     InputStream in = getClass().getClassLoader().getResourceAsStream("client_secret.json");
-	     GoogleClientSecrets clientSecrets = GoogleClientSecrets.load(JSON_FACTORY, new InputStreamReader(in));	     
-	     GoogleAuthorizationCodeFlow flow = new GoogleAuthorizationCodeFlow.Builder(HTTP_TRANSPORT, JSON_FACTORY, clientSecrets, SCOPES)
-	    		 .setDataStoreFactory(DATA_STORE_FACTORY)
-	             .setAccessType("offline")
-	             .build();
-	     
-	     Credential credential = new AuthorizationCodeInstalledApp(flow, new LocalServerReceiver()).authorize("user");
-	     LOGGER.info("Credentials saved to " + DATA_STORE_DIR.getAbsolutePath());
-	     return credential;
-	 }	 	 
+	/**
+	 * Creates an authorized Credential object.
+	 * 
+	 * @return an authorized Credential object.
+	 * @throws IOException
+	 */
+	public Credential authorize() throws IOException {
+		// Load client secrets.
+		InputStream in = getClass().getClassLoader().getResourceAsStream("client_secret.json");
+		GoogleClientSecrets clientSecrets = GoogleClientSecrets.load(JSON_FACTORY, new InputStreamReader(in));
+		GoogleAuthorizationCodeFlow flow = new GoogleAuthorizationCodeFlow.Builder(HTTP_TRANSPORT, JSON_FACTORY,
+				clientSecrets, SCOPES).setDataStoreFactory(DATA_STORE_FACTORY).setAccessType("offline").build();
+
+		Credential credential = new AuthorizationCodeInstalledApp(flow, new LocalServerReceiver()).authorize("user");
+		LOGGER.info("Credentials saved to " + DATA_STORE_DIR.getAbsolutePath());
+		return credential;
+	} 
 	 
 	/**
 	 * Build and return an authorized Drive client service.
+	 * 
 	 * @return an authorized Drive client service
 	 * @throws IOException
 	 */
-	 public Drive getDriveService() throws IOException {
-	        Credential credential = authorize();
-	        return new Drive.Builder(HTTP_TRANSPORT, JSON_FACTORY, credential)
-	        		.setApplicationName(APPLICATION_NAME)
-	                .build();
-	 }
+	public Drive getDriveService() throws IOException {
+		Credential credential = authorize();
+		return new Drive.Builder(HTTP_TRANSPORT, JSON_FACTORY, credential).setApplicationName(APPLICATION_NAME).build();
+	}
 	 
 	public void main(String cemuDirectory) throws IOException {
 		service = getDriveService();
@ -211,7 +211,7 @@ public class GoogleDriveController {

 		try {
 			LOGGER.info("FolderID: " + files.getFiles().get(0).getId());
-			setFolderID(files.getFiles().get(0).getId());
+			folderID = files.getFiles().get(0).getId();
 		} catch (Exception e) {
 			LOGGER.error("Oops, something went wrong! It seems that you have more than one folder called 'cemu_savegames'!", e);
 		}	
@ -220,9 +220,5 @@ public class GoogleDriveController {
 	public String getFolderID() {
 		return folderID;
 	}
-
-	public void setFolderID(String folderID) {
-		this.folderID = folderID;
-}
 	
 }
--- a/src/main/resources/css/MainWindows.css
+++ b/src/main/resources/css/MainWindows.css
@ -1,6 +1,8 @@
-/*
- * HAMBURGER CSS
- */
+/*******************************************************************************
+ *                                                                             *
+ * Hamburger Menu			                                                   *
+ *                                                                             *
+ ******************************************************************************/
 
 .jfx-hamburgerW StackPane {
 	-fx-background-color: white; 
@ -12,9 +14,11 @@
 	-fx-background-radius: 5px;
 }
 							
-/*
- * TREE TABLE CSS
- */
+/*******************************************************************************
+ *                                                                             *
+ * TreeTable			                                                       *
+ *                                                                             *
+ ******************************************************************************/

 .tree-table-view {
 	-fx-tree-table-color: rgba(0, 168, 204, 0.2);
@ -84,10 +88,11 @@
    -fx-padding: 1; /* 0.083333em; */
 }

-/*
- * ChoiceBox
- */
- 
+/*******************************************************************************
+ *                                                                             *
+ * ChoiceBox			                                                       *
+ *                                                                             *
+ ******************************************************************************/

 .choice-box {
 	-fx-background-color: transparent;
@ -109,10 +114,109 @@
 	-fx-background-color: #00A8CC;
 }

-/*
- * Spinner
- */
+/*******************************************************************************
+ *                                                                             *
+ * Spinner  			                                                       *
+ *                                                                             *
+ ******************************************************************************/
+ 
 .spinner {
 	-fx-background-color: #f4f4f4;
 }

+/*******************************************************************************
+ *                                                                             *
+ * ScrollBar			                                                       *
+ *                                                                             *
+ ******************************************************************************/
+ 
+ .scroll-bar:vertical, .scroll-bar:horizontal {
+ 	-fx-background-color: transparent;
+ }
+
+.scroll-bar:vertical > .track-background, .scroll-bar:horizontal > .track-background {
+    -fx-background-color: transparent;
+    -fx-background-insets: 0.0;
+}
+
+.scroll-bar:vertical > .thumb {
+    -fx-background-color: #BCBCBC;
+    -fx-background-insets: 0.0;
+    -fx-background-radius: 15.0;
+}
+
+.scroll-bar:horizontal > .thumb {
+    -fx-background-color: #FFFFFF;
+    -fx-background-insets: 0.0;
+    -fx-background-radius: 15.0;
+}
+
+/* Up- and Down-Button Padding */
+.scroll-bar:vertical > .increment-button, .scroll-bar:vertical > .decrement-button {
+    -fx-padding: 5 2 5 2;
+}
+
+/* Left- and Right-Button Padding */
+.scroll-bar:horizontal > .increment-button, .scroll-bar:horizontal > .decrement-button {
+	-fx-background-color: transparent;
+    -fx-padding: 5 2 5 2;
+}
+
+.scroll-bar > .increment-button, .scroll-bar > .decrement-button, .scroll-bar:hover > .increment-button, .scroll-bar:hover > .decrement-button {
+    -fx-background-color: transparent;
+}
+
+.scroll-bar > .increment-button > .increment-arrow, .scroll-bar > .decrement-button > .decrement-arrow {
+    -fx-background-color: rgb(150.0, 150.0, 150.0);
+}
+
+/* Up Arrow */
+.scroll-bar:vertical > .increment-button > .increment-arrow {
+    -fx-shape: "M298 426h428l-214 214z";
+}
+
+/* Down Arrow */
+.scroll-bar:vertical > .decrement-button > .decrement-arrow {
+    -fx-shape: "M298 598l214-214 214 214h-428z";
+}
+
+/* Right Arrow */    
+.scroll-bar:horizontal > .increment-button > .increment-arrow {
+    /* -fx-shape: "M0 428l0 -428l214 214l-214 214z"; */
+    -fx-background-color:transparent;
+    -fx-shape: " ";
+    -fx-padding: 0;
+}
+
+/* Left Arrow */
+.scroll-bar:horizontal > .decrement-button > .decrement-arrow {
+    /* -fx-shape: "M214 0l0 428l-214 -214l214 -214z"; */
+    -fx-background-color:transparent;
+    -fx-shape: " ";
+    -fx-padding: 0;
+}
+
+/*******************************************************************************
+ *                                                                             *
+ * ScrollPane			                                                       *
+ *                                                                             *
+ ******************************************************************************/
+
+.scroll-pane {
+    -fx-background-insets: 0;
+    -fx-padding: 0;
+}
+
+.scroll-pane:focused {
+    -fx-background-insets: 0;
+}
+
+.scroll-pane .corner {
+    -fx-background-insets: 0;
+}
+
+.scroll-pane > .viewport {
+   -fx-background-color: transparent;
+}
+
+
--- a/src/main/resources/fxml/MainWindow.fxml
+++ b/src/main/resources/fxml/MainWindow.fxml
@ -13,56 +13,24 @@
 <?import javafx.scene.control.Separator?>
 <?import javafx.scene.image.ImageView?>
 <?import javafx.scene.layout.AnchorPane?>
+<?import javafx.scene.layout.FlowPane?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
 <?import javafx.scene.text.TextFlow?>

-<AnchorPane fx:id="mainAnchorPane" minHeight="405.0" minWidth="260.0" prefHeight="600.0" prefWidth="904.0" xmlns="http://javafx.com/javafx/9" xmlns:fx="http://javafx.com/fxml/1">
+<AnchorPane fx:id="mainAnchorPane" minHeight="-Infinity" minWidth="-Infinity" prefHeight="600.0" prefWidth="1130.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1">
   <children>
      <ScrollPane fx:id="mainScrollPane" fitToWidth="true" layoutY="38.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="38.0">
         <content>
-            <AnchorPane fx:id="gamesAnchorPane">
+            <FlowPane fx:id="gamesFlowPane" hgap="3.0" vgap="7.0">
               <padding>
                  <Insets bottom="17.0" />
-               </padding></AnchorPane>
+               </padding>
+            </FlowPane>
         </content>
      </ScrollPane>
-      <HBox fx:id="topHBox" prefHeight="38.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
-         <children>
-            <JFXHamburger fx:id="menuHam" prefHeight="38.0" prefWidth="38.0" stylesheets="@../css/MainWindows.css" />
-         </children>
-      </HBox>
-      <VBox fx:id="sideMenuVBox" layoutY="32.0" prefHeight="568.0" prefWidth="175.0" visible="false" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="38.0">
-         <children>
-            <JFXButton fx:id="aboutBtn" alignment="TOP_LEFT" maxHeight="38.0" maxWidth="190.0" onAction="#aboutBtnAction" prefHeight="38.0" prefWidth="190.0" text="About" textAlignment="LEFT">
-               <font>
-                  <Font name="System Bold" size="14.0" />
-               </font>
-            </JFXButton>
-            <JFXButton fx:id="settingsBtn" alignment="TOP_LEFT" maxHeight="38.0" maxWidth="213.0" onAction="#settingsBtnAction" prefHeight="38.0" prefWidth="213.0" text="Settings" textAlignment="LEFT">
-               <font>
-                  <Font name="System Bold" size="14.0" />
-               </font>
-            </JFXButton>
-            <JFXButton fx:id="addBtn" alignment="TOP_LEFT" maxHeight="38.0" maxWidth="193.0" onAction="#addBtnAction" prefHeight="38.0" prefWidth="193.0" text="Add new Game" textAlignment="LEFT">
-               <font>
-                  <Font name="System Bold" size="14.0" />
-               </font>
-            </JFXButton>
-            <JFXButton fx:id="reloadRomsBtn" alignment="TOP_LEFT" maxHeight="38.0" maxWidth="199.0" onAction="#reloadRomsBtnAction" prefHeight="38.0" prefWidth="199.0" text="reload roms" textAlignment="LEFT">
-               <font>
-                  <Font name="System Bold" size="14.0" />
-               </font>
-            </JFXButton>
-            <JFXButton fx:id="smmdbBtn" alignment="TOP_LEFT" onAction="#smmdbBtnAction" prefHeight="38.0" prefWidth="216.0" text="smmdb">
-               <font>
-                  <Font name="System Bold" size="14.0" />
-               </font>
-            </JFXButton>
-         </children>
-      </VBox>
-      <ScrollPane fx:id="settingsScrollPane" prefHeight="562.0" prefWidth="729.0" style="-fx-background: white;" visible="false" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="175.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="38.0">
+      <ScrollPane fx:id="settingsScrollPane" fitToHeight="true" fitToWidth="true" prefHeight="562.0" prefWidth="729.0" style="-fx-background: white;" visible="false" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="175.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="38.0">
         <content>
           		<!-- space between settings sections  35px, between sections elements (label + element) 20px, between label and element 3px(or more) -->
            <AnchorPane fx:id="settingsAnchorPane" prefHeight="686.0" prefWidth="711.0" style="-fx-background-color: white;">
@ -71,7 +39,7 @@
                     <children>
                        <VBox prefHeight="485.0" prefWidth="710.0" spacing="25.0">
                           <children>
-                              <VBox prefHeight="21.0" prefWidth="676.0">
+                              <VBox>
                                 <children>
                                    <Label fx:id="cemu_UISettingsLbl" text="cemu_UI Settings">
                                       <font>
@ -223,5 +191,39 @@
            <JFXButton fx:id="lastTimePlayedBtn" buttonType="RAISED" maxHeight="32.0" maxWidth="156.0" minHeight="32.0" minWidth="156.0" onAction="#lastTimePlayedBtnAction" style="-fx-background-color: #ffffff; -fx-button-type: RAISED; -fx-text-fill: BLACK;" text="Last played, never" />
         </children>
      </HBox>
+      <HBox fx:id="topHBox" prefHeight="38.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+         <children>
+            <JFXHamburger fx:id="menuHam" prefHeight="38.0" prefWidth="38.0" stylesheets="@../css/MainWindows.css" />
+         </children>
+      </HBox>
+      <VBox fx:id="sideMenuVBox" layoutY="32.0" prefHeight="568.0" prefWidth="175.0" visible="false" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="38.0">
+         <children>
+            <JFXButton fx:id="aboutBtn" alignment="TOP_LEFT" maxHeight="38.0" maxWidth="190.0" onAction="#aboutBtnAction" prefHeight="38.0" prefWidth="190.0" text="About" textAlignment="LEFT">
+               <font>
+                  <Font name="System Bold" size="14.0" />
+               </font>
+            </JFXButton>
+            <JFXButton fx:id="settingsBtn" alignment="TOP_LEFT" maxHeight="38.0" maxWidth="213.0" onAction="#settingsBtnAction" prefHeight="38.0" prefWidth="213.0" text="Settings" textAlignment="LEFT">
+               <font>
+                  <Font name="System Bold" size="14.0" />
+               </font>
+            </JFXButton>
+            <JFXButton fx:id="addBtn" alignment="TOP_LEFT" maxHeight="38.0" maxWidth="193.0" onAction="#addBtnAction" prefHeight="38.0" prefWidth="193.0" text="Add new Game" textAlignment="LEFT">
+               <font>
+                  <Font name="System Bold" size="14.0" />
+               </font>
+            </JFXButton>
+            <JFXButton fx:id="reloadRomsBtn" alignment="TOP_LEFT" maxHeight="38.0" maxWidth="199.0" onAction="#reloadRomsBtnAction" prefHeight="38.0" prefWidth="199.0" text="reload roms" textAlignment="LEFT">
+               <font>
+                  <Font name="System Bold" size="14.0" />
+               </font>
+            </JFXButton>
+            <JFXButton fx:id="smmdbBtn" alignment="TOP_LEFT" onAction="#smmdbBtnAction" prefHeight="38.0" prefWidth="216.0" text="smmdb">
+               <font>
+                  <Font name="System Bold" size="14.0" />
+               </font>
+            </JFXButton>
+         </children>
+      </VBox>
   </children>
 </AnchorPane>
--- a/src/main/resources/locals/cemu_UI-Local_en_US.properties
+++ b/src/main/resources/locals/cemu_UI-Local_en_US.properties
@ -18,10 +18,10 @@ fullscreenToggleBtn = start game in fullscreen
 cemu_UISettingsLbl = cemu_UI Settings
 cemuDirectoryLbl =  cemu directory
 romDirectoryLbl = ROM directory
-mainColorLbl = main color
-languageLbl = language
-updateLbl = updates
-branchLbl = branch
+mainColorLbl = primary color
+languageLbl = Language
+updateLbl = Updates
+branchLbl = Branch
 cemuSettingsLbl = cemu Settings
 licensesLbl = Licenses
Author	SHA1	Message	Date
Jannik	8c62b04dea	Merge branch 'master' into develop All checks were successful continuous-integration/drone/push Build is passing Details	2020-12-17 17:53:31 +01:00
Jannik	5728ea4f4d	„README.md“ ändern	2020-12-17 17:44:38 +01:00
Seil0	2dcd47f5aa	update some libraries All checks were successful continuous-integration/drone/push Build is passing Details	2020-06-20 00:18:27 +02:00
Seil0	3227508f22	updated some libs All checks were successful continuous-integration/drone/push Build is passing Details * sqlite 3.27.2.1 -> 3.28.0 * log4j 2.11.2 -> 2.12.1	2019-11-27 16:21:00 +01:00
Seil0	142577aa9b	added drone ci All checks were successful continuous-integration/drone/push Build is passing Details	2019-09-08 20:19:28 +02:00
Jannik Seiler	13dd0a0150	Merge branch 'develop' of Seil0/cemu_UI into master	2019-06-28 17:35:22 +02:00
Seil0	f584eef9b7	update to 0.3.0 * updated jfoenix 9.0.8 -> 9.0.9	2019-06-28 17:32:25 +02:00
Seil0	a6b1ce7f72	some new css styling	2019-06-23 15:39:58 +02:00
Seil0	0fecb8bb16	more lambda code	2019-06-15 11:11:18 +02:00
Seil0	2689b03c16	minor clean up * CloudController is now a singleton	2019-05-18 13:19:34 +02:00
Seil0	bc36630ef2	removed unneeded methode	2019-05-18 01:28:21 +02:00
Seil0	07ded89069	Major code clean up * DBController doesn't need mwc anymore * no dialogs anymore, only alerts	2019-05-18 01:25:54 +02:00
Seil0	a4c8eb2efe	the license dialog is now a alert & reduced main usage in mwc	2019-05-17 00:22:51 +02:00
Seil0	7d376535ae	nicer dialog on first startup	2019-05-16 15:09:01 +02:00
Seil0	3f69169a6a	new constructor for UIROMDataType	2019-05-15 16:39:00 +02:00
Seil0	922c5197da	update to JavaFX 12.0.1	2019-05-15 16:25:08 +02:00
Seil0	0599945036	clean up some mwc code + UIROMDataType it should be now much better to understand the generatePosition() method	2019-05-15 16:19:31 +02:00
Seil0	df33c21826	some code clean up * library updates * dialog -> alert	2019-04-09 00:42:39 +02:00
Seil0	e59b14074e	added a few new games, updated some Japanese titles	2019-03-17 00:35:54 +01:00
Seil0	648d101c8e	updated year	2019-03-01 19:03:30 +01:00
Seil0	4222101b68	Update 'README.md'	2019-02-16 17:03:29 +01:00
Seil0	db8fcd4bdc	major code clean up	2019-01-22 19:21:38 +01:00
Seil0	7434d0be25	minor clean up	2019-01-14 20:16:19 +01:00
Seil0	360badb841	removed travis.yml	2019-01-04 23:35:50 +01:00
Seil0	38421599a3	the updater now uses gitea	2018-12-03 00:09:02 +01:00
Seil0	3f6eeece7d	updated some libs, code clean up * openjfx 11 -> 11.0.1 * jfoenix 9.0.6 -> 9.0.8 * sqlite-jdbc 3.23.2 -> 3.25.2 * google-api-services-drive rev129 -> rev136 * jackson-core 2.9.6 -> 2.9.7	2018-12-02 23:51:14 +01:00
Seil0	36fd86d15c	Merge branch 'develop'	2018-11-19 23:21:53 +01:00
Seil0	87eaec31ee	„README.md“ ändern	2018-11-19 23:18:29 +01:00
Seil0	a2f35de1c7	„README.md“ ändern	2018-11-19 23:18:07 +01:00
Seil0	b879e22fcf	deleted unused images	2018-11-19 23:17:13 +01:00
Seil0	960bec5283	„README.md“ ändern	2018-11-19 23:02:26 +01:00
Seil0	ffb7bc971c	removed eclipse specific files	2018-10-25 16:42:45 +02:00
Seil0	50088e0130	„.project“ löschen	2018-10-25 16:35:20 +02:00
Seil0	a3fc8ba463	„.classpath“ löschen	2018-10-25 16:35:14 +02:00
Seil0	ada6bec325	updated gitignore	2018-10-25 16:34:56 +02:00
Seil0	bbfc9521a0	target java11/javafx11	2018-10-01 21:20:35 +02:00
Seil0	2ac66978ba	updated some libraries * jfoenix 9.0.4 -> 9.0.6 * log4j 2.11.0 -> 2.11.1 * google apis 1.23.0 -> 1.25.0 * jackson-core 2.9.5 -> 2.9.6 * javax.servlet 4.0.0 -> 4.0.1 * maven-compiler-plugin 3.7.0 -> 3.8.0	2018-09-08 12:50:34 +02:00
Seil0	ed99e45115	cleaned up games.csv * use https now * added a few covers * added a few japanese titles	2018-08-16 13:27:31 +02:00
Seil0	dcd928096a	updated a few games in games.csv	2018-08-16 00:01:54 +02:00
Seil0	1df6a91f41	Merge branch 'develop' of Seil0/cemu_UI into master	2018-08-14 21:35:57 +02:00
Jannik	d46eace9d5	updated readme	2018-06-18 15:19:47 +02:00
Jannik	9e58a30390	updated readme	2018-06-18 15:14:34 +02:00
Jannik	010f109597	updated readme	2018-06-18 15:13:09 +02:00
Jannik	d082482844	updated readme	2018-06-18 13:54:46 +02:00
Seil0	fb1fd442f7	'README.md' ändern	2018-06-16 12:04:43 +02:00
Jannik	9839c303da	download the games.db from gitea	2018-06-16 00:03:23 +02:00
Jannik	e371859987	test commit 2	2018-06-13 15:14:34 +02:00
Jannik	8b62a732cd	test commit	2018-06-13 15:08:34 +02:00
Jannik	f1bb0607f7	Merge pull request #18 from Seil0/develop release 0.3.0	2018-04-28 12:23:14 +02:00