diff --git a/core/pom.xml b/core/pom.xml
index 06458e568c..619c2c5eb6 100755
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -188,12 +188,12 @@
             <version>1.0.2</version>
         </dependency>
 
-         <dependency>
-             <groupId>com.vinumeris</groupId>
-             <artifactId>updatefx</artifactId>
-             <version>1.2</version>
-         </dependency>
-        
+        <dependency>
+            <groupId>com.vinumeris</groupId>
+            <artifactId>updatefx</artifactId>
+            <version>1.2</version>
+        </dependency>
+
         <!-- 
           <dependency>
                <groupId>com.vinumeris</groupId>
diff --git a/core/src/main/java/io/bitsquare/app/gui/BitsquareAppMain.java b/core/src/main/java/io/bitsquare/app/gui/BitsquareAppMain.java
index 9746ea4ace..091f039838 100644
--- a/core/src/main/java/io/bitsquare/app/gui/BitsquareAppMain.java
+++ b/core/src/main/java/io/bitsquare/app/gui/BitsquareAppMain.java
@@ -76,7 +76,7 @@ public class BitsquareAppMain extends BitsquareExecutable {
         }
         BitsquareEnvironment bitsquareEnvironment = new BitsquareEnvironment(options);
         String updatesDirectory = bitsquareEnvironment.getProperty(BitsquareEnvironment.APP_DATA_DIR_KEY);
-        
+
         // app dir need to be setup before UpdateFX bootstrap
         initAppDir(updatesDirectory);
 
diff --git a/core/src/main/java/io/bitsquare/app/gui/UpdateProcess.java b/core/src/main/java/io/bitsquare/app/gui/UpdateProcess.java
index 6066cd16d1..2b6c2c4da0 100644
--- a/core/src/main/java/io/bitsquare/app/gui/UpdateProcess.java
+++ b/core/src/main/java/io/bitsquare/app/gui/UpdateProcess.java
@@ -53,7 +53,7 @@ public class UpdateProcess {
 
     // Edit version for updateFX
     private static final int BUILD_VERSION = 3;
-    
+
     private static final List<ECPoint> UPDATE_SIGNING_KEYS = Crypto.decode("0296CFF54A8B1611499D4C1024E654140AFBB58C505FE4BB7C847B4F4A7C683DF6");
     private static final String UPDATES_BASE_URL = "http://bitsquare.io/updateFX/";
     private static final int UPDATE_SIGNING_THRESHOLD = 1;
@@ -62,7 +62,7 @@ public class UpdateProcess {
     public static int getBuildVersion() {
         return BUILD_VERSION;
     }
-    
+
     private Environment environment;
 
     public enum State {
@@ -107,7 +107,7 @@ public class UpdateProcess {
             }
         });
         timeoutTimer.start();
-        
+
         String agent = environment.getProperty(BitsquareEnvironment.APP_NAME_KEY) + BUILD_VERSION;
         Path dataDirPath = new File(environment.getProperty(BitsquareEnvironment.APP_DATA_DIR_KEY)).toPath();
         Updater updater = new Updater(UPDATES_BASE_URL, agent, BUILD_VERSION, dataDirPath, ROOT_CLASS_PATH,
@@ -130,7 +130,7 @@ public class UpdateProcess {
         updater.setOnSucceeded(event -> {
             try {
                 UpdateSummary summary = updater.get();
-                log.info("summary " +summary.toString());
+                log.info("summary " + summary.toString());
                 if (summary.descriptions != null && summary.descriptions.size() > 0) {
                     log.info("One liner: {}", summary.descriptions.get(0).getOneLiner());
                     log.info("{}", summary.descriptions.get(0).getDescription());
diff --git a/core/src/main/java/io/bitsquare/arbitrator/tomp2p/TomP2PArbitratorMessageService.java b/core/src/main/java/io/bitsquare/arbitrator/tomp2p/TomP2PArbitratorMessageService.java
index e36afd4c89..321c6d663d 100644
--- a/core/src/main/java/io/bitsquare/arbitrator/tomp2p/TomP2PArbitratorMessageService.java
+++ b/core/src/main/java/io/bitsquare/arbitrator/tomp2p/TomP2PArbitratorMessageService.java
@@ -43,9 +43,9 @@ import org.slf4j.LoggerFactory;
 
 public class TomP2PArbitratorMessageService implements ArbitratorMessageService {
     private static final Logger log = LoggerFactory.getLogger(TomP2PArbitratorMessageService.class);
-    
+
     private static final String ARBITRATORS_ROOT = "ArbitratorsRoot";
-    
+
     private final TomP2PNode tomP2PNode;
     private final List<ArbitratorListener> arbitratorListeners = new ArrayList<>();
     private Executor executor;
@@ -59,7 +59,7 @@ public class TomP2PArbitratorMessageService implements ArbitratorMessageService
         this.tomP2PNode = tomP2PNode;
     }
 
-    
+
     public void setExecutor(Executor executor) {
         this.executor = executor;
     }
diff --git a/core/src/main/java/io/bitsquare/btc/FeePolicy.java b/core/src/main/java/io/bitsquare/btc/FeePolicy.java
index 68e6797b84..0a8209966b 100644
--- a/core/src/main/java/io/bitsquare/btc/FeePolicy.java
+++ b/core/src/main/java/io/bitsquare/btc/FeePolicy.java
@@ -29,7 +29,7 @@ import javax.inject.Inject;
 public class FeePolicy {
 
     public static final Coin TX_FEE = Transaction.REFERENCE_DEFAULT_MIN_TX_FEE;   // dropped down to 0.00001 BTC
-  
+
 
     // TODO: Change REGISTRATION_FEE to 0.00001 (See https://github.com/bitsquare/bitsquare/issues/228)
     public static final Coin REGISTRATION_FEE = TX_FEE.add(TX_FEE);
diff --git a/core/src/main/java/io/bitsquare/gui/Navigation.java b/core/src/main/java/io/bitsquare/gui/Navigation.java
index 3aee0de5ce..90c7f4987a 100644
--- a/core/src/main/java/io/bitsquare/gui/Navigation.java
+++ b/core/src/main/java/io/bitsquare/gui/Navigation.java
@@ -84,7 +84,7 @@ public class Navigation {
         }
 
         currentPath = newPath;
-        persistence.write(this, CURRENT_PATH_KEY, (List<? extends Serializable>)currentPath);
+        persistence.write(this, CURRENT_PATH_KEY, (List<? extends Serializable>) currentPath);
         listeners.stream().forEach((e) -> e.onNavigationRequested(currentPath));
     }
 
diff --git a/core/src/main/java/io/bitsquare/gui/components/confidence/ConfidenceProgressIndicator.java b/core/src/main/java/io/bitsquare/gui/components/confidence/ConfidenceProgressIndicator.java
index a6095e6aca..2dd2bab91d 100644
--- a/core/src/main/java/io/bitsquare/gui/components/confidence/ConfidenceProgressIndicator.java
+++ b/core/src/main/java/io/bitsquare/gui/components/confidence/ConfidenceProgressIndicator.java
@@ -45,22 +45,22 @@ import javafx.scene.control.*;
  * <p>
  * ProgressIndicator sets focusTraversable to false.
  * </p>
- * <p>
- * <p>
+ * <p/>
+ * <p/>
  * This first example creates a ProgressIndicator with an indeterminate value :
  * <pre><code>
  * import javafx.scene.control.ProgressIndicator;
  * ProgressIndicator p1 = new ProgressIndicator();
  * </code></pre>
- * <p>
- * <p>
+ * <p/>
+ * <p/>
  * This next example creates a ProgressIndicator which is 25% complete :
  * <pre><code>
  * import javafx.scene.control.ProgressIndicator;
  * ProgressIndicator p2 = new ProgressIndicator();
  * p2.setProgress(0.25F);
  * </code></pre>
- * <p>
+ * <p/>
  * Implementation of ProgressIndicator According to JavaFX UI Control API Specification
  *
  * @since JavaFX 2.0
@@ -83,7 +83,7 @@ public class ConfidenceProgressIndicator extends Control {
      **************************************************************************/
     /**
      * Initialize the style class to 'progress-indicator'.
-     * <p>
+     * <p/>
      * This is the selector class from which CSS can be used to style
      * this control.
      */
diff --git a/core/src/main/java/io/bitsquare/gui/main/MainViewModel.java b/core/src/main/java/io/bitsquare/gui/main/MainViewModel.java
index 2b6f0d762b..eef5e1cfe9 100644
--- a/core/src/main/java/io/bitsquare/gui/main/MainViewModel.java
+++ b/core/src/main/java/io/bitsquare/gui/main/MainViewModel.java
@@ -148,7 +148,7 @@ class MainViewModel implements ViewModel {
 
     public void initBackend() {
         Platform.runLater(() -> updateProcess.init());
-        
+
         setBitcoinNetworkSyncProgress(-1);
         walletService.getDownloadProgress().subscribe(
                 percentage -> Platform.runLater(() -> {
diff --git a/core/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountViewModel.java b/core/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountViewModel.java
index abcb485bbe..97e2e34ea3 100644
--- a/core/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountViewModel.java
+++ b/core/src/main/java/io/bitsquare/gui/main/account/content/irc/IrcAccountViewModel.java
@@ -126,7 +126,6 @@ class IrcAccountViewModel extends ActivatableWithDataModel<IrcAccountDataModel>
     }
 
 
-
     private InputValidator.ValidationResult validateInput() {
         InputValidator.ValidationResult result = nickNameValidator.validate(dataModel.nickName.get());
         if (dataModel.currency.get() == null)
diff --git a/core/src/main/java/io/bitsquare/gui/main/debug/DebugView.fxml b/core/src/main/java/io/bitsquare/gui/main/debug/DebugView.fxml
index 8f63e8ee8d..9413d04525 100644
--- a/core/src/main/java/io/bitsquare/gui/main/debug/DebugView.fxml
+++ b/core/src/main/java/io/bitsquare/gui/main/debug/DebugView.fxml
@@ -60,7 +60,7 @@
             <Insets bottom="-15"/>
         </GridPane.margin>
     </Label>
-    <CheckBox fx:id="interceptBeforeCheckBox" onAction="#onCheckBoxChanged"  GridPane.rowIndex="3" GridPane.columnIndex="1">
+    <CheckBox fx:id="interceptBeforeCheckBox" onAction="#onCheckBoxChanged" GridPane.rowIndex="3" GridPane.columnIndex="1">
         <GridPane.margin>
             <Insets bottom="-15"/>
         </GridPane.margin>
diff --git a/core/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesViewModel.java b/core/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesViewModel.java
index d0ec55849c..66e5d52363 100644
--- a/core/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesViewModel.java
+++ b/core/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesViewModel.java
@@ -50,5 +50,4 @@ class PreferencesViewModel extends ActivatableWithDataModel<PreferencesDataModel
     }
 
 
-
 }
diff --git a/core/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferDataModel.java b/core/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferDataModel.java
index 14c8b4b463..74e24c884a 100644
--- a/core/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferDataModel.java
+++ b/core/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferDataModel.java
@@ -264,7 +264,6 @@ class CreateOfferDataModel implements Activatable, DataModel {
     }
 
 
-
     private void updateBalance(@NotNull Coin balance) {
         isWalletFunded.set(totalToPayAsCoin.get() != null && balance.compareTo(totalToPayAsCoin.get()) >= 0);
     }
diff --git a/core/src/main/java/io/bitsquare/gui/util/BSFormatter.java b/core/src/main/java/io/bitsquare/gui/util/BSFormatter.java
index f907dde55b..c07b2d3299 100644
--- a/core/src/main/java/io/bitsquare/gui/util/BSFormatter.java
+++ b/core/src/main/java/io/bitsquare/gui/util/BSFormatter.java
@@ -48,7 +48,7 @@ import org.slf4j.LoggerFactory;
 
 /**
  * Central point for formatting and input parsing.
- * <p>
+ * <p/>
  * Note that we never use for text input values any coin or currency symbol or code.
  * BtcFormat does not support
  */
diff --git a/core/src/main/java/io/bitsquare/gui/util/validation/BtcAddressValidator.java b/core/src/main/java/io/bitsquare/gui/util/validation/BtcAddressValidator.java
index a6f953d761..ded4440a63 100644
--- a/core/src/main/java/io/bitsquare/gui/util/validation/BtcAddressValidator.java
+++ b/core/src/main/java/io/bitsquare/gui/util/validation/BtcAddressValidator.java
@@ -26,7 +26,7 @@ import javax.inject.Inject;
 
 /**
  * BtcValidator for validating BTC values.
- * <p>
+ * <p/>
  * That class implements just what we need for the moment. It is not intended as a general purpose library class.
  */
 public final class BtcAddressValidator extends InputValidator {
diff --git a/core/src/main/java/io/bitsquare/gui/util/validation/BtcValidator.java b/core/src/main/java/io/bitsquare/gui/util/validation/BtcValidator.java
index 03af6479ab..82b3c86ed5 100644
--- a/core/src/main/java/io/bitsquare/gui/util/validation/BtcValidator.java
+++ b/core/src/main/java/io/bitsquare/gui/util/validation/BtcValidator.java
@@ -25,7 +25,7 @@ import java.math.BigDecimal;
 
 /**
  * BtcValidator for validating BTC values.
- * <p>
+ * <p/>
  * That class implements just what we need for the moment. It is not intended as a general purpose library class.
  */
 public final class BtcValidator extends NumberValidator {
diff --git a/core/src/main/java/io/bitsquare/gui/util/validation/FiatValidator.java b/core/src/main/java/io/bitsquare/gui/util/validation/FiatValidator.java
index 3bf343e31d..355753ff3b 100644
--- a/core/src/main/java/io/bitsquare/gui/util/validation/FiatValidator.java
+++ b/core/src/main/java/io/bitsquare/gui/util/validation/FiatValidator.java
@@ -25,7 +25,7 @@ import javax.inject.Inject;
 
 /**
  * FiatNumberValidator for validating fiat values.
- * <p>
+ * <p/>
  * That class implements just what we need for the moment. It is not intended as a general purpose library class.
  */
 public final class FiatValidator extends NumberValidator {
diff --git a/core/src/main/java/io/bitsquare/gui/util/validation/InputValidator.java b/core/src/main/java/io/bitsquare/gui/util/validation/InputValidator.java
index c60656dd42..4bef1ab5bd 100644
--- a/core/src/main/java/io/bitsquare/gui/util/validation/InputValidator.java
+++ b/core/src/main/java/io/bitsquare/gui/util/validation/InputValidator.java
@@ -21,7 +21,7 @@ import io.bitsquare.locale.BSResources;
 
 /**
  * Base class for other specialized validators.
- * <p>
+ * <p/>
  * That class implements just what we need for the moment. It is not intended as a general purpose library class.
  */
 public class InputValidator {
diff --git a/core/src/main/java/io/bitsquare/gui/util/validation/NumberValidator.java b/core/src/main/java/io/bitsquare/gui/util/validation/NumberValidator.java
index 4b2753a2e1..70d75d2d8a 100644
--- a/core/src/main/java/io/bitsquare/gui/util/validation/NumberValidator.java
+++ b/core/src/main/java/io/bitsquare/gui/util/validation/NumberValidator.java
@@ -24,7 +24,7 @@ import io.bitsquare.locale.BSResources;
  * Localisation not supported at the moment
  * The decimal mark can be either "." or ",". Thousand separators are not supported yet,
  * but might be added alter with Local support.
- * <p>
+ * <p/>
  * That class implements just what we need for the moment. It is not intended as a general purpose library class.
  */
 public abstract class NumberValidator extends InputValidator {
diff --git a/core/src/main/java/io/bitsquare/gui/util/validation/OptionalBtcValidator.java b/core/src/main/java/io/bitsquare/gui/util/validation/OptionalBtcValidator.java
index fd52cb939d..9edb0ac510 100644
--- a/core/src/main/java/io/bitsquare/gui/util/validation/OptionalBtcValidator.java
+++ b/core/src/main/java/io/bitsquare/gui/util/validation/OptionalBtcValidator.java
@@ -25,7 +25,7 @@ import java.math.BigDecimal;
 
 /**
  * BtcValidator for validating BTC values.
- * <p>
+ * <p/>
  * That class implements just what we need for the moment. It is not intended as a general purpose library class.
  */
 public final class OptionalBtcValidator extends NumberValidator {
diff --git a/core/src/main/java/io/bitsquare/gui/util/validation/OptionalFiatValidator.java b/core/src/main/java/io/bitsquare/gui/util/validation/OptionalFiatValidator.java
index 0a64946550..1201635c8c 100644
--- a/core/src/main/java/io/bitsquare/gui/util/validation/OptionalFiatValidator.java
+++ b/core/src/main/java/io/bitsquare/gui/util/validation/OptionalFiatValidator.java
@@ -25,7 +25,7 @@ import javax.inject.Inject;
 
 /**
  * FiatNumberValidator for validating fiat values.
- * <p>
+ * <p/>
  * That class implements just what we need for the moment. It is not intended as a general purpose library class.
  */
 public final class OptionalFiatValidator extends NumberValidator {
diff --git a/core/src/main/java/io/bitsquare/modena.css b/core/src/main/java/io/bitsquare/modena.css
index 65796ee424..1b97aa73b0 100644
--- a/core/src/main/java/io/bitsquare/modena.css
+++ b/core/src/main/java/io/bitsquare/modena.css
@@ -99,16 +99,16 @@ is being used to size a border should also be in pixels.
      * -fx-text-background-color, which should be used as the -fx-text-fill
      * value for text painted on top of backgrounds colored with -fx-background.
      */
-    -fx-background: derive(-fx-base,26.4%);
+    -fx-background: derive(-fx-base, 26.4%);
 
     /* Used for the inside of text boxes, password boxes, lists, trees, and
      * tables.  See also -fx-text-inner-color, which should be used as the
      * -fx-text-fill value for text painted on top of backgrounds colored
      * with -fx-control-inner-background.
      */
-    -fx-control-inner-background: derive(-fx-base,80%);
+    -fx-control-inner-background: derive(-fx-base, 80%);
     /* Version of -fx-control-inner-background for alternative rows */
-    -fx-control-inner-background-alt: derive(-fx-control-inner-background,-2%);
+    -fx-control-inner-background-alt: derive(-fx-control-inner-background, -2%);
 
     /* One of these colors will be chosen based upon a ladder calculation
      * that uses the brightness of a background color.  Instead of using these
@@ -189,46 +189,46 @@ is being used to size a border should also be in pixels.
      * "hovered" pseudoclass state.
      */
     -fx-hover-base: ladder(
-        -fx-base,
-        derive(-fx-base,20%) 20%,
-        derive(-fx-base,30%) 35%,
-        derive(-fx-base,40%) 50%
-     );
+            -fx-base,
+            derive(-fx-base, 20%) 20%,
+            derive(-fx-base, 30%) 35%,
+            derive(-fx-base, 40%) 50%
+    );
 
     /* A little darker than -fx-base and used as the -fx-color for the
      * "armed" pseudoclass state.
      *
      * TODO: should this be renamed to -fx-armed-base?
      */
-    -fx-pressed-base: derive(-fx-base,-6%);
+    -fx-pressed-base: derive(-fx-base, -6%);
 
     /* The color to use for -fx-text-fill when text is to be painted on top of
      * a background filled with the -fx-background color.
      */
     -fx-text-background-color: ladder(
-        -fx-background,
-        -fx-light-text-color 45%,
-        -fx-dark-text-color  46%,
-        -fx-dark-text-color  59%,
-        -fx-mid-text-color   60%
+            -fx-background,
+            -fx-light-text-color 45%,
+            -fx-dark-text-color 46%,
+            -fx-dark-text-color 59%,
+            -fx-mid-text-color 60%
     );
 
     /* A little darker than -fx-color and used to draw boxes around objects such
      * as progress bars, scroll bars, scroll panes, trees, tables, and lists.
      */
     -fx-box-border: ladder(
-        -fx-color,
-        black 20%,
-        derive(-fx-color,-15%) 30%
+            -fx-color,
+            black 20%,
+            derive(-fx-color, -15%) 30%
     );
 
     /* Darker than -fx-background and used to draw boxes around text boxes and
      * password boxes.
      */
     -fx-text-box-border: ladder(
-        -fx-background,
-        black 10%,
-        derive(-fx-background, -15%) 30%
+            -fx-background,
+            black 10%,
+            derive(-fx-background, -15%) 30%
     );
 
     /* Lighter than -fx-background and used to provide a small highlight when
@@ -236,13 +236,13 @@ is being used to size a border should also be in pixels.
      * keep -fx-shadow-highlight-color name to be compatible with Caspian.
      */
     -fx-shadow-highlight-color: ladder(
-        -fx-background,
-        rgba(255,255,255,0.07) 0%,
-        rgba(255,255,255,0.07) 20%,
-        rgba(255,255,255,0.07) 70%,
-        rgba(255,255,255,0.7) 90%,
-        rgba(255,255,255,0.75) 100%
-      );
+            -fx-background,
+            rgba(255, 255, 255, 0.07) 0%,
+            rgba(255, 255, 255, 0.07) 20%,
+            rgba(255, 255, 255, 0.07) 70%,
+            rgba(255, 255, 255, 0.7) 90%,
+            rgba(255, 255, 255, 0.75) 100%
+    );
 
     /* A gradient that goes from a little darker than -fx-color on the top to
      * even more darker than -fx-color on the bottom.  Typically is the second
@@ -250,7 +250,7 @@ is being used to size a border should also be in pixels.
      * a control. It is typically the same size as the control (i.e., insets
      * are 0).
      */
-    -fx-outer-border: derive(-fx-color,-23%);
+    -fx-outer-border: derive(-fx-color, -23%);
 
     /* A gradient that goes from a bit lighter than -fx-color on the top to
      * a little darker at the bottom.  Typically is the third color in the
@@ -258,77 +258,77 @@ is being used to size a border should also be in pixels.
      * Insets are typically 1.
      */
     -fx-inner-border: linear-gradient(to bottom,
-                ladder(
-                    -fx-color,
-                    derive(-fx-color,30%) 0%,
-                    derive(-fx-color,20%) 40%,
-                    derive(-fx-color,25%) 60%,
-                    derive(-fx-color,55%) 80%,
-                    derive(-fx-color,55%) 90%,
-                    derive(-fx-color,75%) 100%
-                ),
-                ladder(
-                    -fx-color,
-                    derive(-fx-color,20%) 0%,
-                    derive(-fx-color,10%) 20%,
-                    derive(-fx-color,5%) 40%,
-                    derive(-fx-color,-2%) 60%,
-                    derive(-fx-color,-5%) 100%
-                ));
-    -fx-inner-border-horizontal: linear-gradient(to right, derive(-fx-color,55%), derive(-fx-color,-5%));
-    -fx-inner-border-bottomup: linear-gradient(to top, derive(-fx-color,55%), derive(-fx-color,-5%));
+    ladder(
+            -fx-color,
+            derive(-fx-color, 30%) 0%,
+            derive(-fx-color, 20%) 40%,
+            derive(-fx-color, 25%) 60%,
+            derive(-fx-color, 55%) 80%,
+            derive(-fx-color, 55%) 90%,
+            derive(-fx-color, 75%) 100%
+    ),
+    ladder(
+            -fx-color,
+            derive(-fx-color, 20%) 0%,
+            derive(-fx-color, 10%) 20%,
+            derive(-fx-color, 5%) 40%,
+            derive(-fx-color, -2%) 60%,
+            derive(-fx-color, -5%) 100%
+    ));
+    -fx-inner-border-horizontal: linear-gradient(to right, derive(-fx-color, 55%), derive(-fx-color, -5%));
+    -fx-inner-border-bottomup: linear-gradient(to top, derive(-fx-color, 55%), derive(-fx-color, -5%));
 
     /* A gradient that goes from a little lighter than -fx-color at the top to
      * a little darker than -fx-color at the bottom and is used to fill the
      * body of many controls such as buttons.
      */
     -fx-body-color: linear-gradient(to bottom,
-            ladder(
-                -fx-color,
-                derive(-fx-color,8%) 75%,
-                derive(-fx-color,10%) 80%
-            ),
-            derive(-fx-color,-8%));
-    -fx-body-color-bottomup: linear-gradient(to top, derive(-fx-color,10%) ,derive(-fx-color,-6%));
-    -fx-body-color-to-right: linear-gradient(to right, derive(-fx-color,10%) ,derive(-fx-color,-6%));
+    ladder(
+            -fx-color,
+            derive(-fx-color, 8%) 75%,
+            derive(-fx-color, 10%) 80%
+    ),
+    derive(-fx-color, -8%));
+    -fx-body-color-bottomup: linear-gradient(to top, derive(-fx-color, 10%), derive(-fx-color, -6%));
+    -fx-body-color-to-right: linear-gradient(to right, derive(-fx-color, 10%), derive(-fx-color, -6%));
 
     /* The color to use as -fx-text-fill when painting text on top of
      * backgrounds filled with -fx-base, -fx-color, and -fx-body-color.
      */
     -fx-text-base-color: ladder(
-        -fx-color,
-        -fx-light-text-color 45%,
-        -fx-dark-text-color  46%,
-        -fx-dark-text-color  59%,
-        -fx-mid-text-color   60%
+            -fx-color,
+            -fx-light-text-color 45%,
+            -fx-dark-text-color 46%,
+            -fx-dark-text-color 59%,
+            -fx-mid-text-color 60%
     );
 
     /* The color to use as -fx-text-fill when painting text on top of
      * backgrounds filled with -fx-control-inner-background.
      */
     -fx-text-inner-color: ladder(
-        -fx-control-inner-background,
-        -fx-light-text-color 45%,
-        -fx-dark-text-color  46%,
-        -fx-dark-text-color  59%,
-        -fx-mid-text-color   60%
+            -fx-control-inner-background,
+            -fx-light-text-color 45%,
+            -fx-dark-text-color 46%,
+            -fx-dark-text-color 59%,
+            -fx-mid-text-color 60%
     );
 
     /* The color to use for small mark-like objects such as checks on check
      * boxes, filled in circles in radio buttons, arrows on scroll bars, etc.
      */
     -fx-mark-color: ladder(
-        -fx-color,
-        white 30%,
-        derive(-fx-color,-63%) 31%
+            -fx-color,
+            white 30%,
+            derive(-fx-color, -63%) 31%
     );
 
     /* The small thin light "shadow" for mark-like objects. Typically used in
      * conjunction with -fx-mark-color with an insets of 1 0 -1 0. */
     -fx-mark-highlight-color: ladder(
-        -fx-color,
-        derive(-fx-color,80%) 60%,
-        white 70%
+            -fx-color,
+            derive(-fx-color, 80%) 60%,
+            white 70%
     );
 
     /* Background for items in list like things such as menus, lists, trees,
@@ -356,7 +356,7 @@ is being used to size a border should also be in pixels.
     -fx-cell-hover-color: #cce3f4;
 
     /** Focus line for keyboard focus traversal on cell based controls */
-    -fx-cell-focus-inner-border: derive(-fx-selection-bar,30%);
+    -fx-cell-focus-inner-border: derive(-fx-selection-bar, 30%);
 
     /* The colors to use in Pagination */
     -fx-page-bullet-border: #acacac;
@@ -414,9 +414,11 @@ is being used to size a border should also be in pixels.
     -fx-alignment: CENTER;
     -fx-content-display: LEFT;
 }
+
 .menu-button > .label {
     -fx-alignment: CENTER_LEFT;
 }
+
 .button:hover,
 .toggle-button:hover,
 .radio-button:hover > .radio,
@@ -426,7 +428,7 @@ is being used to size a border should also be in pixels.
 .split-menu-button > .arrow-button:hover,
 .slider .thumb:hover,
 .scroll-bar > .thumb:hover,
-.scroll-bar > .increment-button:hover, 
+.scroll-bar > .increment-button:hover,
 .scroll-bar > .decrement-button:hover,
 .choice-box:hover,
 .color-picker.split-button > .arrow-button:hover,
@@ -436,6 +438,7 @@ is being used to size a border should also be in pixels.
 .tab-pane > .tab-header-area > .control-buttons-tab > .container > .tab-down-button:hover {
     -fx-color: -fx-hover-base;
 }
+
 .button:armed,
 .toggle-button:armed,
 .radio-button:armed > .radio,
@@ -446,7 +449,7 @@ is being used to size a border should also be in pixels.
 .split-menu-button:showing > .arrow-button,
 .slider .thumb:pressed,
 .scroll-bar > .thumb:pressed,
-.scroll-bar > .increment-button:pressed, 
+.scroll-bar > .increment-button:pressed,
 .scroll-bar > .decrement-button:pressed,
 .choice-box:showing,
 .combo-box-base:showing,
@@ -454,6 +457,7 @@ is being used to size a border should also be in pixels.
 .tab-pane > .tab-header-area > .control-buttons-tab > .container > .tab-down-button:pressed {
     -fx-color: -fx-pressed-base;
 }
+
 .button:focused,
 .toggle-button:focused,
 .radio-button:focused > .radio,
@@ -531,13 +535,13 @@ is being used to size a border should also be in pixels.
 .split-menu-button:show-mnemonics > .mnemonic-underline,
 .menu-button:show-mnemonics > .mnemonic-underline {
     -fx-stroke: -fx-text-base-color;
-} 
+}
 
 /* ====   MARKS   =========================================================== */
 
 .radio-button:selected > .radio > .dot,
 .check-box:selected > .box > .mark,
-.check-box:indeterminate  > .box > .mark {
+.check-box:indeterminate > .box > .mark {
     -fx-background-color: -fx-mark-highlight-color, -fx-mark-color;
     -fx-background-insets: 1 0 -1 0, 0;
 }
@@ -551,12 +555,13 @@ is being used to size a border should also be in pixels.
     -fx-padding: 0.25em;
     -fx-shape: "M 0 -3.5 v 7 l 4 -3.5 z";
 }
+
 .choice-box > .open-button > .arrow,
 .menu-button:openvertically > .arrow-button > .arrow,
 .split-menu-button:openvertically > .arrow-button > .arrow,
 .combo-box-base > .arrow-button > .arrow,
 .web-view .form-select-button .arrow,
-.tab-pane > .tab-header-area > .control-buttons-tab > .container > .tab-down-button > .arrow  {
+.tab-pane > .tab-header-area > .control-buttons-tab > .container > .tab-down-button > .arrow {
     -fx-background-color: -fx-mark-highlight-color, -fx-mark-color;
     -fx-background-insets: 0 0 -1 0, 0;
     -fx-padding: 0.166667em 0.333333em 0.166667em 0.333333em; /* 2 4 2 4 */
@@ -570,12 +575,14 @@ is being used to size a border should also be in pixels.
 .combo-box-base {
     -fx-padding: 0;
 }
+
 .choice-box > .label,
 .menu-button > .label,
 .color-picker > .label {
     -fx-padding: 0.333333em 0.666667em 0.333333em 0.666667em; /* 4 8 4 8 */
     -fx-text-fill: -fx-text-base-color;
 }
+
 .choice-box > .open-button,
 .menu-button > .arrow-button {
     -fx-padding: 0.5em 0.667em 0.5em 0.0em; /* 6 8 6 0 */
@@ -587,13 +594,14 @@ is being used to size a border should also be in pixels.
 .split-pane,
 .list-view,
 .tree-view,
-.table-view, 
+.table-view,
 .tree-table-view,
 .html-editor {
     -fx-background-color: -fx-box-border, -fx-control-inner-background;
     -fx-background-insets: 0, 1;
     -fx-padding: 1;
 }
+
 .scroll-pane:focused,
 .split-pane:focused,
 .list-view:focused,
@@ -601,18 +609,20 @@ is being used to size a border should also be in pixels.
 .table-view:focused,
 .tree-table-view:focused,
 .html-editor:focused {
-    -fx-background-color: -fx-faint-focus-color, -fx-focus-color, -fx-control-inner-background; 
+    -fx-background-color: -fx-faint-focus-color, -fx-focus-color, -fx-control-inner-background;
     -fx-background-insets: -1.4, -0.3, 1;
     -fx-background-radius: 2, 0, 0;
 }
+
 /* ones with grey -fx-background not lighter -fx-control-inner-background */
 .scroll-pane,
 .split-pane {
     -fx-background-color: -fx-box-border, -fx-background;
 }
+
 .scroll-pane:focused,
 .split-pane:focused {
-    -fx-background-color: -fx-faint-focus-color, -fx-focus-color, -fx-background; 
+    -fx-background-color: -fx-faint-focus-color, -fx-focus-color, -fx-background;
 }
 
 /*******************************************************************************
@@ -652,39 +662,47 @@ is being used to size a border should also be in pixels.
     -fx-background-insets: 0 0 -1 0, 0, 1, 2;
     -fx-padding: 0.333333em 0.666667em 0.333333em 0.75em; /* 4 8 4 9 */
 }
+
 .button.center-pill,
 .toggle-button.center-pill {
     -fx-background-radius: 0;
-    -fx-background-insets: 0 0 -1 0, 0 0 0 0, 1 1 1 0, 2 2 2 1 ;
+    -fx-background-insets: 0 0 -1 0, 0 0 0 0, 1 1 1 0, 2 2 2 1;
 }
+
 .button.right-pill,
 .toggle-button.right-pill {
     -fx-background-radius: 0 3 3 0, 0 3 3 0, 0 2 2 0, 0 1 1 0;
-    -fx-background-insets: 0 0 -1 0, 0, 1 1 1 0, 2 2 2 1 ;
+    -fx-background-insets: 0 0 -1 0, 0, 1 1 1 0, 2 2 2 1;
 }
+
 .button.left-pill:focused,
 .toggle-button.left-pill:focused {
     -fx-background-insets: -0.2 0 -0.2 -0.2, 1, 2, -1.4 0 -1.4 -1.4, 2.6;
     -fx-background-radius: 3 0 0 3, 2 0 0 2, 1 0 0 1, 4 0 0 4, 1 0 0 1;
 }
+
 .button.center-pill:focused,
 .toggle-button.center-pill:focused {
     -fx-background-insets: -0.2 0 -0.2 -1, 1 1 1 0, 2 2 2 1, -1.4 0 -1.4 -1, 2.6 2.6 2.6 1.6;
     -fx-background-radius: 0, 0, 0, 0, 0;
 }
+
 .button.right-pill:focused,
 .toggle-button.right-pill:focused {
     -fx-background-insets: -0.2 -0.2 -0.2 -1, 1 1 1 0, 2 2 2 1, -1.4 -1.4 -1.4 -1, 2.6 2.6 2.6 1.6;
     -fx-background-radius: 0 3 3 0, 0 2 2 0, 0 1 1 0, 0 4 4 0, 0 1 1 0;
 }
+
 .toggle-button:selected.left-pill:focused {
     -fx-background-insets: -0.2 0 -0.2 -0.2, 1, -1.4 0 -1.4 -1.4, 2.6;
     -fx-background-radius: 3 0 0 3, 2 0 0 2, 4 0 0 4, 0;
 }
+
 .toggle-button:selected.center-pill:focused {
     -fx-background-insets: -0.2 0 -0.2 -1, 1 1 1 0, -1.4 0 -1.4 -1, 2.6 2.6 2.6 1.6;
     -fx-background-radius: 0, 0, 0, 0;
 }
+
 .toggle-button:selected.right-pill:focused {
     -fx-background-insets: -0.2 -0.2 -0.2 -1, 1 1 1 0, -1.4 -1.4 -1.4 -1, 2.6 2.6 2.6 1.6;
     -fx-background-radius: 0 3 3 0, 0 2 2 0, 0 4 4 0, 0;
@@ -693,24 +711,23 @@ is being used to size a border should also be in pixels.
 /* ====   SELECTED TOGGLE   ================================================= */
 
 .toggle-button:selected {
-        -fx-background-color:
-            -fx-shadow-highlight-color,
-            linear-gradient(to bottom, derive(-fx-outer-border, -20%), -fx-outer-border),
-            linear-gradient(to bottom, 
-                    derive(-fx-color, -22%) 0%,
-                    derive(-fx-color, -13%) 20%,
-                    derive(-fx-color, -11%) 50%);
+    -fx-background-color: -fx-shadow-highlight-color,
+    linear-gradient(to bottom, derive(-fx-outer-border, -20%), -fx-outer-border),
+    linear-gradient(to bottom,
+            derive(-fx-color, -22%) 0%,
+            derive(-fx-color, -13%) 20%,
+            derive(-fx-color, -11%) 50%);
     -fx-background-insets: 0 0 -1 0, 0, 1;
 }
+
 .toggle-button:selected:focused {
-    -fx-background-color:
-        -fx-focus-color,
-        linear-gradient(to bottom,
+    -fx-background-color: -fx-focus-color,
+    linear-gradient(to bottom,
             derive(-fx-color, -22%) 0%,
             derive(-fx-color, -13%) 20%,
             derive(-fx-color, -11%) 50%),
-        -fx-faint-focus-color,
-        linear-gradient(to bottom,
+    -fx-faint-focus-color,
+    linear-gradient(to bottom,
             derive(-fx-color, -22%) 0%,
             derive(-fx-color, -13%) 20%,
             derive(-fx-color, -11%) 50%);
@@ -728,15 +745,17 @@ is being used to size a border should also be in pixels.
     -fx-label-padding: 0.0em 0.0em 0.0em 0.416667em; /* 0 0 0 5 */
     -fx-text-fill: -fx-text-background-color;
 }
+
 .radio-button > .radio,
-.radio-button:focused > .radio  {
-   -fx-background-radius: 1.0em; /* large value to make sure this remains circular */
-   -fx-padding: 0.333333em; /* 4 -- padding from outside edge to the inner black dot */
+.radio-button:focused > .radio {
+    -fx-background-radius: 1.0em; /* large value to make sure this remains circular */
+    -fx-padding: 0.333333em; /* 4 -- padding from outside edge to the inner black dot */
 }
+
 .radio-button > .radio > .dot {
-   -fx-background-color: transparent;
-   -fx-background-radius: 1.0em; /* large value to make sure this remains circular */
-   -fx-padding: 0.333333em; /* 4 -- radius of the inner black dot when selected */
+    -fx-background-color: transparent;
+    -fx-background-radius: 1.0em; /* large value to make sure this remains circular */
+    -fx-padding: 0.333333em; /* 4 -- radius of the inner black dot when selected */
 }
 
 /*******************************************************************************
@@ -749,19 +768,23 @@ is being used to size a border should also be in pixels.
     -fx-label-padding: 0.0em 0.0em 0.0em 0.416667em; /* 0 0 0 5 */
     -fx-text-fill: -fx-text-background-color;
 }
+
 .check-box > .box {
     -fx-background-radius: 3, 2, 1;
     -fx-padding: 0.166667em 0.166667em 0.25em 0.25em; /* 2 2 3 3 */
 }
+
 .check-box > .box > .mark {
     -fx-background-color: null;
     -fx-padding: 0.416667em 0.416667em 0.5em 0.5em; /* 5 5 6 6 */
     -fx-shape: "M-0.25,6.083c0.843-0.758,4.583,4.833,5.75,4.833S14.5-1.5,15.917-0.917c1.292,0.532-8.75,17.083-10.5,17.083C3,16.167-1.083,6.833-0.25,6.083z";
 }
+
 .check-box:indeterminate > .box {
-    -fx-padding: 0; 
+    -fx-padding: 0;
 }
-.check-box:indeterminate  > .box > .mark {
+
+.check-box:indeterminate > .box > .mark {
     -fx-shape: "M0,0H10V2H0Z";
     -fx-scale-shape: false;
     -fx-padding: 0.666667em; /* 16x16 = 8+8 */
@@ -781,29 +804,35 @@ is being used to size a border should also be in pixels.
     -fx-border-color: transparent;
     -fx-border-width: 1px;
 }
+
 .hyperlink,
 .hyperlink:hover,
 .hyperlink:hover:visited {
     -fx-text-fill: -fx-accent;
 }
+
 .hyperlink:armed,
 .hyperlink:visited,
 .hyperlink:hover:armed {
     -fx-text-fill: -fx-text-background-color;
 }
+
 .hyperlink:hover,
 .hyperlink:visited,
 .hyperlink:hover:visited {
     -fx-underline: true;
 }
+
 .hyperlink:visited:armed {
     -fx-underline: false;
 }
+
 .hyperlink:focused {
     -fx-border-color: -fx-focus-color;
     -fx-border-style: segments(0.166667em, 0.166667em);
     -fx-border-width: 1px;
 }
+
 .hyperlink:show-mnemonics > .mnemonic-underline {
     -fx-stroke: -fx-text-fill;
 }
@@ -815,36 +844,41 @@ is being used to size a border should also be in pixels.
  ******************************************************************************/
 
 .split-menu-button {
-    -fx-background-color: -fx-shadow-highlight-color, -fx-outer-border; 
+    -fx-background-color: -fx-shadow-highlight-color, -fx-outer-border;
     -fx-background-insets: 0 0 -1 0, 0;
     -fx-background-radius: 3, 3;
     -fx-padding: 0;
 }
+
 .split-menu-button > .label {
     -fx-text-fill: -fx-text-base-color;
-    -fx-background-color: -fx-inner-border, -fx-body-color; 
+    -fx-background-color: -fx-inner-border, -fx-body-color;
     -fx-background-insets: 1 0 1 1, 2 1 2 2;
     -fx-background-radius: 2 0 0 2, 1 0 0 1;
     -fx-padding: 0.333333em 0.667em 0.333333em 0.667em; /* 4 8 4 8 */
 }
+
 .split-menu-button > .arrow-button {
-    -fx-background-color: -fx-inner-border, -fx-body-color; 
+    -fx-background-color: -fx-inner-border, -fx-body-color;
     -fx-background-insets: 1, 2;
     -fx-background-radius: 0 2 2 0, 0 1 1 0;
     -fx-padding: 0.5em 0.667em 0.5em 0.667em; /* 6 8 6 8 */
 }
+
 .split-menu-button:focused {
     -fx-background-color: -fx-focus-color;
     -fx-background-insets: -0.2;
     -fx-background-radius: 3;
 }
+
 .split-menu-button:focused > .label {
-    -fx-background-color: -fx-inner-border, -fx-body-color, -fx-faint-focus-color, -fx-body-color; 
+    -fx-background-color: -fx-inner-border, -fx-body-color, -fx-faint-focus-color, -fx-body-color;
     -fx-background-insets: 1 0 1 1, 2 1 2 2, -1.4 0 -1.4 -1.4, 2.6 1.6 2.6 2.6;
     -fx-background-radius: 2 0 0 2, 1 0 0 1, 4 0 0 4, 0;
 }
+
 .split-menu-button:focused > .arrow-button {
-    -fx-background-color: -fx-inner-border, -fx-body-color, -fx-faint-focus-color, -fx-body-color; 
+    -fx-background-color: -fx-inner-border, -fx-body-color, -fx-faint-focus-color, -fx-body-color;
     -fx-background-insets: 1, 2, -1.4, 2.6;
     -fx-background-radius: 0 2 2 0, 0 1 1 0, 0 4 4 0, 0;
 }
@@ -855,56 +889,63 @@ is being used to size a border should also be in pixels.
  *                                                                             *
  ******************************************************************************/
 
-.tool-bar:vertical { /* left */
-    -fx-background-color:
-        -fx-outer-border,
-        linear-gradient(to right, derive(-fx-base,0%) 0%, derive(-fx-base,10%) 50%, derive(-fx-base,0%) 100%);
+.tool-bar:vertical {
+    /* left */
+    -fx-background-color: -fx-outer-border,
+    linear-gradient(to right, derive(-fx-base, 0%) 0%, derive(-fx-base, 10%) 50%, derive(-fx-base, 0%) 100%);
     -fx-background-insets: 0, 0 0 0 1;
     -fx-padding: 0.5em 0.416667em 0.5em 0.416667em; /* 6 5 6 5 */
     -fx-spacing: 0.333em; /* 4 */
     -fx-alignment: TOP_LEFT;
 }
-.tool-bar { /* top */
+
+.tool-bar {
+    /* top */
     TOP-COLOR: ladder(
-        -fx-base,
-        derive(-fx-base,0%) 0%,
-        derive(-fx-base,46%) 100%
+            -fx-base,
+            derive(-fx-base, 0%) 0%,
+            derive(-fx-base, 46%) 100%
     );
-    -fx-background-color:
-        linear-gradient(to bottom, derive(TOP-COLOR,25%) 0%, -fx-outer-border 90%),
-        linear-gradient(to bottom, TOP-COLOR 2%, derive(-fx-base,-2.1%) 95%);
+    -fx-background-color: linear-gradient(to bottom, derive(TOP-COLOR, 25%) 0%, -fx-outer-border 90%),
+    linear-gradient(to bottom, TOP-COLOR 2%, derive(-fx-base, -2.1%) 95%);
     -fx-background-insets: 0 0 0 0, 1 0 1 0;
     -fx-padding: 0.416667em 0.5em 0.416667em 0.5em; /* 5 6  5 6 */
     -fx-spacing: 0.333em; /* 4 */
     -fx-alignment: CENTER_LEFT;
 }
+
 .tool-bar:vertical.right {
     -fx-background-insets: 0, 0 1 0 0;
 }
+
 .tool-bar.bottom {
-    -fx-background-color:
-        -fx-outer-border,
-        derive(TOP-COLOR,25%),
-        linear-gradient(to bottom, TOP-COLOR 2%, derive(-fx-base,-2.1%) 95%);
+    -fx-background-color: -fx-outer-border,
+    derive(TOP-COLOR, 25%),
+    linear-gradient(to bottom, TOP-COLOR 2%, derive(-fx-base, -2.1%) 95%);
     -fx-background-insets: 0, 1 0 0 0, 2 0 0 0;
 }
+
 .tool-bar > .container > .separator {
     -fx-orientation: vertical;
 }
+
 .tool-bar:vertical > .container > .separator {
-    -fx-orientation: horizontal;    
+    -fx-orientation: horizontal;
 }
+
 .tool-bar-overflow-button {
-    -fx-padding: 0 0.75em 0 0 ;
+    -fx-padding: 0 0.75em 0 0;
 }
+
 .tool-bar:vertical > .tool-bar-overflow-button {
-    -fx-padding: 0 0 0.75em 0 ;
+    -fx-padding: 0 0 0.75em 0;
 }
+
 .tool-bar-overflow-button > .arrow {
     -fx-background-color: -fx-mark-highlight-color, -fx-mark-color;
     -fx-background-insets: 1 0 -1 0, 0;
     -fx-padding: 0.666667em 0.916667em 0em 0em; /* 8 11 0 0 */
-    -fx-shape: "M337.273,297.622l-0.016,1.069l2.724,2.639l-2.723,2.628l0.015,1.048h0.881l3.81-3.685l-3.788-3.699H337.273z M343.783,297.622h-0.902l-0.015,1.069l2.724,2.639l-2.724,2.628l0.015,1.048h0.882l3.809-3.685L343.783,297.622z" ;
+    -fx-shape: "M337.273,297.622l-0.016,1.069l2.724,2.639l-2.723,2.628l0.015,1.048h0.881l3.81-3.685l-3.788-3.699H337.273z M343.783,297.622h-0.902l-0.015,1.069l2.724,2.639l-2.724,2.628l0.015,1.048h0.882l3.809-3.685L343.783,297.622z";
 }
 
 .tool-bar-overflow-button:focused > .arrow {
@@ -924,42 +965,43 @@ is being used to size a border should also be in pixels.
  ******************************************************************************/
 
 .slider .thumb {
-    -fx-background-color: 
-        linear-gradient(to bottom, derive(-fx-text-box-border, -20%), derive(-fx-text-box-border, -30%)),
-        -fx-inner-border,
-        -fx-body-color;
+    -fx-background-color: linear-gradient(to bottom, derive(-fx-text-box-border, -20%), derive(-fx-text-box-border, -30%)),
+    -fx-inner-border,
+    -fx-body-color;
     -fx-background-insets: 0, 1, 2;
     -fx-background-radius: 1.0em; /* makes sure this remains circular */
-    -fx-padding: 0.583333em;  /* 7 */
-    -fx-effect: dropshadow(two-pass-box , rgba(0, 0, 0, 0.1), 5, 0.0 , 0, 2);
+    -fx-padding: 0.583333em; /* 7 */
+    -fx-effect: dropshadow(two-pass-box, rgba(0, 0, 0, 0.1), 5, 0.0, 0, 2);
 }
+
 .slider:focused .thumb {
     -fx-background-radius: 1.0em; /* makes sure this remains circular */
 }
+
 .slider .track {
-      -fx-background-color: 
-          -fx-shadow-highlight-color,
-          linear-gradient(to bottom, derive(-fx-text-box-border, -10%), -fx-text-box-border),
-          linear-gradient(to bottom, 
+    -fx-background-color: -fx-shadow-highlight-color,
+    linear-gradient(to bottom, derive(-fx-text-box-border, -10%), -fx-text-box-border),
+    linear-gradient(to bottom,
             derive(-fx-control-inner-background, -9%),
             derive(-fx-control-inner-background, 0%),
             derive(-fx-control-inner-background, -5%),
             derive(-fx-control-inner-background, -12%)
-          );
+    );
     -fx-background-insets: 0 0 -1 0, 0, 1;
     -fx-background-radius: 0.25em, 0.25em, 0.166667em; /* 3 3 2 */
     -fx-padding: 0.25em; /* 3 */
 }
+
 .slider:vertical .track {
-    -fx-background-color: 
-          -fx-shadow-highlight-color,
-          -fx-text-box-border,
-          linear-gradient(to right, 
+    -fx-background-color: -fx-shadow-highlight-color,
+    -fx-text-box-border,
+    linear-gradient(to right,
             derive(-fx-control-inner-background, -9%),
             -fx-control-inner-background,
             derive(-fx-control-inner-background, -9%)
-          );
+    );
 }
+
 .slider .axis {
     -fx-tick-label-fill: derive(-fx-text-background-color, 30%);
     -fx-tick-length: 5px;
@@ -974,86 +1016,99 @@ is being used to size a border should also be in pixels.
  ******************************************************************************/
 
 .scroll-bar:horizontal {
-    -fx-background-color: derive(-fx-box-border,30%), linear-gradient(to bottom, derive(-fx-base,-3%), derive(-fx-base,5%) 50%, derive(-fx-base,-3%));
+    -fx-background-color: derive(-fx-box-border, 30%), linear-gradient(to bottom, derive(-fx-base, -3%), derive(-fx-base, 5%) 50%, derive(-fx-base, -3%));
     -fx-background-insets: 0, 1 0 1 0;
 }
+
 .scroll-bar:vertical {
-    -fx-background-color: derive(-fx-box-border,30%), linear-gradient(to right, derive(-fx-base,-3%), derive(-fx-base,5%) 50%, derive(-fx-base,-3%));
+    -fx-background-color: derive(-fx-box-border, 30%), linear-gradient(to right, derive(-fx-base, -3%), derive(-fx-base, 5%) 50%, derive(-fx-base, -3%));
     -fx-background-insets: 0, 0 1 0 1;
 }
+
 .scroll-bar:focused {
-    -fx-background-color: 
-        -fx-focus-color,
-        linear-gradient(to bottom, derive(-fx-base,-3%), derive(-fx-base,5%) 50%, derive(-fx-base,-3%)),
-        -fx-faint-focus-color,
-        linear-gradient(to bottom, derive(-fx-base,-3%), derive(-fx-base,5%) 50%, derive(-fx-base,-3%));
+    -fx-background-color: -fx-focus-color,
+    linear-gradient(to bottom, derive(-fx-base, -3%), derive(-fx-base, 5%) 50%, derive(-fx-base, -3%)),
+    -fx-faint-focus-color,
+    linear-gradient(to bottom, derive(-fx-base, -3%), derive(-fx-base, 5%) 50%, derive(-fx-base, -3%));
     -fx-background-insets: -0.2, 1, -1.4, 2.6;
 }
+
 .scroll-bar:vertical:focused {
-    -fx-background-color: 
-        -fx-focus-color,
-        linear-gradient(to right, derive(-fx-base,-3%), derive(-fx-base,5%) 50%, derive(-fx-base,-3%)),
-        -fx-faint-focus-color,
-        linear-gradient(to right, derive(-fx-base,-3%), derive(-fx-base,5%) 50%, derive(-fx-base,-3%));
+    -fx-background-color: -fx-focus-color,
+    linear-gradient(to right, derive(-fx-base, -3%), derive(-fx-base, 5%) 50%, derive(-fx-base, -3%)),
+    -fx-faint-focus-color,
+    linear-gradient(to right, derive(-fx-base, -3%), derive(-fx-base, 5%) 50%, derive(-fx-base, -3%));
 }
+
 .scroll-bar > .thumb {
-    -fx-background-color: -fx-outer-border, -fx-inner-border, -fx-body-color; 
+    -fx-background-color: -fx-outer-border, -fx-inner-border, -fx-body-color;
     /*-fx-background-insets: 1, 2, 3;*/
     -fx-background-insets: 2, 3, 4;
     /*-fx-background-radius: 0.416667em, 0.333333em, 0.25em; *//* 5, 4,3 */
     -fx-background-radius: 3, 2, 1;
 }
+
 .scroll-bar:vertical > .thumb {
-    -fx-background-color: -fx-outer-border, -fx-inner-border, -fx-body-color-to-right; 
+    -fx-background-color: -fx-outer-border, -fx-inner-border, -fx-body-color-to-right;
 }
-.scroll-bar > .increment-button, 
+
+.scroll-bar > .increment-button,
 .scroll-bar > .decrement-button {
-    -fx-background-color: -fx-outer-border, -fx-inner-border, -fx-body-color;     
+    -fx-background-color: -fx-outer-border, -fx-inner-border, -fx-body-color;
     -fx-color: transparent;
     -fx-padding: 0.25em; /* 3px */
 }
+
 .scroll-bar:horizontal > .increment-button,
 .scroll-bar:horizontal > .decrement-button {
     -fx-background-insets: 2 1 2 1, 3 2 3 2, 4 3 4 3;
 }
+
 .scroll-bar:vertical > .increment-button,
 .scroll-bar:vertical > .decrement-button {
     -fx-background-insets: 1 2 1 2, 2 3 2 3, 3 4 3 4;
 }
+
 .scroll-bar > .increment-button > .increment-arrow,
 .scroll-bar > .decrement-button > .decrement-arrow {
-    -fx-background-color: -fx-mark-highlight-color,derive(-fx-base,-45%);
+    -fx-background-color: -fx-mark-highlight-color, derive(-fx-base, -45%);
 }
+
 .scroll-bar > .increment-button:hover > .increment-arrow,
 .scroll-bar > .decrement-button:hover > .decrement-arrow {
-    -fx-background-color: -fx-mark-highlight-color,derive(-fx-base,-50%);
+    -fx-background-color: -fx-mark-highlight-color, derive(-fx-base, -50%);
 }
+
 .scroll-bar > .increment-button:pressed > .increment-arrow,
 .scroll-bar > .decrement-button:pressed > .decrement-arrow {
-    -fx-background-color: -fx-mark-highlight-color,derive(-fx-base,-55%);
+    -fx-background-color: -fx-mark-highlight-color, derive(-fx-base, -55%);
 }
+
 .scroll-bar:horizontal > .decrement-button > .decrement-arrow {
     -fx-padding: 0.333em 0.167em 0.333em 0.167em; /* 4 2 4 2 */
     -fx-shape: "M5.997,5.072L5.995,6.501l-2.998-4l2.998-4l0.002,1.43l-1.976,2.57L5.997,5.072z";
-    -fx-effect: dropshadow(two-pass-box , -fx-shadow-highlight-color, 1, 0.0 , 0, 1.4);
+    -fx-effect: dropshadow(two-pass-box, -fx-shadow-highlight-color, 1, 0.0, 0, 1.4);
     /*-fx-background-insets: 2 0 -2 0, 0;*/
 }
+
 .scroll-bar:horizontal > .increment-button > .increment-arrow {
     -fx-padding: 0.333em 0.167em 0.333em 0.167em; /* 4 2 4 2 */
     -fx-shape: "M2.998-0.07L3-1.499l2.998,4L3,6.501l-0.002-1.43l1.976-2.57L2.998-0.07z";
-    -fx-effect: dropshadow(two-pass-box , -fx-shadow-highlight-color, 1, 0.0 , 0, 1.4);
+    -fx-effect: dropshadow(two-pass-box, -fx-shadow-highlight-color, 1, 0.0, 0, 1.4);
     /*-fx-background-insets: 2 0 -2 0, 0;*/
 }
+
 .scroll-bar:vertical > .decrement-button > .decrement-arrow {
     -fx-padding: 0.167em 0.333em 0.167em 0.333em; /* 2 4 2 4 */
     -fx-shape: "M1.929,4L0.5,3.998L4.5,1l4,2.998L7.07,4L4.5,2.024L1.929,4z";
-    -fx-effect: dropshadow(two-pass-box , -fx-shadow-highlight-color, 1, 0.0 , 0, 1.4);
+    -fx-effect: dropshadow(two-pass-box, -fx-shadow-highlight-color, 1, 0.0, 0, 1.4);
     /*-fx-background-insets: 2 0 -2 0, 0;*/
 }
+
 .scroll-bar:vertical > .increment-button > .increment-arrow {
     -fx-padding: 0.167em 0.333em 0.167em 0.333em; /* 2 4 2 4 */
     -fx-shape: "M7.071,1L8.5,1.002L4.5,4l-4-2.998L1.93,1L4.5,2.976L7.071,1z";
-    -fx-effect: dropshadow(two-pass-box , -fx-shadow-highlight-color, 1, 0.0 , 0, 1.4);
+    -fx-effect: dropshadow(two-pass-box, -fx-shadow-highlight-color, 1, 0.0, 0, 1.4);
     /*-fx-background-insets: 2 0 -2 0, 0;*/
 }
 
@@ -1065,26 +1120,32 @@ is being used to size a border should also be in pixels.
 .scroll-pane > .viewport {
     -fx-background-color: -fx-background;
 }
+
 .scroll-pane > .scroll-bar:horizontal {
     -fx-background-insets: 0 1 1 1, 1;
     -fx-padding: 0 1 0 1;
 }
+
 .scroll-pane > .scroll-bar:horizontal > .increment-button,
 .scroll-pane > .scroll-bar:horizontal > .decrement-button {
-    -fx-padding: 0.166667em 0.25em 0.25em  0.25em; /* 2 3 3 3 */
+    -fx-padding: 0.166667em 0.25em 0.25em 0.25em; /* 2 3 3 3 */
 }
+
 .scroll-pane > .scroll-bar:vertical > .increment-button,
 .scroll-pane > .scroll-bar:vertical > .decrement-button {
     -fx-padding: 0.25em 0.25em 0.25em 0.166667em; /* 3 3 3 2 */
 }
+
 .scroll-pane > .scroll-bar:vertical {
     -fx-background-insets: 1 1 1 0, 1;
     -fx-padding: 1 0 1 0;
 }
+
 .scroll-pane > .corner {
-    -fx-background-color: derive(-fx-base,-1%);
+    -fx-background-color: derive(-fx-base, -1%);
     -fx-background-insets: 0 1 1 0;
 }
+
 /* new styleclass for edge to edge scrollpanes that don't want to draw a border */
 .scroll-pane.edge-to-edge,
 .tab-pane > * > .scroll-pane {
@@ -1092,15 +1153,17 @@ is being used to size a border should also be in pixels.
     -fx-background-insets: 0;
     -fx-padding: 0;
 }
+
 .scroll-pane.edge-to-edge > .scroll-bar,
 .tab-pane > * > .scroll-pane > .scroll-bar,
 .titled-pane > * > * > .scroll-pane > .scroll-bar {
     -fx-background-insets: 0;
     -fx-padding: 0;
 }
-.scroll-pane.edge-to-edge > .scroll-bar > .increment-button, 
+
+.scroll-pane.edge-to-edge > .scroll-bar > .increment-button,
 .scroll-pane.edge-to-edge > .scroll-bar > .decrement-button,
-.tab-pane > * > .scroll-pane > .scroll-bar > .increment-button, 
+.tab-pane > * > .scroll-pane > .scroll-bar > .increment-button,
 .tab-pane > * > .scroll-pane > .scroll-bar > .decrement-button,
 .titled-pane > * > * > .scroll-pane > .scroll-bar > .increment-button,
 .titled-pane > * > * > .scroll-pane > .scroll-bar > .decrement-button {
@@ -1115,12 +1178,13 @@ is being used to size a border should also be in pixels.
 
 .separator:horizontal .line {
     -fx-border-color: -fx-text-box-border transparent transparent transparent,
-        -fx-shadow-highlight-color transparent transparent transparent;
+    -fx-shadow-highlight-color transparent transparent transparent;
     -fx-border-insets: 0, 1 0 0 0;
 }
+
 .separator:vertical .line {
     -fx-border-color: transparent transparent transparent -fx-shadow-highlight-color,
-        transparent transparent transparent -fx-text-box-border;
+    transparent transparent transparent -fx-text-box-border;
     -fx-border-width: 3, 1;
     -fx-border-insets: 0, 0 0 0 1;
 }
@@ -1137,26 +1201,28 @@ is being used to size a border should also be in pixels.
     -fx-indeterminate-bar-flip: true;
     -fx-indeterminate-bar-animation-time: 2;
 }
+
 .progress-bar > .bar {
-    -fx-background-color: linear-gradient(to bottom, derive(-fx-accent, -7%), derive(-fx-accent, 0%), derive(-fx-accent, -3%), derive(-fx-accent, -9%) );
+    -fx-background-color: linear-gradient(to bottom, derive(-fx-accent, -7%), derive(-fx-accent, 0%), derive(-fx-accent, -3%), derive(-fx-accent, -9%));
     -fx-background-insets: 3 3 4 3;
     /*-fx-background-radius: 0.583em; *//* 7 */
     -fx-background-radius: 2;
     -fx-padding: 0.75em;
 }
+
 .progress-bar:indeterminate > .bar {
     -fx-background-color: linear-gradient(to left, transparent, -fx-accent);
 }
+
 .progress-bar > .track {
-      -fx-background-color: 
-          -fx-shadow-highlight-color,
-          linear-gradient(to bottom, derive(-fx-text-box-border, -10%), -fx-text-box-border),
-          linear-gradient(to bottom, 
+    -fx-background-color: -fx-shadow-highlight-color,
+    linear-gradient(to bottom, derive(-fx-text-box-border, -10%), -fx-text-box-border),
+    linear-gradient(to bottom,
             derive(-fx-control-inner-background, -7%),
             derive(-fx-control-inner-background, 0%),
             derive(-fx-control-inner-background, -3%),
             derive(-fx-control-inner-background, -9%)
-          );
+    );
     -fx-background-insets: 0, 0 0 1 0, 1 1 2 1;
     -fx-background-radius: 4, 3, 2; /* 10, 9, 8 */
 }
@@ -1171,65 +1237,82 @@ is being used to size a border should also be in pixels.
     -fx-indeterminate-segment-count: 12;
     -fx-spin-enabled: true;
 }
+
 .progress-indicator > .determinate-indicator > .indicator {
     -fx-background-color: -fx-box-border,
-        radial-gradient(center 50% 50%, radius 50%, -fx-control-inner-background 70%, derive(-fx-control-inner-background, -9%) 100%), 
-        -fx-control-inner-background;
+    radial-gradient(center 50% 50%, radius 50%, -fx-control-inner-background 70%, derive(-fx-control-inner-background, -9%) 100%),
+    -fx-control-inner-background;
     -fx-background-insets: 0, 1, 5 2 1 2;
     -fx-padding: 0.166667em; /* 2px */
 }
+
 .progress-indicator > .determinate-indicator > .progress {
     -fx-background-color: -fx-accent;
     -fx-padding: 0.083333em; /* 1px */
 }
+
 .progress-indicator > .determinate-indicator > .tick {
     -fx-background-color: white;
     -fx-background-insets: 0;
     -fx-padding: 0.666667em; /* 8 */
     -fx-shape: "M-0.25,6.083c0.843-0.758,4.583,4.833,5.75,4.833S14.5-1.5,15.917-0.917c1.292,0.532-8.75,17.083-10.5,17.083C3,16.167-1.083,6.833-0.25,6.083z";
 }
+
 .progress-indicator > .percentage {
     -fx-font-size: 0.916667em; /* 11pt - 1 less than the default font */
     -fx-fill: -fx-text-background-color;
 }
+
 .progress-indicator:indeterminate .segment {
     -fx-background-color: -fx-accent;
 }
+
 .progress-indicator:indeterminate .segment0 {
-    -fx-shape:"M41.98 14.74 a3.5,3.5 0 1,1 0,1 Z";
+    -fx-shape: "M41.98 14.74 a3.5,3.5 0 1,1 0,1 Z";
 }
+
 .progress-indicator:indeterminate .segment1 {
-    -fx-shape:"M33.75 6.51 a3.5,3.5 0 1,1 0,1 Z";
+    -fx-shape: "M33.75 6.51 a3.5,3.5 0 1,1 0,1 Z";
 }
+
 .progress-indicator:indeterminate .segment2 {
-    -fx-shape:"M22.49 3.5 a3.5,3.5 0 1,1 0,1 Z";
+    -fx-shape: "M22.49 3.5 a3.5,3.5 0 1,1 0,1 Z";
 }
+
 .progress-indicator:indeterminate .segment3 {
-    -fx-shape:"M11.24 6.51 a3.5,3.5 0 1,1 0,1 Z";
+    -fx-shape: "M11.24 6.51 a3.5,3.5 0 1,1 0,1 Z";
 }
+
 .progress-indicator:indeterminate .segment4 {
-    -fx-shape:"M3.01 14.74 a3.5,3.5 0 1,1 0,1 Z";
+    -fx-shape: "M3.01 14.74 a3.5,3.5 0 1,1 0,1 Z";
 }
+
 .progress-indicator:indeterminate .segment5 {
-    -fx-shape:"M0.0 26.0 a3.5,3.5 0 1,1 0,1 Z";
+    -fx-shape: "M0.0 26.0 a3.5,3.5 0 1,1 0,1 Z";
 }
+
 .progress-indicator:indeterminate .segment6 {
-    -fx-shape:"M3.01 37.25 a3.5,3.5 0 1,1 0,1 Z";
+    -fx-shape: "M3.01 37.25 a3.5,3.5 0 1,1 0,1 Z";
 }
+
 .progress-indicator:indeterminate .segment7 {
-    -fx-shape:"M11.25 45.48 a3.5,3.5 0 1,1 0,1 Z";
+    -fx-shape: "M11.25 45.48 a3.5,3.5 0 1,1 0,1 Z";
 }
+
 .progress-indicator:indeterminate .segment8 {
-    -fx-shape:"M22.5 48.5 a3.5,3.5 0 1,1 0,1 Z";
+    -fx-shape: "M22.5 48.5 a3.5,3.5 0 1,1 0,1 Z";
 }
+
 .progress-indicator:indeterminate .segment9 {
-    -fx-shape:"M33.75 45.48 a3.5,3.5 0 1,1 0,1 Z";
+    -fx-shape: "M33.75 45.48 a3.5,3.5 0 1,1 0,1 Z";
 }
+
 .progress-indicator:indeterminate .segment10 {
-    -fx-shape:"M41.98 37.25 a3.5,3.5 0 1,1 0,1 Z";
+    -fx-shape: "M41.98 37.25 a3.5,3.5 0 1,1 0,1 Z";
 }
+
 .progress-indicator:indeterminate .segment11 {
-     -fx-shape:"M45.0 26.0 a3.5,3.5 0 1,1 0,1 Z";
+    -fx-shape: "M45.0 26.0 a3.5,3.5 0 1,1 0,1 Z";
 }
 
 /*******************************************************************************
@@ -1240,24 +1323,24 @@ is being used to size a border should also be in pixels.
 
 .text-input {
     -fx-text-fill: -fx-text-inner-color;
-    -fx-highlight-fill: derive(-fx-control-inner-background,-20%);
+    -fx-highlight-fill: derive(-fx-control-inner-background, -20%);
     -fx-highlight-text-fill: -fx-text-inner-color;
-    -fx-prompt-text-fill: derive(-fx-control-inner-background,-30%);
+    -fx-prompt-text-fill: derive(-fx-control-inner-background, -30%);
     -fx-background-color: linear-gradient(to bottom, derive(-fx-text-box-border, -10%), -fx-text-box-border),
-        linear-gradient(from 0px 0px to 0px 5px, derive(-fx-control-inner-background, -9%), -fx-control-inner-background);
+    linear-gradient(from 0px 0px to 0px 5px, derive(-fx-control-inner-background, -9%), -fx-control-inner-background);
     -fx-background-insets: 0, 1;
     -fx-background-radius: 3, 2;
     -fx-cursor: text;
     -fx-padding: 0.333333em 0.583em 0.333333em 0.583em; /* 4 7 4 7 */
 }
+
 .text-input:focused {
     -fx-highlight-fill: -fx-accent;
     -fx-highlight-text-fill: white;
-    -fx-background-color: 
-        -fx-focus-color,
-        -fx-control-inner-background,
-        -fx-faint-focus-color,
-        linear-gradient(from 0px 0px to 0px 5px, derive(-fx-control-inner-background, -9%), -fx-control-inner-background);
+    -fx-background-color: -fx-focus-color,
+    -fx-control-inner-background,
+    -fx-faint-focus-color,
+    linear-gradient(from 0px 0px to 0px 5px, derive(-fx-control-inner-background, -9%), -fx-control-inner-background);
     -fx-background-insets: -0.2, 1, -1.4, 3;
     -fx-background-radius: 3, 2, 4, 0;
     -fx-prompt-text-fill: transparent;
@@ -1273,33 +1356,37 @@ is being used to size a border should also be in pixels.
     -fx-padding: 0;
     -fx-cursor: default;
     -fx-background-color: linear-gradient(to bottom, derive(-fx-text-box-border, -10%), -fx-text-box-border),
-        derive(-fx-base,-1%);
+    derive(-fx-base, -1%);
 }
+
 .text-area > .scroll-pane {
     -fx-background-color: null;
 }
+
 .text-area > .scroll-pane > .scroll-bar:horizontal {
     -fx-background-radius: 0 0 2 2;
 }
+
 .text-area > .scroll-pane > .scroll-bar:vertical {
     -fx-background-radius: 0 2 2 0;
 }
+
 .text-area > .scroll-pane > .corner {
     -fx-background-radius: 0 0 2 0;
 }
+
 .text-area .content {
     /*the is 1px less top and bottom than TextInput because of scrollpane border */
     -fx-padding: 0.25em 0.583em 0.25em 0.583em; /* 3 7 3 7 */
     -fx-cursor: text;
-    -fx-background-color:
-        linear-gradient(from 0px 0px to 0px 4px, derive(-fx-control-inner-background, -8%), -fx-control-inner-background);
+    -fx-background-color: linear-gradient(from 0px 0px to 0px 4px, derive(-fx-control-inner-background, -8%), -fx-control-inner-background);
     -fx-background-radius: 2;
 }
+
 .text-area:focused .content {
-    -fx-background-color: 
-        -fx-control-inner-background,
-        -fx-faint-focus-color,
-        linear-gradient(from 0px 0px to 0px 5px, derive(-fx-control-inner-background, -9%), -fx-control-inner-background);
+    -fx-background-color: -fx-control-inner-background,
+    -fx-faint-focus-color,
+    linear-gradient(from 0px 0px to 0px 5px, derive(-fx-control-inner-background, -9%), -fx-control-inner-background);
     -fx-background-insets: 0, 0, 2;
     -fx-background-radius: 2, 1, 0;
 }
@@ -1318,6 +1405,7 @@ is being used to size a border should also be in pixels.
     -fx-color-rect-height: 3;
     -fx-graphic: url("HTMLEditor-Text-Color.png");
 }
+
 .html-editor-background {
     -fx-color-label-visible: false;
     -fx-color-rect-x: 1;
@@ -1326,59 +1414,77 @@ is being used to size a border should also be in pixels.
     -fx-color-rect-height: 3;
     -fx-graphic: url("HTMLEditor-Background-Color.png");
 }
+
 .color-picker.html-editor-foreground > .color-picker-label > .picker-color > .picker-color-rect,
 .color-picker.html-editor-background > .color-picker-label > .picker-color > .picker-color-rect {
     -fx-stroke: null;
 }
-.html-editor .button ,
+
+.html-editor .button,
 .html-editor .toggle-button {
     -fx-padding: 0.333333em 0.416667em 0.333333em 0.416667em; /* 4 5 4 5 */
 }
+
 .html-editor-cut {
     -fx-graphic: url("HTMLEditor-Cut.png");
 }
+
 .html-editor-copy {
     -fx-graphic: url("HTMLEditor-Copy.png");
 }
+
 .html-editor-paste {
     -fx-graphic: url("HTMLEditor-Paste.png");
 }
+
 .html-editor-align-left {
     -fx-graphic: url("HTMLEditor-Left.png");
 }
+
 .html-editor-align-center {
     -fx-graphic: url("HTMLEditor-Center.png");
 }
+
 .html-editor-align-right {
     -fx-graphic: url("HTMLEditor-Right.png");
 }
+
 .html-editor-align-justify {
     -fx-graphic: url("HTMLEditor-Justify.png");
 }
+
 .html-editor-outdent {
     -fx-graphic: url("HTMLEditor-Outdent.png");
 }
+
 .html-editor-indent {
     -fx-graphic: url("HTMLEditor-Indent.png");
 }
+
 .html-editor-bullets {
     -fx-graphic: url("HTMLEditor-Bullets.png");
 }
+
 .html-editor-numbers {
     -fx-graphic: url("HTMLEditor-Numbered.png");
 }
+
 .html-editor-bold {
     -fx-graphic: url("HTMLEditor-Bold.png");
 }
+
 .html-editor-italic {
     -fx-graphic: url("HTMLEditor-Italic.png");
 }
+
 .html-editor-underline {
     -fx-graphic: url("HTMLEditor-Underline.png");
 }
+
 .html-editor-strike {
     -fx-graphic: url("HTMLEditor-Strikethrough.png");
 }
+
 .html-editor-hr {
     -fx-graphic: url("HTMLEditor-Break.png");
 }
@@ -1390,32 +1496,35 @@ is being used to size a border should also be in pixels.
  ******************************************************************************/
 
 .context-menu {
-    -fx-background-color:
-        linear-gradient(to bottom,
-            derive(-fx-color,-17%),
-            derive(-fx-color,-30%)
-        ),
-        -fx-control-inner-background;
+    -fx-background-color: linear-gradient(to bottom,
+    derive(-fx-color, -17%),
+    derive(-fx-color, -30%)
+    ),
+    -fx-control-inner-background;
     -fx-background-insets: 0, 1;
     -fx-padding: 0.333333em 0.083333em 0.333333em 0.083333em; /* 4 1 8 1 */
-    -fx-effect: dropshadow( gaussian , rgba(0,0,0,0.2) , 12, 0.0 , 0 , 8 );
+    -fx-effect: dropshadow(gaussian, rgba(0, 0, 0, 0.2), 12, 0.0, 0, 8);
 }
+
 .context-menu .separator:horizontal .line {
     -fx-border-color: -fx-box-border transparent transparent transparent;
     -fx-border-insets: 1 0 0 0;
 }
+
 .context-menu > .scroll-arrow {
     -fx-padding: 0.416667em 0.416667em 0.416667em 0.416667em; /* 5 */
     -fx-background-color: transparent;
 }
+
 .context-menu > .scroll-arrow:hover {
     -fx-background: -fx-selection-bar;
     -fx-background-color: -fx-background;
     -fx-text-fill: -fx-text-background-color;
 }
+
 .context-menu:show-mnemonics > .mnemonic-underline {
     -fx-stroke: -fx-text-fill;
-} 
+}
 
 /*******************************************************************************
  *                                                                             *
@@ -1427,31 +1536,35 @@ is being used to size a border should also be in pixels.
     -fx-background-color: transparent;
     -fx-padding: 0.333333em 0.666667em 0.333333em 0.666667em; /* 4 8 4 8 */
 }
+
 .menu:show-mnemonics > .mnemonic-underline {
     -fx-stroke: -fx-text-fill;
 }
+
 .menu > .right-container > .arrow {
     -fx-padding: 0.458em 0.167em 0.458em 0.167em; /* 4.5 2 4.5 2 */
     -fx-background-color: -fx-mark-color;
     -fx-shape: "M0,-4L4,0L0,4Z";
     -fx-scale-shape: false;
 }
+
 .menu:focused > .right-container > .arrow {
     -fx-background-color: white;
 }
+
 .menu-up-arrow {
-    -fx-padding: 0.666667em 0.416667em 0.0em 0.416667em;  /* 8 5 0 5 */
-    -fx-background-color: derive(-fx-color,-2%);
+    -fx-padding: 0.666667em 0.416667em 0.0em 0.416667em; /* 8 5 0 5 */
+    -fx-background-color: derive(-fx-color, -2%);
     -fx-shape: "M0 1 L1 1 L.5 0 Z";
-    -fx-effect: innershadow( two-pass-box , rgba(0,0,0,0.6) , 4, 0.0 , 0 , 1 );
-}
-.menu-down-arrow {
-    -fx-background-color: derive(-fx-color,-2%);
-    -fx-padding: 0.666667em 0.416667em 0.0em 0.416667em;  /* 8 5 0 5 */
-    -fx-shape: "M0 0 L1 0 L.5 1 Z";
-    -fx-effect: innershadow( two-pass-box , rgba(0,0,0,0.6) , 4, 0.0 , 0 , 1 );
+    -fx-effect: innershadow(two-pass-box, rgba(0, 0, 0, 0.6), 4, 0.0, 0, 1);
 }
 
+.menu-down-arrow {
+    -fx-background-color: derive(-fx-color, -2%);
+    -fx-padding: 0.666667em 0.416667em 0.0em 0.416667em; /* 8 5 0 5 */
+    -fx-shape: "M0 0 L1 0 L.5 1 Z";
+    -fx-effect: innershadow(two-pass-box, rgba(0, 0, 0, 0.6), 4, 0.0, 0, 1);
+}
 
 /*******************************************************************************
  *                                                                             *
@@ -1462,42 +1575,48 @@ is being used to size a border should also be in pixels.
 .menu-bar {
     -fx-padding: 0.0em 0.666667em 0.0em 0.666667em; /* 0 8 0 8 */
     -fx-spacing: 0.166667em; /* 2 */
-    -fx-background-color:
-        linear-gradient(to bottom, derive(-fx-base,75%) 0%, -fx-outer-border 90%),
-        linear-gradient(to bottom, derive(-fx-base,46.9%) 2%, derive(-fx-base,-2.1%) 95%);
+    -fx-background-color: linear-gradient(to bottom, derive(-fx-base, 75%) 0%, -fx-outer-border 90%),
+    linear-gradient(to bottom, derive(-fx-base, 46.9%) 2%, derive(-fx-base, -2.1%) 95%);
     -fx-background-insets: 0 0 0 0, 1 0 1 0;
-    -fx-background-radius: 0, 0 ;
+    -fx-background-radius: 0, 0;
 }
+
 /* Show nothing for background of normal menu button in a menu bar */
 .menu-bar > .container > .menu-button {
     -fx-background-radius: 0;
     -fx-background-color: transparent;
     -fx-background-insets: 0;
 }
+
 /* Change padding of menu buttons when in menu bar */
 .menu-bar > .container > .menu-button > .label {
     -fx-padding: 0;
 }
+
 /* Hide the down arrow for a menu placed in a menubar */
 .menu-bar > .container > .menu-button > .arrow-button > .arrow {
     -fx-padding: 0.167em 0 0.250em 0; /* 2 0 3 0 */
     -fx-background-color: transparent;
     -fx-shape: null;
 }
+
 .menu-bar > .container > .menu > .arrow-button {
     -fx-padding: 0.500em 0 0.500em 0; /* 6 0 6 0 */
 }
+
 .menu-bar > .container > .menu-button:hover,
 .menu-bar > .container > .menu-button:focused,
 .menu-bar > .container > .menu-button:showing {
     -fx-background: -fx-selection-bar;
     -fx-background-color: -fx-background;
 }
+
 .menu-bar > .container > .menu-button:hover > .label,
 .menu-bar > .container > .menu-button:focused > .label,
-.menu-bar > .container > .menu-button:showing  > .label {
+.menu-bar > .container > .menu-button:showing > .label {
     -fx-text-fill: -fx-text-background-color;
 }
+
 .menu-bar:show-mnemonics > .mnemonic-underline {
     -fx-stroke: -fx-text-fill;
 }
@@ -1510,48 +1629,60 @@ is being used to size a border should also be in pixels.
 
 .menu-item {
     -fx-background-color: transparent;
-    -fx-padding: 0.333333em 0.41777em 0.333333em 0.41777em;  /* 4 5 4 5 */
+    -fx-padding: 0.333333em 0.41777em 0.333333em 0.41777em; /* 4 5 4 5 */
 }
+
 .menu-item > .left-container {
     -fx-padding: 0.458em 0.791em 0.458em 0.458em;
 }
+
 .menu-item > .graphic-container {
     -fx-padding: 0em 0.333em 0em 0em;
 }
-.menu-item >.label {
+
+.menu-item > .label {
     -fx-padding: 0em 0.5em 0em 0em;
     -fx-text-fill: -fx-text-base-color;
 }
+
 .menu-item:focused {
-     -fx-background: -fx-selection-bar;
-     -fx-background-color: -fx-background;
-     -fx-text-fill:  -fx-text-background-color;
+    -fx-background: -fx-selection-bar;
+    -fx-background-color: -fx-background;
+    -fx-text-fill: -fx-text-background-color;
 }
+
 .menu-item:focused > .label {
     -fx-text-fill: white;
 }
+
 .menu-item > .right-container {
     -fx-padding: 0em 0em 0em 0.5em;
 }
+
 .menu-item:show-mnemonics > .mnemonic-underline {
     -fx-stroke: -fx-text-fill;
-} 
+}
+
 .radio-menu-item:checked > .left-container > .radio {
     -fx-background-color: -fx-mark-color;
     -fx-shape: "M0,5H2L4,8L8,0H10L5,10H3Z";
     -fx-scale-shape: false;
 }
+
 .radio-menu-item:focused:checked > .left-container > .radio {
     -fx-background-color: white;
 }
+
 .check-menu-item:checked > .left-container > .check {
     -fx-background-color: -fx-mark-color;
     -fx-shape: "M0,5H2L4,8L8,0H10L5,10H3Z";
     -fx-scale-shape: false;
 }
+
 .check-menu-item:focused:checked > .left-container > .check {
     -fx-background-color: white;
 }
+
 /*******************************************************************************
  *                                                                             *
  * ChoiceBox                                                                   *
@@ -1578,108 +1709,135 @@ is being used to size a border should also be in pixels.
     -fx-tab-min-height: 1.8333em; /* 22 */
     -fx-tab-max-height: 1.8333em; /* 22 */
 }
+
 .tab-pane > .tab-header-area > .headers-region > .tab > .tab-container > .tab-label {
     -fx-alignment: CENTER;
     -fx-text-fill: -fx-text-base-color;
 }
+
 .tab-pane > .tab-header-area > .headers-region > .tab {
     -fx-background-insets: 0 1 1 0, 1 2 1 1, 2 3 1 2;
     -fx-background-radius: 3 3 0 0, 2 2 0 0, 1 1 0 0;
     -fx-padding: 0.083333em 0.5em 0.0769em 0.5em; /* 1 6 0.99 6 */
 }
+
 .tab-pane > .tab-header-area > .headers-region > .tab:top {
     -fx-background-color: -fx-outer-border, -fx-inner-border, -fx-body-color;
 }
+
 .tab-pane > .tab-header-area > .headers-region > .tab:right {
     -fx-background-color: -fx-outer-border, -fx-inner-border-bottomup, -fx-body-color-bottomup;
 }
+
 .tab-pane > .tab-header-area > .headers-region > .tab:bottom {
     -fx-background-color: -fx-outer-border, -fx-inner-border-bottomup, -fx-body-color-bottomup;
 }
+
 .tab-pane > .tab-header-area > .headers-region > .tab:left {
     -fx-background-color: -fx-outer-border, -fx-inner-border, -fx-body-color;
 }
+
 .tab-pane > .tab-header-area > .headers-region > .tab:hover {
     -fx-color: -fx-hover-base;
 }
+
 .tab-pane > .tab-header-area > .headers-region > .tab:selected {
     -fx-background-color: -fx-outer-border, -fx-inner-border, -fx-background;
     -fx-background-insets: 0 1 1 0, 1 2 0 1, 2 3 0 2;
 }
+
 .tab-pane:focused > .tab-header-area > .headers-region > .tab:selected .focus-indicator {
     -fx-border-width: 1, 1;
     -fx-border-color: -fx-focus-color, -fx-faint-focus-color;
     -fx-border-insets: -4 -4 -6 -5, -2 -2 -5 -3;
     -fx-border-radius: 2, 1; /* looks sharper if outer border has a tighter radius (2 instead of 3) */
 }
+
 .tab-pane:focused > .tab-header-area > .headers-region > .tab:bottom:selected .focus-indicator {
     -fx-border-insets: -6 -5 -4 -4, -5 -3 -2 -2;
 }
+
 .tab-pane > .tab-header-area > .headers-region > .tab:disabled:hover {
     -fx-color: -fx-base;
 }
+
 .tab-pane > .tab-header-area > .tab-header-background {
     /* TODO should not be using text-box-border I think? */
-    -fx-background-color:  
-        -fx-outer-border,
-        -fx-text-box-border, 
-        linear-gradient(from 0px 0px to 0px 5px, -fx-text-box-border, derive(-fx-text-box-border, 30%));
+    -fx-background-color: -fx-outer-border,
+    -fx-text-box-border,
+    linear-gradient(from 0px 0px to 0px 5px, -fx-text-box-border, derive(-fx-text-box-border, 30%));
 }
+
 .tab-pane:top > .tab-header-area > .tab-header-background {
     -fx-background-insets: 0, 0 0 1 0, 1;
 }
+
 .tab-pane:bottom > .tab-header-area > .tab-header-background {
     -fx-background-insets: 0, 1 0 0 0, 1;
 }
+
 .tab-pane:left > .tab-header-area > .tab-header-background {
     -fx-background-insets: 0, 0 1 0 0, 1;
 }
+
 .tab-pane:right > .tab-header-area > .tab-header-background {
     -fx-background-insets: 0, 0 0 0 1, 1;
 }
+
 .tab-pane:top > .tab-header-area {
     /*-fx-padding: 0.416667em 0.166667em 0.0em 0.416667em; *//* 5 2 0 5 */
     -fx-padding: 0.416667em 5 0.0em 0.416667em; /* 5 2 0 5 */
 }
+
 .tab-pane:bottom > .tab-header-area {
     -fx-padding: 0 0.166667em 0.416667em 0.416667em; /* 0 2 5 5 */
 }
+
 .tab-pane:left > .tab-header-area {
     -fx-padding: 0.416667em 0.0em 0.166667em 0.416667em; /* 5 0 2 5 */
 }
+
 .tab-pane:right > .tab-header-area {
     -fx-padding: 0.416667em 0.416667em 0.166667em 0.0em; /* 5 5 2 0 */
 }
+
 /* TODO: scaling the shape seems to make it way too large */
 .tab-pane > .tab-header-area > .headers-region > .tab > .tab-container > .tab-close-button {
     -fx-background-color: -fx-mark-color;
     -fx-shape: "M 0,0 H1 L 4,3 7,0 H8 V1 L 5,4 8,7 V8 H7 L 4,5 1,8 H0 V7 L 3,4 0,1 Z";
     -fx-scale-shape: false;
-    -fx-effect: dropshadow(two-pass-box , rgba(255, 255, 255, 0.4), 1, 0.0 , 0, 1);
+    -fx-effect: dropshadow(two-pass-box, rgba(255, 255, 255, 0.4), 1, 0.0, 0, 1);
 }
+
 .tab-pane > .tab-header-area > .headers-region > .tab > .tab-container > .tab-close-button:hover {
     -fx-background-color: derive(-fx-mark-color, -30%);
 }
+
 /* CONTROL BUTTONS */
 .tab-pane > .tab-header-area > .control-buttons-tab > .container {
-    -fx-padding: 3 0 0 0; 
+    -fx-padding: 3 0 0 0;
 }
+
 .tab-pane > .tab-header-area > .control-buttons-tab > .container > .tab-down-button {
     -fx-background-color: -fx-outer-border, -fx-inner-border, -fx-body-color;
     -fx-background-insets: -1 0 5 0, 0 1 6 1, 1 2 7 2;
     -fx-padding: 4 4 9 4;
     -fx-background-radius: 10;
 }
+
 .tab-pane:bottom > .tab-header-area > .control-buttons-tab > .container > .tab-down-button {
     -fx-padding: -5 4 4 4; /* TODO convert to ems */
 }
+
 /* FLOATING TABS CUSTOMISATION */
 .tab-pane.floating > .tab-header-area > .tab-header-background {
     -fx-background-color: null;
 }
+
 .tab-pane.floating > .tab-header-area {
     -fx-background-color: null;
 }
+
 .tab-pane.floating > .tab-content-area {
     -fx-background-color: -fx-outer-border, -fx-background;
     -fx-background-insets: 0, 1;
@@ -1700,6 +1858,7 @@ is being used to size a border should also be in pixels.
     -fx-text-fill: -fx-text-base-color;
     -fx-padding: 0.333333em 0.666667em 0.333333em 0.666667em; /* 4 8 4 8 */
 }
+
 .combo-box-base > .arrow-button {
     -fx-background-radius: 0 3 3 0, 0 2 2 0, 0 1 1 0;
     -fx-padding: 0.5em 0.667em 0.5em 0.833333em; /* 6 8 6 10 */
@@ -1722,29 +1881,32 @@ is being used to size a border should also be in pixels.
     -fx-background-insets: 1 1 1 0, 1, 2;
     -fx-background-radius: 0 3 3 0, 0 2 2 0, 0 1 1 0;
 }
+
 .combo-box-base:editable > .text-field,
 .date-picker > .text-field {
     -fx-background-color: -fx-control-inner-background;
     -fx-background-insets: 1 0 1 1;
     -fx-background-radius: 2 0 0 2;
 }
+
 .combo-box-base:editable:contains-focus,
 .date-picker:contains-focus {
     -fx-background-color: -fx-focus-color;
     -fx-background-insets: -0.2;
     -fx-background-radius: 3;
 }
+
 .combo-box-base:editable:focused > .text-field,
 .combo-box-base:editable > .text-field:focused,
 .date-picker:focused > .text-field,
 .date-picker > .text-field:focused {
-    -fx-background-color: 
-        -fx-control-inner-background,
-        -fx-faint-focus-color,
-        linear-gradient(from 0px 0px to 0px 5px, derive(-fx-control-inner-background, -9%), -fx-control-inner-background);
+    -fx-background-color: -fx-control-inner-background,
+    -fx-faint-focus-color,
+    linear-gradient(from 0px 0px to 0px 5px, derive(-fx-control-inner-background, -9%), -fx-control-inner-background);
     -fx-background-insets: 1 0 1 1, 1 0 1 1, 3 2 3 3;
     -fx-background-radius: 2 0 0 2, 1 0 0 1, 0;
 }
+
 .combo-box-base:editable:contains-focus > .arrow-button,
 .date-picker:contains-focus > .arrow-button {
     -fx-background-color: -fx-inner-border, -fx-body-color, -fx-faint-focus-color, -fx-body-color;
@@ -1755,31 +1917,34 @@ is being used to size a border should also be in pixels.
 /* -------------- STYLES FOR THE DEFAULT LISTVIEW-BASED COMBOBOX ------------- */
 
 .combo-box-popup > .list-view {
-    -fx-background-color:
-        linear-gradient(to bottom,
-            derive(-fx-color,-17%),
-            derive(-fx-color,-30%)
-        ),
-        -fx-control-inner-background;
+    -fx-background-color: linear-gradient(to bottom,
+    derive(-fx-color, -17%),
+    derive(-fx-color, -30%)
+    ),
+    -fx-control-inner-background;
     -fx-background-insets: 0, 1;
-    -fx-effect: dropshadow( gaussian , rgba(0,0,0,0.2) , 12, 0.0 , 0 , 8 );
+    -fx-effect: dropshadow(gaussian, rgba(0, 0, 0, 0.2), 12, 0.0, 0, 8);
 }
+
 .combo-box-popup > .list-view > .virtual-flow > .clipped-container > .sheet > .list-cell {
     -fx-padding: 4 0 4 5;
     /* No alternate highlighting */
     -fx-background: -fx-control-inner-background;
 }
+
 .combo-box-popup > .list-view > .virtual-flow > .clipped-container > .sheet > .list-cell:filled:selected {
-    -fx-background:  -fx-selection-bar-non-focused;
-    -fx-background-color:  -fx-background;
+    -fx-background: -fx-selection-bar-non-focused;
+    -fx-background-color: -fx-background;
 }
-.combo-box-popup  > .list-view > .virtual-flow > .clipped-container > .sheet > .list-cell:filled:hover,
-.combo-box-popup  > .list-view > .virtual-flow > .clipped-container > .sheet > .list-cell:filled:selected:hover {
+
+.combo-box-popup > .list-view > .virtual-flow > .clipped-container > .sheet > .list-cell:filled:hover,
+.combo-box-popup > .list-view > .virtual-flow > .clipped-container > .sheet > .list-cell:filled:selected:hover {
     -fx-background: -fx-accent;
     -fx-background-color: -fx-selection-bar;
 }
+
 .combo-box-popup > .list-view > .placeholder > .label {
-    -fx-text-fill: derive(-fx-control-inner-background,-30%);
+    -fx-text-fill: derive(-fx-control-inner-background, -30%);
 }
 
 /*******************************************************************************
@@ -1791,17 +1956,18 @@ is being used to size a border should also be in pixels.
 .titled-pane {
     -fx-text-fill: -fx-text-base-color;
 }
+
 .titled-pane > .title {
-    -fx-background-color:
-        linear-gradient(to bottom,
-            derive(-fx-color,-15%) 95%,
-            derive(-fx-color,-25%) 100%
-        ),
-        -fx-inner-border, -fx-body-color;
+    -fx-background-color: linear-gradient(to bottom,
+    derive(-fx-color, -15%) 95%,
+    derive(-fx-color, -25%) 100%
+    ),
+    -fx-inner-border, -fx-body-color;
     -fx-background-insets: 0, 1, 2;
     -fx-background-radius: 3 3 0 0, 2 2 0 0, 1 1 0 0;
     -fx-padding: 0.3333em 0.75em 0.3333em 0.75em; /* 4 9 4 9 */
 }
+
 /* alternative focus using the ring around the entire title area */
 /*.titled-pane:focused > .title {
     -fx-background-color: -fx-faint-focus-color, -fx-focus-color, -fx-inner-border, -fx-body-color; 
@@ -1811,23 +1977,27 @@ is being used to size a border should also be in pixels.
 .titled-pane:focused > .title > .arrow-button > .arrow {
     -fx-background-color: -fx-focus-color, -fx-mark-color;
     -fx-background-insets: -1, 0;
-    -fx-effect: dropshadow(two-pass-box , -fx-focus-color, 5, 0.2 , 0, 0);
+    -fx-effect: dropshadow(two-pass-box, -fx-focus-color, 5, 0.2, 0, 0);
 }
+
 .titled-pane > .title > .arrow-button {
     -fx-background-color: null;
     -fx-background-insets: 0;
     -fx-background-radius: 0;
     -fx-padding: 0.0em 0.583em 0.0em 0.0em; /* 0 7 0 0 */
 }
+
 .titled-pane > .title > .arrow-button > .arrow {
     -fx-background-color: -fx-mark-highlight-color, -fx-mark-color;
     -fx-background-insets: 1 0 -1 0, 0;
     -fx-padding: 0.25em 0.3125em 0.25em 0.3125em; /* 3 3.75 3 3.75 */
     -fx-shape: "M 0 0 h 7 l -3.5 4 z";
 }
+
 .titled-pane > .title:hover {
     -fx-color: -fx-hover-base;
 }
+
 /* alternative content using a border and a grad to transparent background - why should TitledPane content have a colour? */
 .titled-pane > *.content {
     -fx-border-color: -fx-box-border;
@@ -1835,8 +2005,6 @@ is being used to size a border should also be in pixels.
     -fx-background-color: linear-gradient(from 0px 0px to 0px 5px, derive(-fx-background, -6%), -fx-background);
 }
 
-
-
 /*******************************************************************************
  *                                                                             *
  * Accordion                                                                   *
@@ -1844,16 +2012,16 @@ is being used to size a border should also be in pixels.
  ******************************************************************************/
 
 .accordion > .titled-pane > .title {
-    -fx-background-color:
-        linear-gradient(to bottom,
-        derive(-fx-color,-15%) 95%,
-        derive(-fx-color,-25%) 100%
-        ),
-        -fx-inner-border,
-        -fx-body-color;
+    -fx-background-color: linear-gradient(to bottom,
+    derive(-fx-color, -15%) 95%,
+    derive(-fx-color, -25%) 100%
+    ),
+    -fx-inner-border,
+    -fx-body-color;
     -fx-background-insets: -1 0 0 0, 0 1 1 1, 1 2 2 2;
     -fx-background-radius: 0, 0, 0;
 }
+
 .accordion > .first-titled-pane > .title {
     -fx-background-insets: 0, 1, 2;
 }
@@ -1867,15 +2035,17 @@ is being used to size a border should also be in pixels.
 .split-pane > .split-pane-divider {
     -fx-padding: 0 0.25em 0 0.25em; /* 0 3 0 3 */
 }
+
 /* horizontal the two nodes are placed to the left/right of each other. */
 .split-pane:horizontal > .split-pane-divider {
-   -fx-background-color: -fx-box-border, -fx-inner-border-horizontal;
-   -fx-background-insets: 0, 0 1 0 1;
+    -fx-background-color: -fx-box-border, -fx-inner-border-horizontal;
+    -fx-background-insets: 0, 0 1 0 1;
 }
+
 /* vertical the two nodes are placed on top of each other. */
 .split-pane:vertical > .split-pane-divider {
-   -fx-background-color: -fx-box-border, -fx-inner-border;
-   -fx-background-insets: 0, 1 0 1 0;
+    -fx-background-color: -fx-box-border, -fx-inner-border;
+    -fx-background-insets: 0, 1 0 1 0;
 }
 
 /*******************************************************************************
@@ -1888,11 +2058,13 @@ is being used to size a border should also be in pixels.
     -fx-background-color: null;
     -fx-padding: 0.5em 0.667em 0.5em 0; /*  6 8 6 0 */
 }
-.color-picker.split-button > .arrow-button  {
+
+.color-picker.split-button > .arrow-button {
     -fx-background-color: -fx-outer-border, -fx-inner-border, -fx-body-color;
     -fx-background-insets: 1 1 1 0, 1, 2;
     -fx-background-radius: 0 3 3 0, 0 2 2 0, 0 1 1 0;
 }
+
 .color-picker.split-button:focused > .arrow-button {
     /*-fx-background-color: -fx-focus-color, -fx-inner-border, -fx-body-color !important;*/
     /*-fx-background-insets: 0, 1, 2;*/
@@ -1900,56 +2072,63 @@ is being used to size a border should also be in pixels.
     -fx-background-insets: 1 1 1 0, 1, 2, 1, 2.6;
     -fx-background-radius: 0 3 3 0, 0 2 2 0, 0 1 1 0, 0 1 1 0, 0 1 1 0;
 }
+
 .color-picker.split-button > .color-picker-label,
-.color-picker.split-button:focused > .color-picker-label{
+.color-picker.split-button:focused > .color-picker-label {
     -fx-background-color: null;
 }
+
 .color-picker.split-button > .arrow-button {
     /*-fx-background-color: -fx-outer-border, -fx-inner-border, -fx-body-color !important;*/
     -fx-padding: 0.5em 0.667em 0.5em 0.667em; /* 6 8 6 8 */
 }
+
 .color-picker > .color-picker-label > .picker-color > .picker-color-rect {
     -fx-stroke: -fx-box-border;
 }
 
 .color-palette {
     -fx-spacing: 0.833333em; /* 10px */
-    -fx-background-color:
-        linear-gradient(to bottom,
-            derive(-fx-color,-17%),
-            derive(-fx-color,-30%)
-        ),
-        linear-gradient(to bottom, 
-            derive(-fx-background,10%) 0%, 
-            derive(-fx-background,-5%) 12%, 
-            derive(-fx-background,15%) 88%, 
-            derive(-fx-background,-10%) 100%);
+    -fx-background-color: linear-gradient(to bottom,
+    derive(-fx-color, -17%),
+    derive(-fx-color, -30%)
+    ),
+    linear-gradient(to bottom,
+            derive(-fx-background, 10%) 0%,
+            derive(-fx-background, -5%) 12%,
+            derive(-fx-background, 15%) 88%,
+            derive(-fx-background, -10%) 100%);
     -fx-background-insets: 0, 1;
     -fx-background-radius: 6, 5;
     -fx-padding: 1em; /* 12 */
-    -fx-effect: dropshadow( gaussian , rgba(0,0,0,0.2) , 12, 0.0 , 0 , 8 );
+    -fx-effect: dropshadow(gaussian, rgba(0, 0, 0, 0.2), 12, 0.0, 0, 8);
 }
+
 .color-palette > .color-picker-grid {
     -fx-padding: 0.5px;
     -fx-snap-to-pixel: false;
 }
+
 .color-palette > .color-picker-grid > .color-square {
     -fx-background-color: transparent;
     -fx-padding: 0.5px;
 }
+
 /* the color over which the user is hovering */
-.color-palette > .color-picker-grid > .color-square:focused, 
+.color-palette > .color-picker-grid > .color-square:focused,
 .color-palette > .color-picker-grid > .color-square:selected:focused {
     -fx-background-color: -fx-faint-focus-color, -fx-focus-color;
-    -fx-background-insets: -2,0;
-    -fx-background-radius: 5,0;
+    -fx-background-insets: -2, 0;
+    -fx-background-radius: 5, 0;
     -fx-scale-x: 1.5;
     -fx-scale-y: 1.5;
 }
+
 /* the currently selected color */
 .color-palette > .color-picker-grid > .color-square:selected {
     -fx-background-color: black;
-} 
+}
+
 /* ------- CUSTOM COLOR DIALOG ------- */
 .custom-color-dialog > .color-rect-pane {
     -fx-spacing: 0.75em;
@@ -1995,11 +2174,12 @@ is being used to size a border should also be in pixels.
     -fx-translate-y: -0.4166667em;
 }
 
-.custom-color-dialog  {
+.custom-color-dialog {
     -fx-background-color: -fx-background;
     -fx-padding: 1.25em;
     -fx-spacing: 1.25em;
 }
+
 .custom-color-dialog .controls-pane .current-new-color-grid #current-new-color-border {
     -fx-border-color: derive(-fx-base, -20%);
     -fx-border-width: 2px;
@@ -2013,7 +2193,7 @@ is being used to size a border should also be in pixels.
 }
 
 .custom-color-dialog .transparent-pattern {
-    -fx-background-image: url("pattern-transparent.png"); 
+    -fx-background-image: url("pattern-transparent.png");
     -fx-background-repeat: repeat;
     -fx-background-size: auto;
 }
@@ -2071,9 +2251,8 @@ is being used to size a border should also be in pixels.
 
 .custom-color-dialog .controls-pane .customcolor-controls-background {
     -fx-background-color: -fx-text-box-border, -fx-control-inner-background;
-    -fx-background-insets: 
-        0.8333333em 0 0.4166667em 0,
-        1em 0.166667em 0.5833333em 0.166667em;
+    -fx-background-insets: 0.8333333em 0 0.4166667em 0,
+    1em 0.166667em 0.5833333em 0.166667em;
     -fx-background-radius: 0.3333333em, 0.166667em;
 }
 
@@ -2094,35 +2273,41 @@ is being used to size a border should also be in pixels.
  ******************************************************************************/
 
 .pagination {
-    -fx-padding: 0;        
+    -fx-padding: 0;
     -fx-arrows-visible: true;
     -fx-tooltip-visible: true;
     -fx-page-information-visible: true;
     -fx-page-information-alignment: bottom;
     -fx-arrow-button-gap: 0;
 }
+
 .pagination > .page {
     -fx-background-color: transparent;
 }
+
 .pagination > .pagination-control {
     -fx-background-color: transparent;
     -fx-font-size: 0.82em;
 }
+
 .pagination > .pagination-control > .control-box {
     -fx-padding: 5px 0 0 0;
     -fx-spacing: 2;
     -fx-alignment: center;
 }
+
 .pagination > .pagination-control > .control-box > .left-arrow-button {
     -fx-background-radius: 3 0 0 3, 3 0 0 3, 2 0 0 2, 1 0 0 1;
     -fx-background-insets: 0 0 -1 5, 0 0 0 5, 1 1 1 6, 2 2 2 7;
     -fx-padding: 0em 0.417em 0em 0.833em; /* 0 5 0 10 */
 }
+
 .pagination > .pagination-control > .control-box > .right-arrow-button {
     -fx-background-radius: 0 3 3 0, 0 3 3 0, 0 2 2 0, 0 1 1 0;
     -fx-background-insets: 0 5 -1 0, 0 5 0 0, 1 6 1 1, 2 7 2 2;
     -fx-padding: 0em 0.75em 0em 0.417em; /* 0 9 0 5 */
 }
+
 .pagination > .pagination-control .left-arrow {
     -fx-background-color: -fx-mark-highlight-color, -fx-mark-color;
     -fx-background-insets: 1 0 -1 0, 0;
@@ -2130,6 +2315,7 @@ is being used to size a border should also be in pixels.
     -fx-shape: "M 0 0 L -13 7 L 0 13 z";
     -fx-scale-shape: true;
 }
+
 .pagination > .pagination-control .right-arrow {
     -fx-background-color: -fx-mark-highlight-color, -fx-mark-color;
     -fx-background-insets: 1 0 -1 0, 0;
@@ -2137,38 +2323,46 @@ is being used to size a border should also be in pixels.
     -fx-shape: "M 0 0 L 13 7 L 0 13 z";
     -fx-scale-shape: true;
 }
-.pagination > .pagination-control > .control-box > .bullet-button {   
-   -fx-background-radius: 0, 4em, 4em, 4em, 4em;
-   -fx-padding: 0.333em;
-   -fx-background-color: transparent, -fx-outer-border, -fx-inner-border, -fx-body-color;
-   -fx-background-insets: 0, 5,  6,  7;
+
+.pagination > .pagination-control > .control-box > .bullet-button {
+    -fx-background-radius: 0, 4em, 4em, 4em, 4em;
+    -fx-padding: 0.333em;
+    -fx-background-color: transparent, -fx-outer-border, -fx-inner-border, -fx-body-color;
+    -fx-background-insets: 0, 5, 6, 7;
 }
-.pagination > .pagination-control > .control-box > .bullet-button:selected {   
+
+.pagination > .pagination-control > .control-box > .bullet-button:selected {
     -fx-base: -fx-accent;
 }
+
 .pagination.bullet > .pagination-control > .control-box {
     -fx-spacing: 0;
     -fx-alignment: center;
 }
+
 .pagination.bullet > .pagination-control > .control-box > .left-arrow-button {
     -fx-background-radius: 4em;
     -fx-background-insets: 0, 1, 2;
     -fx-padding: 0em 0.25em 0em 0.083em; /* 0 3 0 1 */
-} 
+}
+
 .pagination.bullet > .pagination-control > .control-box > .right-arrow-button {
     -fx-background-radius: 4em;
     -fx-background-insets: 0, 1, 2;
     -fx-padding: 0em 0.083em 0em 0.25em; /* 0 1 0 3 */
 }
+
 .pagination > .pagination-control > .control-box > .number-button {
     -fx-background-radius: 0;
     -fx-padding: 0.166667em 0.25em 0.25em 0.333em;
     -fx-background-color: -fx-shadow-highlight-color, -fx-outer-border, -fx-inner-border, -fx-body-color;
 }
-.pagination > .pagination-control > .control-box > .number-button:selected {   
+
+.pagination > .pagination-control > .control-box > .number-button:selected {
     -fx-base: -fx-accent;
 }
-.pagination > .pagination-control > .page-information {   
+
+.pagination > .pagination-control > .page-information {
     -fx-padding: 0.416em 0 0 0;
 }
 
@@ -2186,12 +2380,15 @@ is being used to size a border should also be in pixels.
     -fx-alignment: CENTER_LEFT;
     -fx-content-display: LEFT;
 }
+
 .cell > .choice-box > .label {
     -fx-padding: 0em 0.333333em 0.0em 0.333333; /* 2 4 3 6 */
 }
+
 .cell:focused:selected > .choice-box > .label {
     -fx-text-fill: white;
 }
+
 .cell:focused:selected > .choice-box > .open-button > .arrow {
     -fx-background-color: -fx-mark-highlight-color, white;
 }
@@ -2210,6 +2407,7 @@ is being used to size a border should also be in pixels.
     -fx-background-insets: 0, 0 0 0 1;
     -fx-padding: -1 -1 -1 0;
 }
+
 .list-view > .virtual-flow > .scroll-bar:horizontal,
 .tree-view > .virtual-flow > .scroll-bar:horizontal,
 .table-view > .virtual-flow > .scroll-bar:horizontal,
@@ -2217,12 +2415,14 @@ is being used to size a border should also be in pixels.
     -fx-background-insets: 0, 1 0 0 0;
     -fx-padding: 0 -1 -1 -1;
 }
+
 .list-view > .virtual-flow > .corner,
 .tree-view > .virtual-flow > .corner,
 .table-view > .virtual-flow > .corner,
 .tree-table-view > .virtual-flow > .corner {
-    -fx-background-color: derive(-fx-base,-1%);
+    -fx-background-color: derive(-fx-base, -1%);
 }
+
 /* standard cell */
 .list-cell,
 .tree-cell {
@@ -2230,6 +2430,7 @@ is being used to size a border should also be in pixels.
     -fx-background-color: -fx-background;
     -fx-text-fill: -fx-text-background-color;
 }
+
 /* Selected rows */
 .list-view:focused > .virtual-flow > .clipped-container > .sheet > .list-cell:filled:selected,
 .tree-view:focused > .virtual-flow > .clipped-container > .sheet > .tree-cell:filled:selected,
@@ -2240,6 +2441,7 @@ is being used to size a border should also be in pixels.
     -fx-background: -fx-selection-bar;
     -fx-table-cell-border-color: derive(-fx-selection-bar, 20%);
 }
+
 /* Selected when control is not focused */
 .list-cell:filled:selected,
 .tree-cell:filled:selected,
@@ -2250,6 +2452,7 @@ is being used to size a border should also be in pixels.
     -fx-background: -fx-selection-bar-non-focused;
     -fx-table-cell-border-color: derive(-fx-selection-bar-non-focused, 20%);
 }
+
 /* focused cell (keyboard navigation) */
 .list-view:focused > .virtual-flow > .clipped-container > .sheet > .list-cell:focused,
 .tree-view:focused > .virtual-flow > .clipped-container > .sheet > .tree-cell:focused,
@@ -2270,6 +2473,7 @@ is being used to size a border should also be in pixels.
 .list-cell {
     -fx-padding: 0.25em 0.583em 0.25em 0.583em; /* 3 7 3 7 */
 }
+
 .list-cell:odd {
     -fx-background: -fx-control-inner-background-alt;
 }
@@ -2284,20 +2488,24 @@ is being used to size a border should also be in pixels.
     -fx-padding: 0.25em; /* 3 */
     -fx-indent: 1em;
 }
+
 .tree-cell .label {
     -fx-padding: 0.0em 0.0em 0.0em 0.25em; /* 0 0 0 3 */
 }
+
 .tree-cell > .tree-disclosure-node,
 .tree-table-row-cell > .tree-disclosure-node {
     -fx-padding: 4 6 4 8;
     -fx-background-color: transparent;
 }
+
 .tree-cell > .tree-disclosure-node > .arrow,
 .tree-table-row-cell > .tree-disclosure-node > .arrow {
     -fx-background-color: -fx-text-background-color;
     -fx-padding: 0.333333em 0.229em 0.333333em 0.229em; /* 4 */
     -fx-shape: "M 0 -3.5 L 4 0 L 0 3.5 z";
 }
+
 .tree-cell:expanded > .tree-disclosure-node > .arrow,
 .tree-table-row-cell:expanded > .tree-disclosure-node > .arrow {
     -fx-rotate: 90;
@@ -2313,8 +2521,9 @@ is being used to size a border should also be in pixels.
 .tree-table-view {
     /* Constants used throughout the tableview. */
     -fx-table-header-border-color: -fx-box-border;
-    -fx-table-cell-border-color: derive(-fx-color,5%);
+    -fx-table-cell-border-color: derive(-fx-color, 5%);
 }
+
 /***** ROW CELLS **************************************************************/
 /* Each row in the table is a table-row-cell. Inside a table-row-cell is any
    number of table-cell. */
@@ -2325,9 +2534,11 @@ is being used to size a border should also be in pixels.
     -fx-padding: 0;
     -fx-text-fill: -fx-text-background-color;
 }
+
 .table-row-cell:odd {
     -fx-background: -fx-control-inner-background-alt;
 }
+
 /***** INDIVIDUAL CELLS ********************************************************/
 .table-cell {
     -fx-padding: 0.166667em; /* 2px, plus border adds 1px */
@@ -2336,11 +2547,13 @@ is being used to size a border should also be in pixels.
     -fx-cell-size: 2.0em; /* 24 */
     -fx-text-fill: -fx-text-background-color;
 }
+
 .table-view > .virtual-flow > .clipped-container > .sheet > .table-row-cell .table-cell:selected,
 .tree-table-view > .virtual-flow > .clipped-container > .sheet > .tree-table-row-cell .tree-table-cell:selected {
     -fx-background-color: -fx-table-cell-border-color, -fx-background;
     -fx-background-insets: 0, 0 0 1 0;
 }
+
 /* When in constrained resize mode, the right-most visible cell should not have
    a right-border, as it is not possible to get this cleanly out of view without
    introducing horizontal scrollbars (see RT-14886). */
@@ -2348,6 +2561,7 @@ is being used to size a border should also be in pixels.
 .tree-table-view:constrained-resize > .virtual-flow > .clipped-container > .sheet > .tree-table-row-cell > .tree-table-cell:last-visible {
     -fx-border-color: transparent;
 }
+
 /***** HEADER **********************************************************************/
 /* The column-resize-line is shown when the user is attempting to resize a column. */
 .table-view .column-resize-line,
@@ -2356,6 +2570,7 @@ is being used to size a border should also be in pixels.
     -fx-background-color: -fx-background;
     -fx-padding: 0.0em 0.0416667em 0.0em 0.0416667em; /* 0 0.571429 0 0.571429 */
 }
+
 /* This is the area behind the column headers. An ideal place to specify background
    and border colors for the whole area (not individual column-header's). */
 .table-view .column-header-background,
@@ -2363,6 +2578,7 @@ is being used to size a border should also be in pixels.
     -fx-background-color: -fx-inner-border, -fx-body-color;
     -fx-background-insets: 0, 1;
 }
+
 /* The column header row is made up of a number of column-header, one for each
    TableColumn, and a 'filler' area that extends from the right-most column
    to the edge of the tableview, or up to the 'column control' button. */
@@ -2381,30 +2597,36 @@ is being used to size a border should also be in pixels.
     -fx-text-fill: -fx-selection-bar-text;
     -fx-padding: 0.166667em;
 }
+
 .table-view .filler,
 .tree-table-view .filler,
 .table-view:constrained-resize .filler,
 .tree-table-view:constrained-resize .filler {
     -fx-background-insets: 0, 0 0 1 0, 1 1 2 1;
 }
+
 .table-view > .column-header-background > .show-hide-columns-button,
 .tree-table-view > .column-header-background > .show-hide-columns-button {
     -fx-background-insets: 0, 0 0 1 1, 1 1 2 2;
 }
+
 .table-view .column-header .sort-order-dots-container,
-.tree-table-view .column-header .sort-order-dots-container{
+.tree-table-view .column-header .sort-order-dots-container {
     -fx-padding: 2 0 2 0;
 }
+
 .table-view .column-header .sort-order,
-.tree-table-view .column-header .sort-order{
+.tree-table-view .column-header .sort-order {
     -fx-font-size: 0.916667em; /* 11pt - 1 less than the default font */
 }
+
 .table-view .column-header .sort-order-dot,
 .tree-table-view .column-header .sort-order-dot {
     -fx-background-color: -fx-mark-color;
     -fx-padding: 0.115em;
     -fx-background-radius: 0.115em;
 }
+
 .table-view .column-header .label,
 .tree-table-view .column-header .label {
     -fx-alignment: center;
@@ -2415,8 +2637,9 @@ is being used to size a border should also be in pixels.
 .tree-table-view .show-hide-column-image {
     -fx-background-color: -fx-mark-color;
     -fx-padding: 0.25em; /* 3px */
-    -fx-shape: "M398.902,298.045c0.667,0,1.333,0,2,0c0,0.667,0,1.333,0,2c0.667,0,1.333,0,2,0c0,0.667,0,1.333,0,2c-0.667,0-1.333,0-2,0c0,0.666,0,1.332,0,1.999c-0.667,0-1.333,0-2,0c0-0.667,0-1.333,0-1.999c-0.666,0-1.333,0-1.999,0c0-0.667,0-1.334,0-2c0.666,0,1.333,0,1.999,0C398.902,299.378,398.902,298.711,398.902,298.045z"; 
+    -fx-shape: "M398.902,298.045c0.667,0,1.333,0,2,0c0,0.667,0,1.333,0,2c0.667,0,1.333,0,2,0c0,0.667,0,1.333,0,2c-0.667,0-1.333,0-2,0c0,0.666,0,1.332,0,1.999c-0.667,0-1.333,0-2,0c0-0.667,0-1.333,0-1.999c-0.666,0-1.333,0-1.999,0c0-0.667,0-1.334,0-2c0.666,0,1.333,0,1.999,0C398.902,299.378,398.902,298.711,398.902,298.045z";
 }
+
 /* When a column is being 'dragged' to be placed in a different position, there
    is a region that follows along the column header area to indicate where the
    column will be dropped. This region can be styled using the .column-drag-header
@@ -2428,19 +2651,22 @@ is being used to size a border should also be in pixels.
     -fx-border-color: transparent;
     -fx-opacity: 0.6;
 }
+
 /* Semi-transparent overlay to indicate the column that is currently being moved */
 .table-view .column-overlay,
 .tree-table-view .column-overlay {
     -fx-background-color: darkgray;
     -fx-opacity: 0.3;
 }
+
 /* Header Sort Arrows */
-.table-view /*> column-header-background > nested-column-header >*/ .arrow,
-.tree-table-view /*> column-header-background > nested-column-header >*/ .arrow {
+.table-view /*> column-header-background > nested-column-header >*/  .arrow,
+.tree-table-view /*> column-header-background > nested-column-header >*/  .arrow {
     -fx-background-color: -fx-mark-color;
     -fx-padding: 0.25em 0.3125em 0.25em 0.3125em; /* 3 3.75 3 3.75 */
     -fx-shape: "M 0 0 h 7 l -3.5 4 z";
 }
+
 /* This is shown when the table has no rows and/or no columns. */
 .table-view .empty-table,
 .tree-table-view .empty-table {
@@ -2458,24 +2684,28 @@ is being used to size a border should also be in pixels.
     -fx-alignment: center;
     -fx-padding: 0;
 }
+
 .check-box-table-cell > .check-box {
     -fx-font-size: 0.8em;
     -fx-opacity: 1;
     -fx-padding: 0 0 1 0;
 }
+
 .check-box-table-cell > .check-box > .box {
     -fx-background-color: -fx-outer-border, -fx-background;
-    -fx-background-insets: 0,1;
+    -fx-background-insets: 0, 1;
 }
+
 .check-box-table-cell > .check-box:selected > .box > .mark {
     -fx-background-color: -fx-text-background-color;
     -fx-background-insets: 0;
 }
+
 .table-view:focused > .virtual-flow > .clipped-container > .sheet > .table-row-cell:filled > .check-box-table-cell:selected > .check-box > .box,
 .tree-table-view:focused > .virtual-flow > .clipped-container > .sheet > .tree-table-row-cell:filled > .check-box-table-cell:selected > .check-box > .box,
 .table-view:focused > .virtual-flow > .clipped-container > .sheet > .table-row-cell:filled:selected > .check-box-table-cell > .check-box > .box,
 .tree-table-view:focused > .virtual-flow > .clipped-container > .sheet > .tree-table-row-cell:filled:selected > .check-box-table-cell > .check-box > .box {
-    -fx-background-color: derive(-fx-accent,40%), -fx-background;
+    -fx-background-color: derive(-fx-accent, 40%), -fx-background;
 }
 
 /*******************************************************************************
@@ -2494,6 +2724,7 @@ is being used to size a border should also be in pixels.
     -fx-text-fill: -fx-text-background-color;
     -fx-indent: 1em;
 }
+
 .tree-table-cell {
     /* tree-table-cell needs slightly different padding to make the text sit at
     the right height for the arrow */
@@ -2511,13 +2742,13 @@ is being used to size a border should also be in pixels.
  ******************************************************************************/
 
 .tooltip {
-    -fx-background: rgba(30,30,30);
+    -fx-background: rgba(30, 30, 30);
     -fx-text-fill: white;
-    -fx-background-color: rgba(30,30,30,0.8);
+    -fx-background-color: rgba(30, 30, 30, 0.8);
     -fx-background-radius: 6px;
     -fx-background-insets: 0;
     -fx-padding: 0.667em 0.75em 0.667em 0.75em; /* 10px */
-    -fx-effect: dropshadow( three-pass-box , rgba(0,0,0,0.5) , 10, 0.0 , 0 , 3 );
+    -fx-effect: dropshadow(three-pass-box, rgba(0, 0, 0, 0.5), 10, 0.0, 0, 3);
     -fx-font-size: 0.85em;
 }
 
@@ -2530,19 +2761,22 @@ is being used to size a border should also be in pixels.
 .chart {
     -fx-padding: 5px;
 }
+
 .chart-content {
     -fx-padding: 10px;
 }
+
 .chart-title {
     -fx-font-size: 1.4em;
 }
+
 .chart-legend {
-   -fx-background-color: -fx-shadow-highlight-color,
-        linear-gradient(to bottom, derive(-fx-background, -10%), derive(-fx-background, -5%)),
-        linear-gradient(from 0px 0px to 0px 4px, derive(-fx-background, -4%), derive(-fx-background, 10%));
-   -fx-background-insets: 0 0 -1 0, 0,1;
-   -fx-background-radius: 4,4,3;
-   -fx-padding: 6px;
+    -fx-background-color: -fx-shadow-highlight-color,
+    linear-gradient(to bottom, derive(-fx-background, -10%), derive(-fx-background, -5%)),
+    linear-gradient(from 0px 0px to 0px 4px, derive(-fx-background, -4%), derive(-fx-background, 10%));
+    -fx-background-insets: 0 0 -1 0, 0, 1;
+    -fx-background-radius: 4, 4, 3;
+    -fx-padding: 6px;
 }
 
 /*******************************************************************************
@@ -2552,30 +2786,37 @@ is being used to size a border should also be in pixels.
  ******************************************************************************/
 
 .axis {
-    AXIS_COLOR: derive(-fx-background,-20%);
+    AXIS_COLOR: derive(-fx-background, -20%);
     -fx-tick-label-font-size: 0.833333em; /* 10px */
     -fx-tick-label-fill: derive(-fx-text-background-color, 30%);
 }
+
 .axis:top {
     -fx-border-color: transparent transparent AXIS_COLOR transparent;
 }
+
 .axis:right {
     -fx-border-color: transparent transparent transparent AXIS_COLOR;
 }
+
 .axis:bottom {
     -fx-border-color: AXIS_COLOR transparent transparent transparent;
 }
+
 .axis:left {
     -fx-border-color: transparent AXIS_COLOR transparent transparent;
 }
+
 .axis:top > .axis-label,
-.axis:left > .axis-label { 
-    -fx-padding: 0 0 4px 0; 
+.axis:left > .axis-label {
+    -fx-padding: 0 0 4px 0;
 }
+
 .axis:bottom > .axis-label,
-.axis:right > .axis-label { 
-    -fx-padding: 4px 0 0 0; 
+.axis:right > .axis-label {
+    -fx-padding: 4px 0 0 0;
 }
+
 .axis-tick-mark,
 .axis-minor-tick-mark {
     -fx-fill: null;
@@ -2589,21 +2830,25 @@ is being used to size a border should also be in pixels.
  ******************************************************************************/
 
 .chart-vertical-grid-lines {
-    -fx-stroke: derive(-fx-background,-10%);
+    -fx-stroke: derive(-fx-background, -10%);
     -fx-stroke-dash-array: 0.25em, 0.25em;
 }
+
 .chart-horizontal-grid-lines {
-    -fx-stroke: derive(-fx-background,-10%);
+    -fx-stroke: derive(-fx-background, -10%);
     -fx-stroke-dash-array: 0.25em, 0.25em;
 }
+
 .chart-alternative-column-fill {
     -fx-fill: null;
     -fx-stroke: null;
 }
+
 .chart-alternative-row-fill {
     -fx-fill: null;
     -fx-stroke: null;
 }
+
 .chart-vertical-zero-line,
 .chart-horizontal-zero-line {
     -fx-stroke: derive(-fx-text-background-color, 40%);
@@ -2615,45 +2860,60 @@ is being used to size a border should also be in pixels.
  *                                                                             *
  ******************************************************************************/
 
-.chart-symbol { /* solid circle */
+.chart-symbol {
+    /* solid circle */
     -fx-background-color: CHART_COLOR_1;
     -fx-background-radius: 5px;
     -fx-padding: 5px;
 }
-.default-color1.chart-symbol { /* solid square */
+
+.default-color1.chart-symbol {
+    /* solid square */
     -fx-background-color: CHART_COLOR_2;
     -fx-background-radius: 0;
 }
-.default-color2.chart-symbol { /* solid diamond */
+
+.default-color2.chart-symbol {
+    /* solid diamond */
     -fx-background-color: CHART_COLOR_3;
     -fx-background-radius: 0;
     -fx-padding: 7px 5px 7px 5px;
     -fx-shape: "M5,0 L10,9 L5,18 L0,9 Z";
 }
-.default-color3.chart-symbol { /* cross */
+
+.default-color3.chart-symbol {
+    /* cross */
     -fx-background-color: CHART_COLOR_4;
     -fx-background-radius: 0;
     -fx-background-insets: 0;
     -fx-shape: "M2,0 L5,4 L8,0 L10,0 L10,2 L6,5 L10,8 L10,10 L8,10 L5,6 L2,10 L0,10 L0,8 L4,5 L0,2 L0,0 Z";
 }
-.default-color4.chart-symbol { /* solid triangle */
+
+.default-color4.chart-symbol {
+    /* solid triangle */
     -fx-background-color: CHART_COLOR_5;
     -fx-background-radius: 0;
     -fx-background-insets: 0;
     -fx-shape: "M5,0 L10,8 L0,8 Z";
 }
-.default-color5.chart-symbol { /* hollow circle */
+
+.default-color5.chart-symbol {
+    /* hollow circle */
     -fx-background-color: CHART_COLOR_6, white;
     -fx-background-insets: 0, 2;
     -fx-background-radius: 5px;
     -fx-padding: 5px;
 }
-.default-color6.chart-symbol { /* hollow square */
+
+.default-color6.chart-symbol {
+    /* hollow square */
     -fx-background-color: CHART_COLOR_7, white;
     -fx-background-insets: 0, 2;
     -fx-background-radius: 0;
 }
-.default-color7.chart-symbol { /* hollow diamond */
+
+.default-color7.chart-symbol {
+    /* hollow diamond */
     -fx-background-color: CHART_COLOR_8, white;
     -fx-background-radius: 0;
     -fx-background-insets: 0, 2.5;
@@ -2673,26 +2933,75 @@ is being used to size a border should also be in pixels.
     -fx-background-radius: 5px;
     -fx-padding: 5px;
 }
+
 .chart-series-line {
     -fx-stroke: CHART_COLOR_1;
     -fx-stroke-width: 3px;
 }
-.default-color0.chart-line-symbol { -fx-background-color: CHART_COLOR_1, white; }
-.default-color1.chart-line-symbol { -fx-background-color: CHART_COLOR_2, white; }
-.default-color2.chart-line-symbol { -fx-background-color: CHART_COLOR_3, white; }
-.default-color3.chart-line-symbol { -fx-background-color: CHART_COLOR_4, white; }
-.default-color4.chart-line-symbol { -fx-background-color: CHART_COLOR_5, white; }
-.default-color5.chart-line-symbol { -fx-background-color: CHART_COLOR_6, white; }
-.default-color6.chart-line-symbol { -fx-background-color: CHART_COLOR_7, white; }
-.default-color7.chart-line-symbol { -fx-background-color: CHART_COLOR_8, white; }
-.default-color0.chart-series-line { -fx-stroke: CHART_COLOR_1; }
-.default-color1.chart-series-line { -fx-stroke: CHART_COLOR_2; }
-.default-color2.chart-series-line { -fx-stroke: CHART_COLOR_3; }
-.default-color3.chart-series-line { -fx-stroke: CHART_COLOR_4; }
-.default-color4.chart-series-line { -fx-stroke: CHART_COLOR_5; }
-.default-color5.chart-series-line { -fx-stroke: CHART_COLOR_6; }
-.default-color6.chart-series-line { -fx-stroke: CHART_COLOR_7; }
-.default-color7.chart-series-line { -fx-stroke: CHART_COLOR_8; }
+
+.default-color0.chart-line-symbol {
+    -fx-background-color: CHART_COLOR_1, white;
+}
+
+.default-color1.chart-line-symbol {
+    -fx-background-color: CHART_COLOR_2, white;
+}
+
+.default-color2.chart-line-symbol {
+    -fx-background-color: CHART_COLOR_3, white;
+}
+
+.default-color3.chart-line-symbol {
+    -fx-background-color: CHART_COLOR_4, white;
+}
+
+.default-color4.chart-line-symbol {
+    -fx-background-color: CHART_COLOR_5, white;
+}
+
+.default-color5.chart-line-symbol {
+    -fx-background-color: CHART_COLOR_6, white;
+}
+
+.default-color6.chart-line-symbol {
+    -fx-background-color: CHART_COLOR_7, white;
+}
+
+.default-color7.chart-line-symbol {
+    -fx-background-color: CHART_COLOR_8, white;
+}
+
+.default-color0.chart-series-line {
+    -fx-stroke: CHART_COLOR_1;
+}
+
+.default-color1.chart-series-line {
+    -fx-stroke: CHART_COLOR_2;
+}
+
+.default-color2.chart-series-line {
+    -fx-stroke: CHART_COLOR_3;
+}
+
+.default-color3.chart-series-line {
+    -fx-stroke: CHART_COLOR_4;
+}
+
+.default-color4.chart-series-line {
+    -fx-stroke: CHART_COLOR_5;
+}
+
+.default-color5.chart-series-line {
+    -fx-stroke: CHART_COLOR_6;
+}
+
+.default-color6.chart-series-line {
+    -fx-stroke: CHART_COLOR_7;
+}
+
+.default-color7.chart-series-line {
+    -fx-stroke: CHART_COLOR_8;
+}
 
 /*******************************************************************************
  *                                                                             *
@@ -2706,38 +3015,113 @@ is being used to size a border should also be in pixels.
     -fx-background-radius: 4px; /* makes sure this remains circular */
     -fx-padding: 3px;
 }
-.default-color0.chart-area-symbol { -fx-background-color: CHART_COLOR_1, white; }
-.default-color1.chart-area-symbol { -fx-background-color: CHART_COLOR_2, white; }
-.default-color2.chart-area-symbol { -fx-background-color: CHART_COLOR_3, white; }
-.default-color3.chart-area-symbol { -fx-background-color: CHART_COLOR_4, white; }
-.default-color4.chart-area-symbol { -fx-background-color: CHART_COLOR_5, white; }
-.default-color5.chart-area-symbol { -fx-background-color: CHART_COLOR_6, white; }
-.default-color6.chart-area-symbol { -fx-background-color: CHART_COLOR_7, white; }
-.default-color7.chart-area-symbol { -fx-background-color: CHART_COLOR_8, white; }
+
+.default-color0.chart-area-symbol {
+    -fx-background-color: CHART_COLOR_1, white;
+}
+
+.default-color1.chart-area-symbol {
+    -fx-background-color: CHART_COLOR_2, white;
+}
+
+.default-color2.chart-area-symbol {
+    -fx-background-color: CHART_COLOR_3, white;
+}
+
+.default-color3.chart-area-symbol {
+    -fx-background-color: CHART_COLOR_4, white;
+}
+
+.default-color4.chart-area-symbol {
+    -fx-background-color: CHART_COLOR_5, white;
+}
+
+.default-color5.chart-area-symbol {
+    -fx-background-color: CHART_COLOR_6, white;
+}
+
+.default-color6.chart-area-symbol {
+    -fx-background-color: CHART_COLOR_7, white;
+}
+
+.default-color7.chart-area-symbol {
+    -fx-background-color: CHART_COLOR_8, white;
+}
+
 .chart-series-area-line {
     -fx-stroke: CHART_COLOR_1;
     -fx-stroke-width: 1px;
 }
-.default-color0.chart-series-area-line { -fx-stroke: CHART_COLOR_1; }
-.default-color1.chart-series-area-line { -fx-stroke: CHART_COLOR_2; }
-.default-color2.chart-series-area-line { -fx-stroke: CHART_COLOR_3; }
-.default-color3.chart-series-area-line { -fx-stroke: CHART_COLOR_4; }
-.default-color4.chart-series-area-line { -fx-stroke: CHART_COLOR_5; }
-.default-color5.chart-series-area-line { -fx-stroke: CHART_COLOR_6; }
-.default-color6.chart-series-area-line { -fx-stroke: CHART_COLOR_7; }
-.default-color7.chart-series-area-line { -fx-stroke: CHART_COLOR_8; }
+
+.default-color0.chart-series-area-line {
+    -fx-stroke: CHART_COLOR_1;
+}
+
+.default-color1.chart-series-area-line {
+    -fx-stroke: CHART_COLOR_2;
+}
+
+.default-color2.chart-series-area-line {
+    -fx-stroke: CHART_COLOR_3;
+}
+
+.default-color3.chart-series-area-line {
+    -fx-stroke: CHART_COLOR_4;
+}
+
+.default-color4.chart-series-area-line {
+    -fx-stroke: CHART_COLOR_5;
+}
+
+.default-color5.chart-series-area-line {
+    -fx-stroke: CHART_COLOR_6;
+}
+
+.default-color6.chart-series-area-line {
+    -fx-stroke: CHART_COLOR_7;
+}
+
+.default-color7.chart-series-area-line {
+    -fx-stroke: CHART_COLOR_8;
+}
+
 .chart-series-area-fill {
     -fx-stroke: null;
     -fx-fill: CHART_COLOR_1_TRANS_20;
 }
-.default-color0.chart-series-area-fill { -fx-fill: CHART_COLOR_1_TRANS_20; }
-.default-color1.chart-series-area-fill { -fx-fill: CHART_COLOR_2_TRANS_20; }
-.default-color2.chart-series-area-fill { -fx-fill: CHART_COLOR_3_TRANS_20; }
-.default-color3.chart-series-area-fill { -fx-fill: CHART_COLOR_4_TRANS_20; }
-.default-color4.chart-series-area-fill { -fx-fill: CHART_COLOR_5_TRANS_20; }
-.default-color5.chart-series-area-fill { -fx-fill: CHART_COLOR_6_TRANS_20; }
-.default-color6.chart-series-area-fill { -fx-fill: CHART_COLOR_7_TRANS_20; }
-.default-color7.chart-series-area-fill { -fx-fill: CHART_COLOR_8_TRANS_20; }
+
+.default-color0.chart-series-area-fill {
+    -fx-fill: CHART_COLOR_1_TRANS_20;
+}
+
+.default-color1.chart-series-area-fill {
+    -fx-fill: CHART_COLOR_2_TRANS_20;
+}
+
+.default-color2.chart-series-area-fill {
+    -fx-fill: CHART_COLOR_3_TRANS_20;
+}
+
+.default-color3.chart-series-area-fill {
+    -fx-fill: CHART_COLOR_4_TRANS_20;
+}
+
+.default-color4.chart-series-area-fill {
+    -fx-fill: CHART_COLOR_5_TRANS_20;
+}
+
+.default-color5.chart-series-area-fill {
+    -fx-fill: CHART_COLOR_6_TRANS_20;
+}
+
+.default-color6.chart-series-area-fill {
+    -fx-fill: CHART_COLOR_7_TRANS_20;
+}
+
+.default-color7.chart-series-area-fill {
+    -fx-fill: CHART_COLOR_8_TRANS_20;
+}
+
 .area-legend-symbol {
     -fx-padding: 6px;
     -fx-background-radius: 6px; /* makes sure this remains circular */
@@ -2754,18 +3138,43 @@ is being used to size a border should also be in pixels.
     -fx-background-radius: 8px;
     -fx-padding: 8px;
 }
+
 .chart-bubble {
     -fx-bubble-fill: CHART_COLOR_1_TRANS_70;
-    -fx-background-color: radial-gradient(center 50% 50%, radius 80%, derive(-fx-bubble-fill,20%), derive(-fx-bubble-fill,-30%));
+    -fx-background-color: radial-gradient(center 50% 50%, radius 80%, derive(-fx-bubble-fill, 20%), derive(-fx-bubble-fill, -30%));
+}
+
+.default-color0.chart-bubble {
+    -fx-bubble-fill: CHART_COLOR_1_TRANS_70;
+}
+
+.default-color1.chart-bubble {
+    -fx-bubble-fill: CHART_COLOR_2_TRANS_70;
+}
+
+.default-color2.chart-bubble {
+    -fx-bubble-fill: CHART_COLOR_3_TRANS_70;
+}
+
+.default-color3.chart-bubble {
+    -fx-bubble-fill: CHART_COLOR_4_TRANS_70;
+}
+
+.default-color4.chart-bubble {
+    -fx-bubble-fill: CHART_COLOR_5_TRANS_70;
+}
+
+.default-color5.chart-bubble {
+    -fx-bubble-fill: CHART_COLOR_6_TRANS_70;
+}
+
+.default-color6.chart-bubble {
+    -fx-bubble-fill: CHART_COLOR_7_TRANS_70;
+}
+
+.default-color7.chart-bubble {
+    -fx-bubble-fill: CHART_COLOR_8_TRANS_70;
 }
-.default-color0.chart-bubble { -fx-bubble-fill: CHART_COLOR_1_TRANS_70; }
-.default-color1.chart-bubble { -fx-bubble-fill: CHART_COLOR_2_TRANS_70; }
-.default-color2.chart-bubble { -fx-bubble-fill: CHART_COLOR_3_TRANS_70; }
-.default-color3.chart-bubble { -fx-bubble-fill: CHART_COLOR_4_TRANS_70; }
-.default-color4.chart-bubble { -fx-bubble-fill: CHART_COLOR_5_TRANS_70; }
-.default-color5.chart-bubble { -fx-bubble-fill: CHART_COLOR_6_TRANS_70; }
-.default-color6.chart-bubble { -fx-bubble-fill: CHART_COLOR_7_TRANS_70; }
-.default-color7.chart-bubble { -fx-bubble-fill: CHART_COLOR_8_TRANS_70; }
 
 /*******************************************************************************
  *                                                                             *
@@ -2775,39 +3184,67 @@ is being used to size a border should also be in pixels.
 
 .chart-bar {
     -fx-bar-fill: CHART_COLOR_1;
-    -fx-background-color:   linear-gradient(to right, 
-                                derive(-fx-bar-fill, -4%),
-                                derive(-fx-bar-fill, -1%),
-                                derive(-fx-bar-fill, 0%),
-                                derive(-fx-bar-fill, -1%),
-                                derive(-fx-bar-fill, -6%)
-                              );
+    -fx-background-color: linear-gradient(to right,
+    derive(-fx-bar-fill, -4%),
+    derive(-fx-bar-fill, -1%),
+    derive(-fx-bar-fill, 0%),
+    derive(-fx-bar-fill, -1%),
+    derive(-fx-bar-fill, -6%)
+    );
     -fx-background-insets: 0;
 }
+
 .chart-bar.negative {
     -fx-background-insets: 1 0 0 0;
 }
+
 .bar-chart:horizontal .chart-bar {
     -fx-background-insets: 0 0 0 1;
 }
-.bar-chart:horizontal .chart-bar, 
+
+.bar-chart:horizontal .chart-bar,
 .stacked-bar-chart:horizontal .chart-bar {
-    -fx-background-color:   linear-gradient(to bottom, 
-                                derive(-fx-bar-fill, -4%),
-                                derive(-fx-bar-fill, -1%),
-                                derive(-fx-bar-fill, 0%),
-                                derive(-fx-bar-fill, -1%),
-                                derive(-fx-bar-fill, -6%)
-                              );
+    -fx-background-color: linear-gradient(to bottom,
+    derive(-fx-bar-fill, -4%),
+    derive(-fx-bar-fill, -1%),
+    derive(-fx-bar-fill, 0%),
+    derive(-fx-bar-fill, -1%),
+    derive(-fx-bar-fill, -6%)
+    );
 }
-.default-color0.chart-bar { -fx-bar-fill: CHART_COLOR_1; }
-.default-color1.chart-bar { -fx-bar-fill: CHART_COLOR_2; }
-.default-color2.chart-bar { -fx-bar-fill: CHART_COLOR_3; }
-.default-color3.chart-bar { -fx-bar-fill: CHART_COLOR_4; }
-.default-color4.chart-bar { -fx-bar-fill: CHART_COLOR_5; }
-.default-color5.chart-bar { -fx-bar-fill: CHART_COLOR_6; }
-.default-color6.chart-bar { -fx-bar-fill: CHART_COLOR_7; }
-.default-color7.chart-bar { -fx-bar-fill: CHART_COLOR_8; }
+
+.default-color0.chart-bar {
+    -fx-bar-fill: CHART_COLOR_1;
+}
+
+.default-color1.chart-bar {
+    -fx-bar-fill: CHART_COLOR_2;
+}
+
+.default-color2.chart-bar {
+    -fx-bar-fill: CHART_COLOR_3;
+}
+
+.default-color3.chart-bar {
+    -fx-bar-fill: CHART_COLOR_4;
+}
+
+.default-color4.chart-bar {
+    -fx-bar-fill: CHART_COLOR_5;
+}
+
+.default-color5.chart-bar {
+    -fx-bar-fill: CHART_COLOR_6;
+}
+
+.default-color6.chart-bar {
+    -fx-bar-fill: CHART_COLOR_7;
+}
+
+.default-color7.chart-bar {
+    -fx-bar-fill: CHART_COLOR_8;
+}
+
 .bar-legend-symbol {
     -fx-padding: 8px;
 }
@@ -2820,28 +3257,56 @@ is being used to size a border should also be in pixels.
 
 .chart-pie {
     -fx-pie-color: CHART_COLOR_1;
-    -fx-background-color: radial-gradient(radius 100%, derive(-fx-pie-color,20%), derive(-fx-pie-color,-10%));
+    -fx-background-color: radial-gradient(radius 100%, derive(-fx-pie-color, 20%), derive(-fx-pie-color, -10%));
     -fx-background-insets: 1;
     -fx-border-color: -fx-background;
 }
+
 .chart-pie-label {
     -fx-padding: 3px;
 }
+
 .chart-pie-label-line {
-    -fx-stroke: derive(-fx-background,-20%);
+    -fx-stroke: derive(-fx-background, -20%);
 }
-.default-color0.chart-pie { -fx-pie-color: CHART_COLOR_1; }
-.default-color1.chart-pie { -fx-pie-color: CHART_COLOR_2; }
-.default-color2.chart-pie { -fx-pie-color: CHART_COLOR_3; }
-.default-color3.chart-pie { -fx-pie-color: CHART_COLOR_4; }
-.default-color4.chart-pie { -fx-pie-color: CHART_COLOR_5; }
-.default-color5.chart-pie { -fx-pie-color: CHART_COLOR_6; }
-.default-color6.chart-pie { -fx-pie-color: CHART_COLOR_7; }
-.default-color7.chart-pie { -fx-pie-color: CHART_COLOR_8; }
+
+.default-color0.chart-pie {
+    -fx-pie-color: CHART_COLOR_1;
+}
+
+.default-color1.chart-pie {
+    -fx-pie-color: CHART_COLOR_2;
+}
+
+.default-color2.chart-pie {
+    -fx-pie-color: CHART_COLOR_3;
+}
+
+.default-color3.chart-pie {
+    -fx-pie-color: CHART_COLOR_4;
+}
+
+.default-color4.chart-pie {
+    -fx-pie-color: CHART_COLOR_5;
+}
+
+.default-color5.chart-pie {
+    -fx-pie-color: CHART_COLOR_6;
+}
+
+.default-color6.chart-pie {
+    -fx-pie-color: CHART_COLOR_7;
+}
+
+.default-color7.chart-pie {
+    -fx-pie-color: CHART_COLOR_8;
+}
+
 .negative.chart-pie {
     -fx-pie-color: transparent;
     -fx-background-color: white;
 }
+
 .pie-legend-symbol.chart-pie {
     -fx-background-radius: 8px;
     -fx-padding: 8px;
@@ -2877,7 +3342,8 @@ is being used to size a border should also be in pixels.
 .split-pane > * > .html-editor {
     -fx-background-insets: 0, 0;
     -fx-padding: 0;
- }
+}
+
 .tab-pane.floating > * > .table-view,
 .tab-pane.floating > * > .tree-table-view,
 .tab-pane.floating > * > .list-view,
@@ -2889,22 +3355,28 @@ is being used to size a border should also be in pixels.
     -fx-background-insets: 0, 0;
     -fx-padding: -1;
 }
+
 .split-pane > * > .accordion > .titled-pane > *.content {
     -fx-border-color: null;
     -fx-border-insets: 0;
 }
-.split-pane > * > .accordion > .titled-pane > .title  {
-    -fx-background-insets: 0,1 0 1 0, 2 1 2 1;
+
+.split-pane > * > .accordion > .titled-pane > .title {
+    -fx-background-insets: 0, 1 0 1 0, 2 1 2 1;
 }
-.split-pane > * > .accordion > .first-titled-pane > .title  {
-    -fx-background-insets: 0,0 0 1 0, 1 1 2 1;
+
+.split-pane > * > .accordion > .first-titled-pane > .title {
+    -fx-background-insets: 0, 0 0 1 0, 1 1 2 1;
 }
-.split-pane > * > .accordion > .titled-pane:collapsed > .title  {
-    -fx-background-insets: 0,1 0 0 0, 2 1 1 1;
+
+.split-pane > * > .accordion > .titled-pane:collapsed > .title {
+    -fx-background-insets: 0, 1 0 0 0, 2 1 1 1;
 }
-.split-pane > * > .accordion > .first-titled-pane:collapsed > .title  {
-    -fx-background-insets: 0,0 0 0 0, 1 1 1 1;
+
+.split-pane > * > .accordion > .first-titled-pane:collapsed > .title {
+    -fx-background-insets: 0, 0 0 0 0, 1 1 1 1;
 }
+
 .titled-pane > * > * > .split-pane,
 .titled-pane > * > * > .text-area,
 .titled-pane > * > * > .html-editor,
@@ -2917,6 +3389,7 @@ is being used to size a border should also be in pixels.
     -fx-background-insets: 0, 0;
     -fx-padding: 0;
 }
+
 .titled-pane > * > * > AnchorPane,
 .titled-pane > * > * > BorderPane,
 .titled-pane > * > * > FlowPane,
@@ -2944,80 +3417,94 @@ is being used to size a border should also be in pixels.
 }
 
 .date-picker-popup {
-     -fx-background-color:
-        linear-gradient(to bottom,
-            derive(-fx-color,-17%),
-            derive(-fx-color,-30%)
-        ),
-        -fx-control-inner-background;
+    -fx-background-color: linear-gradient(to bottom,
+    derive(-fx-color, -17%),
+    derive(-fx-color, -30%)
+    ),
+    -fx-control-inner-background;
     -fx-background-insets: 0, 1;
     -fx-background-radius: 0;
     -fx-alignment: CENTER; /* VBox */
     -fx-spacing: 0; /* VBox */
     -fx-padding: 0.083333em; /* 1 1 1 1 */
-    -fx-effect: dropshadow( gaussian , rgba(0,0,0,0.2) , 12, 0.0 , 0 , 8 );
+    -fx-effect: dropshadow(gaussian, rgba(0, 0, 0, 0.2), 12, 0.0, 0, 8);
 }
+
 .date-picker-popup > .month-year-pane {
     -fx-padding: 0.588883em 0.5em 0.666667em 0.5em; /* 7 6 8 6 */
-    -fx-background-color: derive(-fx-box-border,30%), linear-gradient(to bottom, derive(-fx-base,-3%), derive(-fx-base,5%) 50%, derive(-fx-base,-3%));
+    -fx-background-color: derive(-fx-box-border, 30%), linear-gradient(to bottom, derive(-fx-base, -3%), derive(-fx-base, 5%) 50%, derive(-fx-base, -3%));
     -fx-background-insets: 0 0 0 0, 0 0 1 0;
 }
+
 .date-picker-popup > * > .spinner {
     -fx-spacing: 0.25em; /* 3 */
     -fx-alignment: CENTER;
     -fx-fill-height: false;
 }
+
 .date-picker-popup > * > .spinner > .button {
     -fx-background-color: -fx-outer-border, -fx-inner-border, -fx-body-color;
     -fx-background-insets: 0, 1, 2;
     -fx-color: transparent;
     -fx-background-radius: 0;
 }
+
 .date-picker-popup > * > .spinner > .button:focused {
     -fx-background-color: -fx-focus-color, -fx-inner-border, -fx-body-color, -fx-faint-focus-color, -fx-body-color;
     -fx-color: -fx-hover-base;
     -fx-background-insets: -0.2, 1, 2, -1.4, 2.6;
 }
+
 .date-picker-popup > * > .spinner > .button:hover {
     -fx-color: -fx-hover-base;
 }
+
 .date-picker-popup > * > .spinner > .button:armed {
     -fx-color: -fx-pressed-base;
 }
+
 .date-picker-popup > * > .spinner > .left-button {
     -fx-padding: 0 0.333333em 0 0.25em; /* 0 4 0 3 */
 }
+
 .date-picker-popup > * > .spinner > .right-button {
     -fx-padding: 0 0.25em 0 0.333333em; /* 0 3 0 4 */
 }
+
 .date-picker-popup > * > .spinner > .button > .left-arrow,
 .date-picker-popup > * > .spinner > .button > .right-arrow {
-    -fx-background-color: -fx-mark-highlight-color, derive(-fx-base,-45%);
+    -fx-background-color: -fx-mark-highlight-color, derive(-fx-base, -45%);
     -fx-background-insets: 1 0 -1 0, 0;
     -fx-padding: 0.333333em 0.166667em 0.333333em 0.166667em; /* 4 2 4 2 */
-    -fx-effect: dropshadow(two-pass-box , -fx-shadow-highlight-color, 1, 0.0 , 0, 1.4);
+    -fx-effect: dropshadow(two-pass-box, -fx-shadow-highlight-color, 1, 0.0, 0, 1.4);
 }
+
 .date-picker-popup > * > .spinner > .button:hover > .left-arrow,
 .date-picker-popup > * > .spinner > .button:hover > .right-arrow {
-    -fx-background-color: -fx-mark-highlight-color, derive(-fx-base,-50%);
+    -fx-background-color: -fx-mark-highlight-color, derive(-fx-base, -50%);
 }
+
 .date-picker-popup > * > .spinner > .button:pressed > .left-arrow,
 .date-picker-popup > * > .spinner > .button:pressed > .right-arrow {
-    -fx-background-color: -fx-mark-highlight-color, derive(-fx-base,-55%);
+    -fx-background-color: -fx-mark-highlight-color, derive(-fx-base, -55%);
 }
+
 .date-picker-popup > * > .spinner > .button > .left-arrow {
     -fx-padding: 0.333333em 0.25em 0.333333em 0.166667em; /* 4 3 4 2 */
     -fx-shape: "M5.997,5.072L5.995,6.501l-2.998-4l2.998-4l0.002,1.43l-1.976,2.57L5.997,5.072z";
     -fx-scale-shape: true;
 }
+
 .date-picker-popup > * > .spinner > .button > .right-arrow {
     -fx-padding: 0.333333em 0.25em 0.333333em 0.166667em; /* 4 3 4 2 */
     -fx-shape: "M2.998-0.07L3-1.499l2.998,4L3,6.501l-0.002-1.43l1.976-2.57L2.998-0.07z";
     -fx-scale-shape: true;
 }
+
 .date-picker-popup > * > .spinner > .label {
     -fx-alignment: CENTER;
 }
+
 .date-picker-popup > .month-year-pane > .secondary-label {
     -fx-alignment: BASELINE_CENTER;
     -fx-padding: 0.5em 0 0 0; /* 6 0 0 0 */
@@ -3029,17 +3516,20 @@ is being used to size a border should also be in pixels.
     /*-fx-background-insets: 1 0 0 0;*/
     -fx-padding: 0;
 }
-.date-picker-popup > * > .date-cell { 
+
+.date-picker-popup > * > .date-cell {
     -fx-background-color: transparent;
     -fx-background-insets: 1, 2;
     -fx-padding: 0;
     -fx-alignment: BASELINE_CENTER;
     -fx-opacity: 1.0;
 }
+
 .date-picker-popup > * > .day-name-cell,
 .date-picker-popup > * > .week-number-cell {
-    -fx-font-size: 0.916667em; 
+    -fx-font-size: 0.916667em;
 }
+
 .date-picker-popup > * > .week-number-cell {
     -fx-padding: 0.333333em 0.583333em 0.333333em 0.583333em; /* 4 7 4 7 */
     -fx-border-color: -fx-control-inner-background;
@@ -3048,6 +3538,7 @@ is being used to size a border should also be in pixels.
     -fx-background-color: -fx-background;
     -fx-text-fill: -fx-accent;
 }
+
 .date-picker-popup > * > .day-cell {
     -fx-padding: 0.333333em 0.583333em 0.333333em 0.583333em; /* 4 7 4 7 */
     -fx-border-color: derive(-fx-selection-bar-non-focused, 60%);
@@ -3057,53 +3548,64 @@ is being used to size a border should also be in pixels.
     -fx-background-color: -fx-background;
     -fx-text-fill: -fx-text-background-color;
 }
+
 .date-picker-popup > * > .hijrah-day-cell {
     -fx-alignment: TOP_LEFT;
     -fx-padding: 0.083333em 0.333333em 0.083333em 0.333333em; /* 1 4 1 4 */
     -fx-cell-size: 2.75em;
 }
+
 .date-picker-popup > * > .day-cell > .secondary-text {
     -fx-fill: #f3622d;
 }
+
 .date-picker-popup > * > .today {
     -fx-background-color: -fx-control-inner-background, derive(-fx-selection-bar-non-focused, -20%), -fx-control-inner-background;
     -fx-background-insets: 1, 2, 3;
 }
+
 .date-picker-popup > * > .day-cell:hover,
 .date-picker-popup > * > .selected,
 .date-picker-popup > * > .previous-month.selected,
 .date-picker-popup > * > .next-month.selected {
     -fx-background: -fx-selection-bar;
 }
+
 .date-picker-popup > * > .previous-month:hover,
 .date-picker-popup > * > .next-month:hover {
     -fx-background: -fx-selection-bar-non-focused;
 }
+
 .date-picker-popup > * > .today:hover,
 .date-picker-popup > * > .today.selected {
-    -fx-background-color: -fx-selection-bar, derive(-fx-selection-bar-non-focused, -20%),-fx-selection-bar;
+    -fx-background-color: -fx-selection-bar, derive(-fx-selection-bar-non-focused, -20%), -fx-selection-bar;
 }
+
 .date-picker-popup > * > .day-cell:focused,
 .date-picker-popup > * > .today:focused {
     -fx-background-color: -fx-control-inner-background, -fx-cell-focus-inner-border, -fx-control-inner-background;
     -fx-background-insets: 1, 2, 3;
 }
+
 .date-picker-popup > * > .day-cell:focused:hover,
 .date-picker-popup > * > .today:focused:hover,
 .date-picker-popup > * > .selected:focused,
 .date-picker-popup > * > .today.selected:focused {
     -fx-background-color: -fx-selection-bar, -fx-cell-focus-inner-border, -fx-selection-bar;
 }
+
 .date-picker-popup > * > .previous-month,
 .date-picker-popup > * > .next-month {
     -fx-background: derive(-fx-control-inner-background, -4%);
 }
+
 .date-picker-popup > * > .day-cell:hover > .secondary-text,
 .date-picker-popup > * > .previous-month > .secondary-text,
 .date-picker-popup > * > .next-month > .secondary-text,
 .date-picker-popup > * > .selected > .secondary-text {
     -fx-fill: -fx-text-background-color;
 }
+
 .date-picker-popup > * > .previous-month.today,
 .date-picker-popup > * > .next-month.today {
     -fx-background-color: derive(-fx-control-inner-background, -4%), derive(-fx-selection-bar-non-focused, -20%), derive(-fx-control-inner-background, -4%);
diff --git a/core/src/main/java/io/bitsquare/network/Node.java b/core/src/main/java/io/bitsquare/network/Node.java
index abe1373f5e..c0c113438b 100644
--- a/core/src/main/java/io/bitsquare/network/Node.java
+++ b/core/src/main/java/io/bitsquare/network/Node.java
@@ -22,7 +22,7 @@ import com.google.common.base.Objects;
 public final class Node {
     public static final String NAME_KEY = "node.name";
     public static final String PORT_KEY = "node.port";
-    
+
     /**
      * Default port is one <a
      * href="https://www.iana.org/assignments/service-names-port-numbers/service-names-port-numbers.xhtml?&page=103">
diff --git a/core/src/main/java/io/bitsquare/offer/Offer.java b/core/src/main/java/io/bitsquare/offer/Offer.java
index 56de588986..3400d84da4 100644
--- a/core/src/main/java/io/bitsquare/offer/Offer.java
+++ b/core/src/main/java/io/bitsquare/offer/Offer.java
@@ -86,7 +86,7 @@ public class Offer implements Serializable {
     // don't access directly as it might be null; use getStateProperty() which creates an object if not instantiated
     private transient ObjectProperty<State> stateProperty;
 
-    
+
     ///////////////////////////////////////////////////////////////////////////////////////////
     // Constructor
     ///////////////////////////////////////////////////////////////////////////////////////////
@@ -255,7 +255,8 @@ public class Offer implements Serializable {
         checkNotNull(getMinAmount(), "MinAmount is null");
         checkNotNull(getPrice(), "Price is null");
 
-        checkArgument(getMinAmount().compareTo(Restrictions.MIN_TRADE_AMOUNT) >= 0, "MinAmount is less then " + Restrictions.MIN_TRADE_AMOUNT.toFriendlyString());
+        checkArgument(getMinAmount().compareTo(Restrictions.MIN_TRADE_AMOUNT) >= 0, "MinAmount is less then " + Restrictions.MIN_TRADE_AMOUNT
+                .toFriendlyString());
         checkArgument(getAmount().compareTo(Restrictions.MAX_TRADE_AMOUNT) <= 0, "Amount is larger then " + Restrictions.MAX_TRADE_AMOUNT.toFriendlyString());
         checkArgument(getAmount().compareTo(getMinAmount()) >= 0, "MinAmount is larger then Amount");
 
diff --git a/core/src/main/java/io/bitsquare/trade/TradeMessageService.java b/core/src/main/java/io/bitsquare/trade/TradeMessageService.java
index 54b6103c91..c48334a707 100644
--- a/core/src/main/java/io/bitsquare/trade/TradeMessageService.java
+++ b/core/src/main/java/io/bitsquare/trade/TradeMessageService.java
@@ -29,7 +29,7 @@ import java.security.PublicKey;
 import java.util.concurrent.Executor;
 
 public interface TradeMessageService extends MessageBroker {
-    
+
     void setExecutor(Executor executor);
 
     void sendMessage(Peer peer, Message message, SendMessageListener listener);
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/placeoffer/tasks/AddOfferToRemoteOfferBook.java b/core/src/main/java/io/bitsquare/trade/protocol/placeoffer/tasks/AddOfferToRemoteOfferBook.java
index eb77f26c70..20ca4b0439 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/placeoffer/tasks/AddOfferToRemoteOfferBook.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/placeoffer/tasks/AddOfferToRemoteOfferBook.java
@@ -41,7 +41,9 @@ public class AddOfferToRemoteOfferBook extends Task<PlaceOfferModel> {
                 (message, throwable) -> {
                     failed(throwable);
                 });
-    } @Override
-      protected void rollBackOnFault() {
+    }
+
+    @Override
+    protected void rollBackOnFault() {
     }
 }
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/placeoffer/tasks/CreateOfferFeeTx.java b/core/src/main/java/io/bitsquare/trade/protocol/placeoffer/tasks/CreateOfferFeeTx.java
index 9c17948205..9329a7744f 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/placeoffer/tasks/CreateOfferFeeTx.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/placeoffer/tasks/CreateOfferFeeTx.java
@@ -37,7 +37,7 @@ public class CreateOfferFeeTx extends Task<PlaceOfferModel> {
     protected void doRun() {
         try {
             Transaction transaction = model.getWalletService().createOfferFeeTx(model.getOffer().getId());
-           
+
             // We assume there will be no tx malleability. We add a check later in case the published offer has a different hash.
             model.getOffer().setOfferFeePaymentTxID(transaction.getHashAsString());
             model.setTransaction(transaction);
@@ -46,7 +46,9 @@ public class CreateOfferFeeTx extends Task<PlaceOfferModel> {
         } catch (Throwable t) {
             failed(t);
         }
-    } @Override
-      protected void rollBackOnFault() {
+    }
+
+    @Override
+    protected void rollBackOnFault() {
     }
 }
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/placeoffer/tasks/ValidateOffer.java b/core/src/main/java/io/bitsquare/trade/protocol/placeoffer/tasks/ValidateOffer.java
index 2a13aa9bc3..d995079d33 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/placeoffer/tasks/ValidateOffer.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/placeoffer/tasks/ValidateOffer.java
@@ -40,7 +40,9 @@ public class ValidateOffer extends Task<PlaceOfferModel> {
         } catch (Exception e) {
             failed(e);
         }
-    } @Override
-      protected void rollBackOnFault() {
+    }
+
+    @Override
+    protected void rollBackOnFault() {
     }
 }
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/BuyerAsOffererProtocol.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/BuyerAsOffererProtocol.java
index 87b2a0de67..52d3200073 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/BuyerAsOffererProtocol.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/BuyerAsOffererProtocol.java
@@ -185,7 +185,7 @@ public class BuyerAsOffererProtocol {
     ///////////////////////////////////////////////////////////////////////////////////////////
     // Massage dispatcher
     ///////////////////////////////////////////////////////////////////////////////////////////
-   
+
     private void handleMessage(Message message, Peer peer) {
         log.trace("handleNewMessage: message = " + message.getClass().getSimpleName());
         if (message instanceof TradeMessage) {
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/CreateDepositTx.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/CreateDepositTx.java
index bf5dbe37be..4b828e588c 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/CreateDepositTx.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/CreateDepositTx.java
@@ -60,7 +60,9 @@ public class CreateDepositTx extends Task<BuyerAsOffererModel> {
         } catch (InsufficientMoneyException e) {
             failed(e);
         }
-    } @Override
-      protected void rollBackOnFault() {
+    }
+
+    @Override
+    protected void rollBackOnFault() {
     }
 }
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/ProcessPayoutTxPublishedMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/ProcessPayoutTxPublishedMessage.java
index 6bed50378c..0e11ded019 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/ProcessPayoutTxPublishedMessage.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/ProcessPayoutTxPublishedMessage.java
@@ -44,7 +44,7 @@ public class ProcessPayoutTxPublishedMessage extends Task<BuyerAsOffererModel> {
             checkTradeId(model.getTrade().getId(), model.getTradeMessage());
             String payoutTxAsHex = nonEmptyStringOf(((PayoutTxPublishedMessage) model.getTradeMessage()).getPayoutTxAsHex());
             Transaction payoutTx = new Transaction(model.getWalletService().getWallet().getParams(), Utils.parseAsHexOrBase58(payoutTxAsHex));
-           
+
             model.getTrade().setPayoutTx(payoutTx);
             model.getTrade().setState(Trade.State.PAYOUT_PUBLISHED);
 
@@ -52,7 +52,9 @@ public class ProcessPayoutTxPublishedMessage extends Task<BuyerAsOffererModel> {
         } catch (Throwable t) {
             failed(t);
         }
-    } @Override
-      protected void rollBackOnFault() {
+    }
+
+    @Override
+    protected void rollBackOnFault() {
     }
 }
\ No newline at end of file
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/ProcessRequestOffererPublishDepositTxMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/ProcessRequestOffererPublishDepositTxMessage.java
index 81a774a39c..63bb2a6948 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/ProcessRequestOffererPublishDepositTxMessage.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/ProcessRequestOffererPublishDepositTxMessage.java
@@ -55,7 +55,9 @@ public class ProcessRequestOffererPublishDepositTxMessage extends Task<BuyerAsOf
         } catch (Throwable t) {
             failed(t);
         }
-    } @Override
-      protected void rollBackOnFault() {
+    }
+
+    @Override
+    protected void rollBackOnFault() {
     }
 }
\ No newline at end of file
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/ProcessRequestTakeOfferMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/ProcessRequestTakeOfferMessage.java
index 907a1655fa..1352f6eafe 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/ProcessRequestTakeOfferMessage.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/ProcessRequestTakeOfferMessage.java
@@ -42,7 +42,9 @@ public class ProcessRequestTakeOfferMessage extends Task<BuyerAsOffererModel> {
         } catch (Throwable t) {
             failed(t);
         }
-    } @Override
-      protected void rollBackOnFault() {
+    }
+
+    @Override
+    protected void rollBackOnFault() {
     }
 }
\ No newline at end of file
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/ProcessTakeOfferFeePayedMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/ProcessTakeOfferFeePayedMessage.java
index 30b36ba746..c81d1d0115 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/ProcessTakeOfferFeePayedMessage.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/ProcessTakeOfferFeePayedMessage.java
@@ -51,7 +51,9 @@ public class ProcessTakeOfferFeePayedMessage extends Task<BuyerAsOffererModel> {
         } catch (Throwable t) {
             failed(t);
         }
-    } @Override
-      protected void rollBackOnFault() {
+    }
+
+    @Override
+    protected void rollBackOnFault() {
     }
 }
\ No newline at end of file
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SendBankTransferInitedMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SendBankTransferInitedMessage.java
index 793fa672a0..5c4520924e 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SendBankTransferInitedMessage.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SendBankTransferInitedMessage.java
@@ -55,7 +55,9 @@ public class SendBankTransferInitedMessage extends Task<BuyerAsOffererModel> {
                 failed("Sending BankTransferInitedMessage failed.");
             }
         });
-    } @Override
-      protected void rollBackOnFault() {
+    }
+
+    @Override
+    protected void rollBackOnFault() {
     }
 }
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SendDepositTxIdToTaker.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SendDepositTxIdToTaker.java
index 29df03c6d2..af4a2bcf43 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SendDepositTxIdToTaker.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SendDepositTxIdToTaker.java
@@ -52,7 +52,9 @@ public class SendDepositTxIdToTaker extends Task<BuyerAsOffererModel> {
                 failed("Sending DepositTxPublishedMessage failed.");
             }
         });
-    } @Override
-      protected void rollBackOnFault() {
+    }
+
+    @Override
+    protected void rollBackOnFault() {
     }
 }
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SendTakerDepositPaymentRequest.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SendTakerDepositPaymentRequest.java
index bd479b3cc8..bcd0c0c4fd 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SendTakerDepositPaymentRequest.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SendTakerDepositPaymentRequest.java
@@ -55,7 +55,9 @@ public class SendTakerDepositPaymentRequest extends Task<BuyerAsOffererModel> {
                 failed("RequestTakerDepositPaymentMessage did not arrive at peer");
             }
         });
-    } @Override
-      protected void rollBackOnFault() {
+    }
+
+    @Override
+    protected void rollBackOnFault() {
     }
 }
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SetupListenerForBlockChainConfirmation.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SetupListenerForBlockChainConfirmation.java
index eaa4c3b27f..bd778035a2 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SetupListenerForBlockChainConfirmation.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SetupListenerForBlockChainConfirmation.java
@@ -44,17 +44,19 @@ public class SetupListenerForBlockChainConfirmation extends Task<BuyerAsOffererM
             public void onConfidenceChanged(Transaction tx, ChangeReason reason) {
                 log.trace("onConfidenceChanged " + tx.getConfidence());
                 if (reason == ChangeReason.TYPE && tx.getConfidence().getConfidenceType() == TransactionConfidence.ConfidenceType.BUILDING) {
-                    
+
                     model.getTrade().setState(Trade.State.DEPOSIT_CONFIRMED);
-                    
+
                     //TODO not sure if that works
                     confidence.removeEventListener(this);
                 }
             }
         });
-        
+
         complete();
-    } @Override
-      protected void rollBackOnFault() {
+    }
+
+    @Override
+    protected void rollBackOnFault() {
     }
 }
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SignAndPublishDepositTx.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SignAndPublishDepositTx.java
index ec6bc80241..d23d204b96 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SignAndPublishDepositTx.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SignAndPublishDepositTx.java
@@ -66,7 +66,9 @@ public class SignAndPublishDepositTx extends Task<BuyerAsOffererModel> {
         } catch (Exception e) {
             failed(e);
         }
-    } @Override
-      protected void rollBackOnFault() {
+    }
+
+    @Override
+    protected void rollBackOnFault() {
     }
 }
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SignPayoutTx.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SignPayoutTx.java
index 6eecac037c..b89d2ce665 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SignPayoutTx.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/SignPayoutTx.java
@@ -61,8 +61,10 @@ public class SignPayoutTx extends Task<BuyerAsOffererModel> {
         } catch (Exception e) {
             failed(e);
         }
-    } @Override
-      protected void rollBackOnFault() {
+    }
+
+    @Override
+    protected void rollBackOnFault() {
     }
 }
 
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/VerifyAndSignContract.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/VerifyAndSignContract.java
index 48a524cd86..41f04f4e8d 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/VerifyAndSignContract.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/VerifyAndSignContract.java
@@ -56,7 +56,9 @@ public class VerifyAndSignContract extends Task<BuyerAsOffererModel> {
         trade.setTakerContractSignature(signature);
 
         complete();
-    } @Override
-      protected void rollBackOnFault() {
+    }
+
+    @Override
+    protected void rollBackOnFault() {
     }
 }
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/VerifyTakeOfferFeePayment.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/VerifyTakeOfferFeePayment.java
index 5b37862a09..0ecc550f77 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/VerifyTakeOfferFeePayment.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/VerifyTakeOfferFeePayment.java
@@ -38,9 +38,10 @@ public class VerifyTakeOfferFeePayment extends Task<BuyerAsOffererModel> {
        /* if (numOfPeersSeenTx > 2) {
             resultHandler.handleResult();
         }*/
-        
+
         complete();
     }
+
     @Override
     protected void rollBackOnFault() {
     }
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/VerifyTakerAccount.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/VerifyTakerAccount.java
index 5a4973dd16..11d3d4994b 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/VerifyTakerAccount.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/offerer/tasks/VerifyTakerAccount.java
@@ -46,7 +46,9 @@ public class VerifyTakerAccount extends Task<BuyerAsOffererModel> {
         else {
             failed("Account registration validation for peer failed.");
         }
-    } @Override
-      protected void rollBackOnFault() {
+    }
+
+    @Override
+    protected void rollBackOnFault() {
     }
 }
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/SellerAsTakerProtocol.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/SellerAsTakerProtocol.java
index 406aaf02fe..8e2e3a2ac3 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/SellerAsTakerProtocol.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/SellerAsTakerProtocol.java
@@ -190,7 +190,7 @@ public class SellerAsTakerProtocol {
         );
         taskRunner.run();
     }
-    
+
 
     ///////////////////////////////////////////////////////////////////////////////////////////
     // Massage dispatcher
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/CreateAndSignContract.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/CreateAndSignContract.java
index 98c7bd135c..2c4810438a 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/CreateAndSignContract.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/CreateAndSignContract.java
@@ -55,7 +55,9 @@ public class CreateAndSignContract extends Task<SellerAsTakerModel> {
         trade.setTakerContractSignature(signature);
 
         complete();
-    } @Override
-      protected void rollBackOnFault() {
+    }
+
+    @Override
+    protected void rollBackOnFault() {
     }
 }
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/PayDeposit.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/PayDeposit.java
index 975ede2d99..cd327512e4 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/PayDeposit.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/PayDeposit.java
@@ -55,7 +55,9 @@ public class PayDeposit extends Task<SellerAsTakerModel> {
         } catch (InsufficientMoneyException e) {
             failed(e);
         }
-    } @Override
-      protected void rollBackOnFault() {
+    }
+
+    @Override
+    protected void rollBackOnFault() {
     }
 }
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/ProcessBankTransferInitedMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/ProcessBankTransferInitedMessage.java
index 10d6fd0561..8b661ef875 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/ProcessBankTransferInitedMessage.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/ProcessBankTransferInitedMessage.java
@@ -39,7 +39,7 @@ public class ProcessBankTransferInitedMessage extends Task<SellerAsTakerModel> {
         try {
             checkTradeId(model.getTrade().getId(), model.getTradeMessage());
             BankTransferStartedMessage message = (BankTransferStartedMessage) model.getTradeMessage();
-            
+
             model.setDepositTxAsHex(nonEmptyStringOf(message.getDepositTxAsHex()));
             model.setOffererSignatureR(nonEmptyStringOf(message.getOffererSignatureR()));
             model.setOffererSignatureS(nonEmptyStringOf(message.getOffererSignatureS()));
@@ -52,7 +52,9 @@ public class ProcessBankTransferInitedMessage extends Task<SellerAsTakerModel> {
         } catch (Throwable t) {
             failed(t);
         }
-    } @Override
-      protected void rollBackOnFault() {
+    }
+
+    @Override
+    protected void rollBackOnFault() {
     }
 }
\ No newline at end of file
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/ProcessDepositTxPublishedMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/ProcessDepositTxPublishedMessage.java
index 2c34fd687f..2e7a5253f9 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/ProcessDepositTxPublishedMessage.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/ProcessDepositTxPublishedMessage.java
@@ -38,7 +38,7 @@ public class ProcessDepositTxPublishedMessage extends Task<SellerAsTakerModel> {
     protected void doRun() {
         try {
             checkTradeId(model.getTrade().getId(), model.getTradeMessage());
-            
+
             DepositTxPublishedMessage message = (DepositTxPublishedMessage) model.getTradeMessage();
             model.setDepositTxAsHex(nonEmptyStringOf(message.getDepositTxAsHex()));
 
@@ -46,7 +46,9 @@ public class ProcessDepositTxPublishedMessage extends Task<SellerAsTakerModel> {
         } catch (Throwable t) {
             failed(t);
         }
-    } @Override
-      protected void rollBackOnFault() {
+    }
+
+    @Override
+    protected void rollBackOnFault() {
     }
 }
\ No newline at end of file
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/ProcessTakerDepositPaymentRequestMessage.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/ProcessTakerDepositPaymentRequestMessage.java
index 972f318cd0..5b8153a78c 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/ProcessTakerDepositPaymentRequestMessage.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/ProcessTakerDepositPaymentRequestMessage.java
@@ -50,7 +50,9 @@ public class ProcessTakerDepositPaymentRequestMessage extends Task<SellerAsTaker
         } catch (Throwable t) {
             failed(t);
         }
-    } @Override
-      protected void rollBackOnFault() {
+    }
+
+    @Override
+    protected void rollBackOnFault() {
     }
 }
\ No newline at end of file
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendPayoutTxToOfferer.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendPayoutTxToOfferer.java
index 742bbb341d..9d6cf6106a 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendPayoutTxToOfferer.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendPayoutTxToOfferer.java
@@ -48,7 +48,9 @@ public class SendPayoutTxToOfferer extends Task<SellerAsTakerModel> {
                 failed("Sending PayoutTxPublishedMessage failed.");
             }
         });
-    } @Override
-      protected void rollBackOnFault() {
+    }
+
+    @Override
+    protected void rollBackOnFault() {
     }
 }
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendSignedTakerDepositTxAsHex.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendSignedTakerDepositTxAsHex.java
index 36f8575253..461d8baa87 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendSignedTakerDepositTxAsHex.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SendSignedTakerDepositTxAsHex.java
@@ -67,6 +67,7 @@ public class SendSignedTakerDepositTxAsHex extends Task<SellerAsTakerModel> {
             }
         });
     }
+
     @Override
     protected void rollBackOnFault() {
     }
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SignAndPublishPayoutTx.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SignAndPublishPayoutTx.java
index 26d18be4c3..f2aba8e64a 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SignAndPublishPayoutTx.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/SignAndPublishPayoutTx.java
@@ -59,7 +59,7 @@ public class SignAndPublishPayoutTx extends Task<SellerAsTakerModel> {
                             model.setPayoutTx(transaction);
                             model.setPayoutTxAsHex(payoutTxAsHex);
                             model.getTrade().setState(Trade.State.PAYOUT_PUBLISHED);
-                            
+
                             complete();
                         }
 
@@ -71,7 +71,9 @@ public class SignAndPublishPayoutTx extends Task<SellerAsTakerModel> {
         } catch (AddressFormatException e) {
             failed(e);
         }
-    } @Override
-      protected void rollBackOnFault() {
+    }
+
+    @Override
+    protected void rollBackOnFault() {
     }
 }
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/TakerCommitDepositTx.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/TakerCommitDepositTx.java
index 9d22a308b3..459a79dd9b 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/TakerCommitDepositTx.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/TakerCommitDepositTx.java
@@ -42,7 +42,9 @@ public class TakerCommitDepositTx extends Task<SellerAsTakerModel> {
         model.getTrade().setState(Trade.State.DEPOSIT_PUBLISHED);
 
         complete();
-    } @Override
-      protected void rollBackOnFault() {
+    }
+
+    @Override
+    protected void rollBackOnFault() {
     }
 }
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/VerifyOfferFeePayment.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/VerifyOfferFeePayment.java
index 3ef9457b4a..cc5101138f 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/VerifyOfferFeePayment.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/VerifyOfferFeePayment.java
@@ -39,7 +39,9 @@ public class VerifyOfferFeePayment extends Task<SellerAsTakerModel> {
             resultHandler.handleResult();
         }*/
         complete();
-    } @Override
-      protected void rollBackOnFault() {
+    }
+
+    @Override
+    protected void rollBackOnFault() {
     }
 }
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/VerifyOffererAccount.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/VerifyOffererAccount.java
index d3fb1cb4ea..e1b990cb0e 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/VerifyOffererAccount.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/taker/tasks/VerifyOffererAccount.java
@@ -44,7 +44,9 @@ public class VerifyOffererAccount extends Task<SellerAsTakerModel> {
         else {
             failed("Account registration validation for peer faultHandler.onFault.");
         }
-    } @Override
-      protected void rollBackOnFault() {
+    }
+
+    @Override
+    protected void rollBackOnFault() {
     }
 }
diff --git a/core/src/main/java/io/bitsquare/util/Utilities.java b/core/src/main/java/io/bitsquare/util/Utilities.java
index b784e2d642..2ab98d42d2 100644
--- a/core/src/main/java/io/bitsquare/util/Utilities.java
+++ b/core/src/main/java/io/bitsquare/util/Utilities.java
@@ -180,8 +180,8 @@ public class Utilities {
 
     /**
      * Empty and delete a folder (and subfolders).
-     * @param folder
-     *            folder to empty
+     *
+     * @param folder folder to empty
      */
     public static void removeDirectory(final File folder) {
         // check if folder file is a real folder
diff --git a/core/src/main/java/io/bitsquare/util/taskrunner/InterceptTaskException.java b/core/src/main/java/io/bitsquare/util/taskrunner/InterceptTaskException.java
index d27a067ec2..25a0b0607f 100644
--- a/core/src/main/java/io/bitsquare/util/taskrunner/InterceptTaskException.java
+++ b/core/src/main/java/io/bitsquare/util/taskrunner/InterceptTaskException.java
@@ -20,7 +20,7 @@ package io.bitsquare.util.taskrunner;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class InterceptTaskException extends RuntimeException{
+public class InterceptTaskException extends RuntimeException {
     private static final Logger log = LoggerFactory.getLogger(InterceptTaskException.class);
 
     public InterceptTaskException(String message) {
diff --git a/core/src/main/java/io/bitsquare/viewfx/model/Activatable.java b/core/src/main/java/io/bitsquare/viewfx/model/Activatable.java
index f794b4b672..d861ee8092 100644
--- a/core/src/main/java/io/bitsquare/viewfx/model/Activatable.java
+++ b/core/src/main/java/io/bitsquare/viewfx/model/Activatable.java
@@ -24,7 +24,7 @@ public interface Activatable {
     void deactivate();
 
 
-    Activatable NOOP_INSTANCE = new Activatable() {;
+    Activatable NOOP_INSTANCE = new Activatable() {
         @Override
         public void activate() {
         }
diff --git a/core/src/main/java/io/bitsquare/viewfx/view/ViewPath.java b/core/src/main/java/io/bitsquare/viewfx/view/ViewPath.java
index fab715d1d5..b491ce323f 100644
--- a/core/src/main/java/io/bitsquare/viewfx/view/ViewPath.java
+++ b/core/src/main/java/io/bitsquare/viewfx/view/ViewPath.java
@@ -41,6 +41,6 @@ public class ViewPath extends ArrayList<Class<? extends View>> {
         if (size() == 0)
             return null;
 
-        return get(size()-1);
+        return get(size() - 1);
     }
 }
diff --git a/core/src/main/java/io/bitsquare/viewfx/view/fxml/FxmlViewLoader.java b/core/src/main/java/io/bitsquare/viewfx/view/fxml/FxmlViewLoader.java
index f7d1ef78e0..c07c9c0aff 100644
--- a/core/src/main/java/io/bitsquare/viewfx/view/fxml/FxmlViewLoader.java
+++ b/core/src/main/java/io/bitsquare/viewfx/view/fxml/FxmlViewLoader.java
@@ -55,7 +55,7 @@ public class FxmlViewLoader implements ViewLoader {
 
         final Class<? extends FxmlView.PathConvention> convention;
         final Class<? extends FxmlView.PathConvention> defaultConvention =
-                (Class<? extends FxmlView.PathConvention>) getDefaultValue(FxmlView.class,  "convention");
+                (Class<? extends FxmlView.PathConvention>) getDefaultValue(FxmlView.class, "convention");
 
         final String specifiedLocation;
         final String defaultLocation = (String) getDefaultValue(FxmlView.class, "location");
diff --git a/core/src/test/java/io/bitsquare/msg/TomP2PTests.java b/core/src/test/java/io/bitsquare/msg/TomP2PTests.java
index 2021dea704..19c08944b9 100644
--- a/core/src/test/java/io/bitsquare/msg/TomP2PTests.java
+++ b/core/src/test/java/io/bitsquare/msg/TomP2PTests.java
@@ -73,9 +73,9 @@ import static org.junit.Assert.*;
 /**
  * Test bootstrapping, DHT operations like put/get/add/remove and sendDirect in both LAN and WAN environment
  * Test scenarios in direct connection, auto port forwarding or relay mode.
- * <p>
+ * <p/>
  * To start a bootstrap node code use the {@link io.bitsquare.app.bootstrap.BootstrapNode} class.
- * <p>
+ * <p/>
  * To configure your test environment edit the static fields for id, IP and port.
  * In the configure method and the connectionType you can define your test scenario.
  */
diff --git a/core/src/test/java/net/tomp2p/dht/UtilsDHT2.java b/core/src/test/java/net/tomp2p/dht/UtilsDHT2.java
index 4295bf762e..2b2ed02069 100644
--- a/core/src/test/java/net/tomp2p/dht/UtilsDHT2.java
+++ b/core/src/test/java/net/tomp2p/dht/UtilsDHT2.java
@@ -120,15 +120,11 @@ public class UtilsDHT2 {
      * Creates peers for testing. The first peer (peer[0]) will be used as the master. This means that shutting down
      * peer[0] will shut down all other peers
      *
-     * @param nrOfPeers
-     *            The number of peers to create including the master
-     * @param rnd
-     *            The random object to create random peer IDs
-     * @param port
-     *            The port where the master peer will listen to
+     * @param nrOfPeers The number of peers to create including the master
+     * @param rnd       The random object to create random peer IDs
+     * @param port      The port where the master peer will listen to
      * @return All the peers, with the master peer at position 0 -> peer[0]
-     * @throws Exception
-     *             If the creation of nodes fail.
+     * @throws Exception If the creation of nodes fail.
      */
     public static PeerDHT[] createNodes(int nrOfPeers, Random rnd, int port, AutomaticFuture automaticFuture,
                                         boolean maintenance) throws Exception {
@@ -210,8 +206,7 @@ public class UtilsDHT2 {
      * Perfect routing, where each neighbor has contacted each other. This means that for small number of peers, every
      * peer knows every other peer.
      *
-     * @param peers
-     *            The peers taking part in the p2p network.
+     * @param peers The peers taking part in the p2p network.
      */
     public static void perfectRouting(PeerDHT... peers) {
         for (int i = 0; i < peers.length; i++) {
diff --git a/pom.xml b/pom.xml
index 55bc64859d..003e38e510 100755
--- a/pom.xml
+++ b/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<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>io.bitsquare</groupId>
@@ -93,12 +94,12 @@
             <artifactId>bitcoinj-core</artifactId>
             <version>0.12.2</version>
         </dependency>
-       <!-- <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-jdk14</artifactId>
-            <version>1.7.7</version>
-        </dependency>-->
-        
+        <!-- <dependency>
+             <groupId>org.slf4j</groupId>
+             <artifactId>slf4j-jdk14</artifactId>
+             <version>1.7.7</version>
+         </dependency>-->
+
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>