diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..0d63aee
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,8 @@
+bin
+.classpath
+.project
+.settings
+build
+.gradle
+.idea
+.vscode
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 0000000..8019f5f
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,120 @@
+plugins {
+	id 'application'
+    id 'org.openjfx.javafxplugin' version '0.0.9'  //requires JDK11+
+}
+
+wrapper {
+    gradleVersion = '6.7.1'
+    distributionType = Wrapper.DistributionType.ALL
+}
+
+group = 'com.jpl.games'
+
+ext {
+    mainClassName = 'com.jpl.games.RubikFX'
+    launcherClassName = 'com.jpl.games.Launcher'
+    javafxVersion = '11.0.2'  //requires JDK11+
+}
+
+repositories {
+    mavenCentral()
+    mavenLocal()
+    jcenter()
+}
+
+compileJava {
+    options.release = 11  //use JDK11+ for compiling & running
+    options.encoding = 'UTF-8'
+}
+
+javafx {
+    version = javafxVersion
+    modules = ['javafx.controls', 'javafx.fxml', 'javafx.swing']
+}
+
+configurations {
+    //define a configuration for other supported OS native libraries (apart from the current OS)
+    otherOSnatives
+}
+
+dependencies {
+    implementation files('lib/Viewer3D.jar')
+
+    def currentOS = javafx.platform.classifier
+    ['linux', 'mac', 'win'].each { classifier ->
+        if (classifier != currentOS) {
+            otherOSnatives "org.openjfx:javafx-base:$javafxVersion:$classifier"
+            otherOSnatives "org.openjfx:javafx-controls:$javafxVersion:$classifier"
+            otherOSnatives "org.openjfx:javafx-fxml:$javafxVersion:$classifier"
+            otherOSnatives "org.openjfx:javafx-graphics:$javafxVersion:$classifier"
+            otherOSnatives "org.openjfx:javafx-swing:$javafxVersion:$classifier"
+        }
+    }
+}
+
+sourceSets {
+    main {
+        java {
+            srcDirs = ['src']
+        }
+        resources {
+            //initialize the srcDirs property to remove the default src/main/resources,
+            //and add other resources from src (excluding *.java by default)
+            srcDirs = ['src']
+        }
+    }
+}
+
+jar {
+    manifest {
+        attributes(
+            'Main-Class': project.mainClassName,
+            'JavaFX-Version': javafxVersion,
+            'Built-By': System.getProperty('user.name'),
+            'Created-By': System.getProperty('java.runtime.version') + ' (' + System.getProperty('java.vendor') + ')',
+            'Gradle-Version': 'Gradle ' + gradle.getGradleVersion(),
+        )
+    }
+}
+
+application {
+    mainClass = project.mainClassName
+    executableDir = ''
+    applicationDefaultJvmArgs = ['--module-path', 'lib', '--add-modules', 'javafx.controls,javafx.fxml,javafx.swing']
+}
+
+//main distribution generated would be platform-specific to the current OS
+//hence the distribution's name should reflect that
+distributions.main.distributionBaseName = project.name + '-' + javafx.platform.classifier
+
+run {
+    //args '...'
+
+    debugOptions {
+        enabled = true
+        port = 5566
+        server = true
+        suspend = false
+    }
+}
+
+//make an executable fat jar including all dependencies
+//which should work in all supported OS'es (Windows, Mac and Linux)
+task fatJar(type: Jar) {
+    archiveFileName = project.name + '-no-deps.jar'
+    manifest {
+        attributes(
+            'Main-Class': project.launcherClassName,
+            'JavaFX-Version': javafxVersion,
+            'Built-By': System.getProperty('user.name'),
+            'Created-By': System.getProperty('java.runtime.version') + ' (' + System.getProperty('java.vendor') + ')',
+            'Gradle-Version': 'Gradle ' + gradle.getGradleVersion(),
+        )
+    }
+    from {
+        def allClasspaths = sourceSets.main.output + configurations.runtimeClasspath + configurations.otherOSnatives
+        allClasspaths.collect { it.isDirectory() ? it : zipTree(it) }
+    }
+    duplicatesStrategy 'exclude'
+}
+
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000..e708b1c
Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000..1f3fdbc
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
new file mode 100755
index 0000000..4f906e0
--- /dev/null
+++ b/gradlew
@@ -0,0 +1,185 @@
+#!/usr/bin/env sh
+
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=`expr $i + 1`
+    done
+    case $i in
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=`save "$@"`
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
new file mode 100644
index 0000000..107acd3
--- /dev/null
+++ b/gradlew.bat
@@ -0,0 +1,89 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/lib/3DViewer.jar b/lib/3DViewer.jar
deleted file mode 100644
index 20d695c..0000000
Binary files a/lib/3DViewer.jar and /dev/null differ
diff --git a/lib/Viewer3D.jar b/lib/Viewer3D.jar
new file mode 100644
index 0000000..482ccce
Binary files /dev/null and b/lib/Viewer3D.jar differ
diff --git a/lib/controlsfx-8.0.5.jar b/lib/controlsfx-8.0.5.jar
deleted file mode 100644
index 8f7c0b7..0000000
Binary files a/lib/controlsfx-8.0.5.jar and /dev/null differ
diff --git a/src/com/jpl/games/FxDialogs.java b/src/com/jpl/games/FxDialogs.java
new file mode 100644
index 0000000..91527c2
--- /dev/null
+++ b/src/com/jpl/games/FxDialogs.java
@@ -0,0 +1,142 @@
+package com.jpl.games;
+
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
+import javafx.scene.control.Alert;
+import javafx.scene.control.Alert.AlertType;
+import javafx.scene.control.ButtonType;
+import javafx.scene.control.Label;
+import javafx.scene.control.TextArea;
+import javafx.scene.control.TextInputDialog;
+import javafx.scene.layout.GridPane;
+import javafx.scene.layout.Priority;
+import javafx.stage.StageStyle;
+
+/**
+ * Quick, basic dialogs for JavaFX
+ *
+ */
+public class FxDialogs {
+
+    public static void showInformation(String headerText, String message) {
+        showInformation("Information", headerText, message);
+    }
+
+    public static void showInformation(String title, String headerText, String message) {
+        buildAlert(title, headerText, message, AlertType.INFORMATION).showAndWait();
+    }
+
+    private static Alert buildAlert(String title, String headerText, String message, AlertType alertType) {
+        Alert alert = new Alert(alertType);
+        alert.initStyle(StageStyle.UTILITY);
+        alert.setTitle(title);
+        alert.setHeaderText(headerText);
+        alert.setContentText(message);
+        return alert;
+    }
+
+    public static void showWarning(String headerText, String message) {
+        showWarning("Warning", headerText, message);
+    }
+
+    public static void showWarning(String title, String headerText, String message) {
+        buildAlert(title, headerText, message, AlertType.WARNING).showAndWait();
+    }
+
+    public static void showError(String title, String message) {
+        showError("Error", title, message);
+    }
+
+    public static void showError(String title, String headerText, String message) {
+        buildAlert(title, headerText, message, AlertType.ERROR).showAndWait();
+    }
+
+    public static void showException(String headerText, String message, Exception exception) {
+        showException("Exception", headerText, message, exception);
+    }
+
+    public static void showException(String title, String headerText, String message, Exception exception) {
+        Alert alert = buildAlert(title, headerText, message, AlertType.ERROR);
+
+        StringWriter sw = new StringWriter();
+        PrintWriter pw = new PrintWriter(sw);
+        exception.printStackTrace(pw);
+        String exceptionText = sw.toString();
+
+        Label label = new Label("Details:");
+
+        TextArea textArea = new TextArea(exceptionText);
+        textArea.setEditable(false);
+        textArea.setWrapText(true);
+
+        textArea.setMaxWidth(Double.MAX_VALUE);
+        textArea.setMaxHeight(Double.MAX_VALUE);
+        GridPane.setVgrow(textArea, Priority.ALWAYS);
+        GridPane.setHgrow(textArea, Priority.ALWAYS);
+
+        GridPane expContent = new GridPane();
+        expContent.setMaxWidth(Double.MAX_VALUE);
+        expContent.add(label, 0, 0);
+        expContent.add(textArea, 0, 1);
+
+        alert.getDialogPane().setExpandableContent(expContent);
+
+        alert.showAndWait();
+    }
+
+    public static ButtonType showConfirm(String headerText, String message, String... options) {
+        return showConfirm("Choose an option", headerText, message, options);
+    }
+
+    public static ButtonType showConfirm(String title, String headerText, String message, String... options) {
+        List<ButtonType> buttons = null;
+        if (options == null || options.length == 0) {
+            //use default "OK" and "Cancel" button options
+        } else {
+            buttons = new ArrayList<>();
+            for (String option : options) {
+                buttons.add(new ButtonType(option));
+            }
+        }
+
+        return showConfirm(title, headerText, message, buttons==null ? (ButtonType[])null : buttons.toArray(new ButtonType[buttons.size()]));
+    }
+
+    public static ButtonType showConfirm(String title, String headerText, String message, ButtonType... buttons) {
+        Alert alert = buildAlert(title, headerText, message, AlertType.CONFIRMATION);
+
+        if (buttons != null && buttons.length > 0)
+            alert.getButtonTypes().setAll(buttons);
+
+        Optional<ButtonType> result = alert.showAndWait();
+        if (result.isPresent()) {
+            return result.get();
+        } else {
+        	return null;
+        }
+    }
+
+    public static String showTextInput(String headerText, String message, String defaultValue) {
+    	return showTextInput("Input", headerText, message, defaultValue);
+    }
+
+    public static String showTextInput(String title, String headerText, String message, String defaultValue) {
+        TextInputDialog dialog = new TextInputDialog(defaultValue);
+        dialog.initStyle(StageStyle.UTILITY);
+        dialog.setTitle(title);
+        dialog.setHeaderText(headerText);
+        dialog.setContentText(message);
+
+        Optional<String> result = dialog.showAndWait();
+        if (result.isPresent()) {
+            return result.get();
+        } else {
+            return null;
+        }
+    }
+
+}
diff --git a/src/com/jpl/games/Launcher.java b/src/com/jpl/games/Launcher.java
new file mode 100644
index 0000000..a9613fa
--- /dev/null
+++ b/src/com/jpl/games/Launcher.java
@@ -0,0 +1,8 @@
+package com.jpl.games;
+
+public class Launcher {
+    
+    public static void main(String[] args) {
+        RubikFX.main(args);
+    }
+}
diff --git a/src/com/jpl/games/RubikFX.java b/src/com/jpl/games/RubikFX.java
index 415ddd2..345f9f5 100644
--- a/src/com/jpl/games/RubikFX.java
+++ b/src/com/jpl/games/RubikFX.java
@@ -1,13 +1,17 @@
 package com.jpl.games;
 
-import com.jpl.games.model.Move;
-import com.jpl.games.model.Moves;
-import com.jpl.games.model.Rubik;
+import static com.jpl.games.FxDialogs.*;
+
 import java.time.LocalTime;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
+
+import com.jpl.games.model.Move;
+import com.jpl.games.model.Moves;
+import com.jpl.games.model.Rubik;
+
 import javafx.animation.Animation;
 import javafx.animation.KeyFrame;
 import javafx.animation.Timeline;
@@ -19,6 +23,7 @@
 import javafx.scene.Node;
 import javafx.scene.Scene;
 import javafx.scene.control.Button;
+import javafx.scene.control.ButtonType;
 import javafx.scene.control.Label;
 import javafx.scene.control.Separator;
 import javafx.scene.control.ToolBar;
@@ -27,9 +32,6 @@
 import javafx.scene.paint.Color;
 import javafx.stage.Stage;
 import javafx.util.Duration;
-import org.controlsfx.control.action.Action;
-import org.controlsfx.dialog.Dialog;
-import org.controlsfx.dialog.Dialogs;
 
 /**
  *
@@ -64,15 +66,11 @@ public void start(Stage stage) {
                                   new Button("Yi"),new Button("Z"),new Button("Zi"));
         Button bReset=new Button("Restart");
         bReset.setDisable(true);
+        ButtonType[] yesNoButtons = {ButtonType.YES, ButtonType.NO};
         bReset.setOnAction(e->{
             if(moves.getNumMoves()>0){
-                Action response = Dialogs.create()
-                .owner(stage)
-                .title("Warning Dialog")
-                .masthead("Restart Game")
-                .message( "You will lose all your previous movements. Do you want to continue?")
-                .showConfirm();
-                if(response==Dialog.Actions.YES){
+                if (showConfirm("Warning Dialog", "Restart Game",
+                                "You will lose all your previous movements. Do you want to continue?", yesNoButtons) == ButtonType.YES) {
                     moves.getMoves().clear();
                     rubik.doReset();
                 }
@@ -81,13 +79,8 @@ public void start(Stage stage) {
         Button bSc=new Button("Scramble");
         bSc.setOnAction(e->{
             if(moves.getNumMoves()>0){
-                Action response = Dialogs.create()
-                .owner(stage)
-                .title("Warning Dialog")
-                .masthead("Scramble Cube")
-                .message( "You will lose all your previous movements. Do you want to continue?")
-                .showConfirm();
-                if(response==Dialog.Actions.YES){
+                if (showConfirm("Warning Dialog", "Scramble Cube",
+                                "You will lose all your previous movements. Do you want to continue?", yesNoButtons) == ButtonType.YES) {
                     rubik.doReset();
                     doScramble();
                 }
@@ -115,19 +108,11 @@ public void start(Stage stage) {
         bSeq.setOnAction(e->{
             String response;
             if(moves.getNumMoves()>0){
-                response = Dialogs.create()
-                .owner(stage)
-                .title("Warning Dialog")
-                .masthead("Loading a Sequence").lightweight()
-                .message("Add a valid sequence of movements:\n(previous movements will be discarded)")
-                .showTextInput(moves.getSequence());
+                response = showTextInput("Warning Dialog", "Loading a Sequence",
+                        "Add a valid sequence of movements:\n(previous movements will be discarded)", moves.getSequence());
             } else {
-                response = Dialogs.create()
-                .owner(stage)
-                .title("Information Dialog")
-                .masthead("Loading a Sequence").lightweight()
-                .message( "Add a valid sequence of movements")
-                .showTextInput();
+                response = showTextInput("Information Dialog", "Loading a Sequence",
+                        "Add a valid sequence of movements", null);
             }
             System.out.println("r: "+response);
             if(response!=null && !response.isEmpty()){