changeset 9132:9e4b9179117d 9-b71

Automated merge with http://hg.openjdk.java.net/openjfx/9/rt
author kcr
date Fri, 26 Jun 2015 17:36:59 -0700
parents b4ea6c282f14 4f1b910a726b
children 5ad658511116 6e688637ee6f
files
diffstat 203 files changed, 2515 insertions(+), 2343 deletions(-) [+]
line wrap: on
line diff
--- a/apps/samples/Ensemble8/src/samples/java/ensemble/samples/language/stringbinding/StringBindingApp.java	Thu Jun 25 02:26:46 2015 -0700
+++ b/apps/samples/Ensemble8/src/samples/java/ensemble/samples/language/stringbinding/StringBindingApp.java	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2008, 2015, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/build.gradle	Thu Jun 25 02:26:46 2015 -0700
+++ b/build.gradle	Fri Jun 26 17:36:59 2015 -0700
@@ -1951,12 +1951,13 @@
             }
             doLast {
                 mkdir "$buildDir/native"
-                exec({
-                    commandLine("$RC", "/nologo", "/l", "0x409", "/r", "/dJFX_DVERSION=9", "/dJFX_VERSION=9",
-                            "/fo$buildDir/native/javapackager/javapackager.res",
-                            "src/main/native/javapackager/win/javapackager.rc");
-                    environment(WINDOWS_NATIVE_COMPILE_ENVIRONMENT);
-                });
+                exec {
+                    environment(WINDOWS_NATIVE_COMPILE_ENVIRONMENT)
+                    commandLine(WIN.fxpackager.rcCompiler)
+                    args(WIN.fxpackager.rcFlags)
+                    args("/fo$buildDir/native/javapackager/javapackager.res")
+                    args(WIN.fxpackager.rcSource)
+                }
             }
             doLast {
                 mkdir "$buildDir/javapackager"
--- a/buildSrc/dalvik.gradle	Thu Jun 25 02:26:46 2015 -0700
+++ b/buildSrc/dalvik.gradle	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/buildSrc/src/main/groovy/com/sun/javafx/gradle/LipoTask.groovy	Thu Jun 25 02:26:46 2015 -0700
+++ b/buildSrc/src/main/groovy/com/sun/javafx/gradle/LipoTask.groovy	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/buildSrc/win.gradle	Thu Jun 25 02:26:46 2015 -0700
+++ b/buildSrc/win.gradle	Fri Jun 26 17:36:59 2015 -0700
@@ -152,14 +152,35 @@
 if (!file(RC).exists()) throw new GradleException("FAIL: cannot find RC: " + RC)
 if (!file(FXC).exists()) throw new GradleException("FAIL: cannot find FXC: " + FXC)
 
+// The product version passed to RC is defined as follows:
+//
+// MAJOR.MINOR.UPDATE_10.BUILD
+//
+// where:
+//
+// MAJOR = 8 (for JDK 8)
+// MINOR = 0
+// UPDATE_10 = JDK update * 10, so 8u65 --> 650
+// BUILD = build number with no leading zeros
+//
+def rcVerMajor = Integer.parseInt(jfxReleaseMajorVersion)
+def rcVerMinor = Integer.parseInt(jfxReleaseMinorVersion)
+def rcVerMicro = Integer.parseInt(jfxReleaseMicroVersion) * 10
+def rcVerSubMicro = Integer.parseInt(PROMOTED_BUILD_NUMBER)
+
+def rcVer = "${rcVerMajor}.${rcVerMinor}.${rcVerMicro}.${rcVerSubMicro}"
+def rcVerComma = "${rcVerMajor},${rcVerMinor},${rcVerMicro},${rcVerSubMicro}"
+
+def rcVerProduct = "${rcVerMajor}"
+
 def rcFlags = [
     "/d", "\"JFX_COMPANY=${COMPANY_NAME}\"",
     "/d", "\"JFX_COMPONENT=${PRODUCT_NAME} ${PLATFORM_NAME} binary\"",
-    "/d", "\"JFX_NAME=${PRODUCT_NAME} ${PLATFORM_NAME} ${jfxReleaseMajorVersion}\"",
-    "/d", "\"JFX_VER=${jfxReleaseMajorVersion}.${jfxReleaseMinorVersion}.${jfxReleaseMicroVersion}.${PROMOTED_BUILD_NUMBER}\"",
+    "/d", "\"JFX_NAME=${PRODUCT_NAME} ${PLATFORM_NAME} ${rcVerProduct}\"",
+    "/d", "\"JFX_VER=${rcVer}\"",
     "/d", "\"JFX_BUILD_ID=${RAW_VERSION}-${RELEASE_MILESTONE}-b${PROMOTED_BUILD_NUMBER}\"",
     "/d", "\"JFX_COPYRIGHT=Copyright \u00A9 ${Calendar.getInstance().get(Calendar.YEAR)}\"",
-    "/d", "\"JFX_FVER=${jfxReleaseMajorVersion},${jfxReleaseMinorVersion},${jfxReleaseMicroVersion},${PROMOTED_BUILD_NUMBER}\"",
+    "/d", "\"JFX_FVER=${rcVerComma}\"",
     "/d", "\"JFX_FTYPE=0x2L\"",
     "/nologo"
 ];
@@ -274,6 +295,13 @@
                     "/I$JDK_HOME/include", "/I$JDK_HOME/include/win32",
                     "/O2", "-c"]
 WIN.fxpackager.linker = linker
+WIN.fxpackager.rcSource = file("modules/fxpackager/src/main/native/javapackager/win/javapackager.rc")
+WIN.fxpackager.rcCompiler = rcCompiler
+WIN.fxpackager.rcFlags = [
+    "/l", "0x409",
+    "/d", "JFX_FNAME=javapackager.exe",
+    "/d", "JFX_INTERNAL_NAME=javapackager",
+    rcFlags].flatten();
 
 WIN.iio = [:]
 WIN.iio.javahInclude = ["com/sun/javafx/iio/**/*"]
--- a/modules/base/src/main/java/javafx/collections/ObservableMap.java	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/base/src/main/java/javafx/collections/ObservableMap.java	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/ProgressBarSkin.java	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/ProgressBarSkin.java	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/SpinnerSkin.java	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/controls/src/main/java/com/sun/javafx/scene/control/skin/SpinnerSkin.java	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/controls/src/main/java/javafx/scene/chart/XYChart.java	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/controls/src/main/java/javafx/scene/chart/XYChart.java	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/controls/src/main/resources/com/sun/javafx/scene/control/skin/caspian/caspian-no-transparency.css	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/controls/src/main/resources/com/sun/javafx/scene/control/skin/caspian/caspian-no-transparency.css	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2011, Oracle anis/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -89,4 +89,4 @@
 .date-picker-popup {
     -fx-background-radius: 0;
     -fx-effect: null;
-}
\ No newline at end of file
+}
--- a/modules/controls/src/main/resources/com/sun/javafx/scene/control/skin/caspian/caspian.css	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/controls/src/main/resources/com/sun/javafx/scene/control/skin/caspian/caspian.css	Fri Jun 26 17:36:59 2015 -0700
@@ -1,25 +1,25 @@
 /*
- * Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 
- *  
- * This code is free software; you can redistribute it and/or modify it 
- * under the terms of the GNU General Public License version 2 only, as 
- * published by the Free Software Foundation.  Oracle designates this 
- * particular file as subject to the "Classpath" exception as provided 
- * by Oracle in the LICENSE file that accompanied this code. 
- *  
- * This code is distributed in the hope that it will be useful, but WITHOUT 
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License 
- * version 2 for more details (a copy is included in the LICENSE file that 
- * accompanied this code). 
- *  
- * You should have received a copy of the GNU General Public License version 
- * 2 along with this work; if not, write to the Free Software Foundation, 
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 
- *  
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 
- * or visit www.oracle.com if you need additional information or have any 
+ * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
 
@@ -3968,7 +3968,7 @@
 whose borders are styled.  Only the right border is specified
 with a color; the other three borders are transparent.*/
 
-/* Note: This first section of CSS (below) specifies the Separator’s color.
+/* Note: This first section of CSS (below) specifies the Separator's color.
 Specifying the color here ensures the same color for both .top-toolbar
 and .bottom-toolbar Separators, as they will inherit the color. */
 
@@ -3978,7 +3978,7 @@
     -fx-border-color: transparent derive(-fx-base,-35%) transparent transparent; /* #878787 */
 }
 
-/* Note: This next section of CSS (below) specifies the Separator’s length.
+/* Note: This next section of CSS (below) specifies the Separator's length.
 The length of the Separator is determined by adding its -fx-padding values
 to the top and bottom -fx-padding values of the parent toolbar. */
 
--- a/modules/controls/src/main/resources/com/sun/javafx/scene/control/skin/caspian/embedded-qvga.css	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/controls/src/main/resources/com/sun/javafx/scene/control/skin/caspian/embedded-qvga.css	Fri Jun 26 17:36:59 2015 -0700
@@ -1,27 +1,26 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved. 
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 
- *  
- * This code is free software; you can redistribute it and/or modify it 
- * under the terms of the GNU General Public License version 2 only, as 
- * published by the Free Software Foundation.  Oracle designates this 
- * particular file as subject to the "Classpath" exception as provided 
- * by Oracle in the LICENSE file that accompanied this code. 
- *  
- * This code is distributed in the hope that it will be useful, but WITHOUT 
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License 
- * version 2 for more details (a copy is included in the LICENSE file that 
- * accompanied this code). 
- *  
- * You should have received a copy of the GNU General Public License version 
- * 2 along with this work; if not, write to the Free Software Foundation, 
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 
- *  
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 
- * or visit www.oracle.com if you need additional information or have any 
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
  * questions.
- *                                                                              
  */
 
 /*******************************************************************************
--- a/modules/controls/src/main/resources/com/sun/javafx/scene/control/skin/caspian/embedded.css	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/controls/src/main/resources/com/sun/javafx/scene/control/skin/caspian/embedded.css	Fri Jun 26 17:36:59 2015 -0700
@@ -1,27 +1,26 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved. 
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 
- *  
- * This code is free software; you can redistribute it and/or modify it 
- * under the terms of the GNU General Public License version 2 only, as 
- * published by the Free Software Foundation.  Oracle designates this 
- * particular file as subject to the "Classpath" exception as provided 
- * by Oracle in the LICENSE file that accompanied this code. 
- *  
- * This code is distributed in the hope that it will be useful, but WITHOUT 
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License 
- * version 2 for more details (a copy is included in the LICENSE file that 
- * accompanied this code). 
- *  
- * You should have received a copy of the GNU General Public License version 
- * 2 along with this work; if not, write to the Free Software Foundation, 
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 
- *  
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 
- * or visit www.oracle.com if you need additional information or have any 
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
  * questions.
- *                                                                              
  */
 
 /*******************************************************************************
@@ -77,7 +76,7 @@
 
 .scroll-bar:vertical > .thumb {
    -fx-background-color: -fx-box-border, linear-gradient(to right, derive(-fx-color,95%), derive(-fx-color,10%));
-	-fx-background-radius: 4, 3;
+    -fx-background-radius: 4, 3;
 }
 .scroll-bar:horizontal > .track {
    -fx-opacity: 50%;
@@ -116,7 +115,7 @@
 .tree-view > .virtual-flow > .scroll-bar:vertical,
 .table-view > .virtual-flow > .scroll-bar:vertical,
 .tree-table-view > .virtual-flow > .scroll-bar:vertical {
-	-fx-padding: 1;
+    -fx-padding: 1;
 }
 
 
--- a/modules/controls/src/main/resources/com/sun/javafx/scene/control/skin/caspian/fxvk.css	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/controls/src/main/resources/com/sun/javafx/scene/control/skin/caspian/fxvk.css	Fri Jun 26 17:36:59 2015 -0700
@@ -1,3 +1,28 @@
+/*
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
 /*******************************************************************************
  *                                                                             *
  * Virtual Keyboard                                                            *
--- a/modules/controls/src/main/resources/com/sun/javafx/scene/control/skin/caspian/highcontrast.css	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/controls/src/main/resources/com/sun/javafx/scene/control/skin/caspian/highcontrast.css	Fri Jun 26 17:36:59 2015 -0700
@@ -1,30 +1,30 @@
 /*
-    Document   : highcontrast
-*/
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
 /*
- * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.       
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.       
- *        
- * This code is free software; you can redistribute it and/or modify it       
- * under the terms of the GNU General Public License version 2 only, as       
- * published by the Free Software Foundation.  Oracle designates this       
- * particular file as subject to the "Classpath" exception as provided       
- * by Oracle in the LICENSE file that accompanied this code.       
- *        
- * This code is distributed in the hope that it will be useful, but WITHOUT     
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or       
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License       
- * version 2 for more details (a copy is included in the LICENSE file that      
- * accompanied this code).       
- *        
- * You should have received a copy of the GNU General Public License version    
- * 2 along with this work; if not, write to the Free Software Foundation,  
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.       
- *        
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA      
- * or visit www.oracle.com if you need additional information or have any       
- * questions.
- *            
+ *  Document   : highcontrast
  */
 
 /********************************************************************************
@@ -70,7 +70,7 @@
             -fx-shadow-highlight-color,
             linear-gradient( from 0% 0% to 0% 100%, derive(-fx-color,-90%) 0%, derive(-fx-color,-60%) 100%),
 /*          the next line of code paints the dark vertical gradient from the top to the bottom of the selected button */
-			linear-gradient( from 0% 0% to 0% 100%, derive(-fx-color,-80%) 0%, derive(-fx-color,-65%) 45%, derive(-fx-color,-50%) 99%, derive(-fx-color,-60%) 100%),
+            linear-gradient( from 0% 0% to 0% 100%, derive(-fx-color,-80%) 0%, derive(-fx-color,-65%) 45%, derive(-fx-color,-50%) 99%, derive(-fx-color,-60%) 100%),
 /*          the next line of code paints the dark horizontal gradient from the left and right edges toward the center of the selected button */
             linear-gradient( from 0% 0% to 100% 0%, rgba(0,0,0,0.3) 0%, rgba(0,0,0,0) 10%, rgba(0,0,0,0) 90%, rgba(0,0,0,0.3) 100%);
         -fx-background-insets: 0 0 -1 0, 0, 1, 1;
--- a/modules/controls/src/main/resources/com/sun/javafx/scene/control/skin/caspian/two-level-focus.css	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/controls/src/main/resources/com/sun/javafx/scene/control/skin/caspian/two-level-focus.css	Fri Jun 26 17:36:59 2015 -0700
@@ -1,125 +1,125 @@
-/*
- * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
- /*******************************************************************************
- *																			   *
- * 2-level focus setting for Caspian										   *
- *																			   *
- ******************************************************************************/
-
-/*******************************************************************************
- *																			   *
- * ChoiceBox																   *
- *																			   *
- ******************************************************************************/
-.choice-box:showing {
-    -fx-background-color: -fx-shadow-highlight-color, -fx-outer-border, -fx-inner-border, -fx-body-color;
-}
-/*******************************************************************************
- *																			   *
- * TextField																   *
- *																			   *
- ******************************************************************************/
-.text-input:focused:internal-focus {
-    -fx-highlight-fill: -fx-accent;
-    -fx-highlight-text-fill: white;
-}
-.text-input:focused:external-focus {
-    -fx-highlight-fill: -fx-control-inner-background;
-    -fx-highlight-text-fill: -fx-text-inner-color;
-}
-.text-field:focused:external-focus {
-    -fx-prompt-text-fill: derive(-fx-control-inner-background,-30%);
-}
-.text-field:focused:internal-focus {
-    -fx-background-color: -fx-shadow-highlight-color, -fx-text-box-border, -fx-control-inner-background;
-    -fx-prompt-text-fill: transparent;
-}
-/*******************************************************************************
- *																			   *
- * TextArea																	   *
- *																			   *
- ******************************************************************************/
-.text-area:focused:internal-focus {
-    -fx-background-color: -fx-shadow-highlight-color, -fx-text-box-border, -fx-control-inner-background;
-}
-.text-area:focused:external-focus {
-    -fx-background-color: -fx-focus-color, -fx-text-box-border, -fx-control-inner-background;
-}
-/*******************************************************************************
- *																			   *
- * Slider																	   *
- *																			   *
- ******************************************************************************/
-.slider {
-    -fx-padding: 5;
-}
-.slider:focused:external-focus {
-    -fx-background-color: -fx-focus-color, -fx-control-inner-background;
-    -fx-background-insets: -0.4, 1;
-    -fx-background-radius: 3.4, 2;
-}
-.slider:focused:internal-focus {
-    -fx-background-color: transparent;
-}
-.slider:focused:external-focus .thumb {
-    -fx-background-color:
-        derive(-fx-color,-36%),
-        derive(-fx-color,73%),
-        linear-gradient(to bottom, derive(-fx-color,-19%),derive(-fx-color,61%));
-    -fx-background-insets: 0, 1, 2;
-}
-/*******************************************************************************
- *																			   *
- * ListView, TableView														   *
- *																			   *
- ******************************************************************************/
-.list-view:focused:external-focus > .virtual-flow > .clipped-container > .sheet > .list-cell:filled:selected,
-.table-view:focused:external-focus > .virtual-flow > .clipped-container > .sheet > .table-row-cell:filled:selected,
-.table-view:focused:external-focus > .virtual-flow > .clipped-container > .sheet > .table-row-cell > .table-cell:selected,
-.table-view:row-selection:focused:external-focus > .virtual-flow > .clipped-container > .sheet > .table-row-cell:selected:filled {
-    -fx-background-color: lightgray;
-    -fx-background: -fx-control-inner-background;
-    -fx-text-fill: -fx-text-inner-color;
-}
-.list-view:focused:internal-focus,
-.table-view:focused:internal-focus {
-    -fx-background-color: -fx-box-border, -fx-control-inner-background;
-    -fx-background-insets: 0, 1;
-}
-/*******************************************************************************
- *																			   *
- * ComboBox																	   *
- *																			   *
- ******************************************************************************/
-.combo-box-base:focused:showing  {
-    -fx-background-color: -fx-shadow-highlight-color, -fx-outer-border, -fx-inner-border, -fx-body-color;
-    -fx-background-radius: 5, 5, 4, 3;
-    -fx-background-insets: 0 0 -1 0, 0, 1, 2;
-    -fx-padding: 0;
-}
-.combo-box-base:editable:focused:showing > .text-field:focused {
-    -fx-prompt-text-fill: transparent;
-}
+/*
+ * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+ /*******************************************************************************
+ *                                                                             *
+ * 2-level focus setting for Caspian                                           *
+ *                                                                             *
+ ******************************************************************************/
+
+/*******************************************************************************
+ *                                                                             *
+ * ChoiceBox                                                                   *
+ *                                                                             *
+ ******************************************************************************/
+.choice-box:showing {
+    -fx-background-color: -fx-shadow-highlight-color, -fx-outer-border, -fx-inner-border, -fx-body-color;
+}
+/*******************************************************************************
+ *                                                                             *
+ * TextField                                                                   *
+ *                                                                             *
+ ******************************************************************************/
+.text-input:focused:internal-focus {
+    -fx-highlight-fill: -fx-accent;
+    -fx-highlight-text-fill: white;
+}
+.text-input:focused:external-focus {
+    -fx-highlight-fill: -fx-control-inner-background;
+    -fx-highlight-text-fill: -fx-text-inner-color;
+}
+.text-field:focused:external-focus {
+    -fx-prompt-text-fill: derive(-fx-control-inner-background,-30%);
+}
+.text-field:focused:internal-focus {
+    -fx-background-color: -fx-shadow-highlight-color, -fx-text-box-border, -fx-control-inner-background;
+    -fx-prompt-text-fill: transparent;
+}
+/*******************************************************************************
+ *                                                                             *
+ * TextArea                                                                    *
+ *                                                                             *
+ ******************************************************************************/
+.text-area:focused:internal-focus {
+    -fx-background-color: -fx-shadow-highlight-color, -fx-text-box-border, -fx-control-inner-background;
+}
+.text-area:focused:external-focus {
+    -fx-background-color: -fx-focus-color, -fx-text-box-border, -fx-control-inner-background;
+}
+/*******************************************************************************
+ *                                                                             *
+ * Slider                                                                      *
+ *                                                                             *
+ ******************************************************************************/
+.slider {
+    -fx-padding: 5;
+}
+.slider:focused:external-focus {
+    -fx-background-color: -fx-focus-color, -fx-control-inner-background;
+    -fx-background-insets: -0.4, 1;
+    -fx-background-radius: 3.4, 2;
+}
+.slider:focused:internal-focus {
+    -fx-background-color: transparent;
+}
+.slider:focused:external-focus .thumb {
+    -fx-background-color:
+        derive(-fx-color,-36%),
+        derive(-fx-color,73%),
+        linear-gradient(to bottom, derive(-fx-color,-19%),derive(-fx-color,61%));
+    -fx-background-insets: 0, 1, 2;
+}
+/*******************************************************************************
+ *                                                                             *
+ * ListView, TableView                                                         *
+ *                                                                             *
+ ******************************************************************************/
+.list-view:focused:external-focus > .virtual-flow > .clipped-container > .sheet > .list-cell:filled:selected,
+.table-view:focused:external-focus > .virtual-flow > .clipped-container > .sheet > .table-row-cell:filled:selected,
+.table-view:focused:external-focus > .virtual-flow > .clipped-container > .sheet > .table-row-cell > .table-cell:selected,
+.table-view:row-selection:focused:external-focus > .virtual-flow > .clipped-container > .sheet > .table-row-cell:selected:filled {
+    -fx-background-color: lightgray;
+    -fx-background: -fx-control-inner-background;
+    -fx-text-fill: -fx-text-inner-color;
+}
+.list-view:focused:internal-focus,
+.table-view:focused:internal-focus {
+    -fx-background-color: -fx-box-border, -fx-control-inner-background;
+    -fx-background-insets: 0, 1;
+}
+/*******************************************************************************
+ *                                                                             *
+ * ComboBox                                                                    *
+ *                                                                             *
+ ******************************************************************************/
+.combo-box-base:focused:showing  {
+    -fx-background-color: -fx-shadow-highlight-color, -fx-outer-border, -fx-inner-border, -fx-body-color;
+    -fx-background-radius: 5, 5, 4, 3;
+    -fx-background-insets: 0 0 -1 0, 0, 1, 2;
+    -fx-padding: 0;
+}
+.combo-box-base:editable:focused:showing > .text-field:focused {
+    -fx-prompt-text-fill: transparent;
+}
--- a/modules/controls/src/main/resources/com/sun/javafx/scene/control/skin/modena/blackOnWhite.css	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/controls/src/main/resources/com/sun/javafx/scene/control/skin/modena/blackOnWhite.css	Fri Jun 26 17:36:59 2015 -0700
@@ -1,527 +1,552 @@
-/*******************************************************************************
- *                                                                             *
- * "Black on White" contrast theme.                                            *
- *                                                                             *
- ******************************************************************************/
-
-.root {
-    -fx-base: white;
-    -fx-background: -fx-base;
-    -fx-control-inner-background: -fx-base;
-    -fx-control-inner-background-alt: -fx-base;
-    -fx-faint-focus-color: -fx-accent;
-    -fx-hover-base: black;
-    -fx-pressed-base: derive(-fx-base, -8%);
-    -fx-box-border: -fx-hover-base;
-    -fx-text-box-border: -fx-hover-base;
-    -fx-shadow-highlight-color: -fx-base;
-    -fx-outer-border: -fx-hover-base;
-    -fx-selection-bar-non-focused: -fx-pressed-base;
-}
-/*******************************************************************************
- *                                                                             *
- * Font Weight                                                                 *
- *                                                                             *
- ******************************************************************************/
-.text,
-.text-input {
-    -fx-font-weight: bold;
-}
-.axis {
-    -fx-tick-label-font-weight: bold;
-}
-/*******************************************************************************
- *                                                                             *
- * ToggleButton                                                                *
- *                                                                             *
- ******************************************************************************/
-.toggle-button:selected,
-.toggle-button:selected:focused {
-    -fx-mid-text-color: -fx-base;
-}
-.toggle-button:selected:armed,
-.toggle-button:selected:focused:armed {
-    -fx-mid-text-color: -fx-hover-base;
-}
-.toggle-button:selected {
-    -fx-background-color: -fx-shadow-highlight-color, -fx-hover-base, -fx-hover-base;
-}
-.toggle-button:selected:focused {
-    -fx-background-color: -fx-focus-color, -fx-hover-base, -fx-faint-focus-color, -fx-hover-base;
-}
-.toggle-button:selected:armed {
-    -fx-background-color: -fx-shadow-highlight-color, -fx-hover-base, -fx-faint-focus-color, -fx-pressed-base;
-}
-.toggle-button:selected:focused:armed {
-    -fx-background-color: -fx-focus-color, -fx-hover-base, -fx-faint-focus-color, -fx-pressed-base;
-}
-/*******************************************************************************
- *                                                                             *
- * Slider                                                                      *
- *                                                                             *
- ******************************************************************************/
-.slider .thumb {
-    -fx-background-color: -fx-hover-base, -fx-inner-border, -fx-body-color;
-}
-.slider:focused .thumb {
-    -fx-background-color: -fx-focus-color, -fx-inner-border, -fx-body-color, -fx-faint-focus-color, -fx-body-color;
-}
-/*******************************************************************************
- *                                                                             *
- * ScrollBar                                                                   *
- *                                                                             *
- ******************************************************************************/
-.scroll-bar > .increment-button,
-.scroll-bar > .decrement-button {
-    -fx-background-color: -fx-outer-border, -fx-base, -fx-base;
-}
-.scroll-bar > .increment-button:hover,
-.scroll-bar > .decrement-button:hover {
-    -fx-background-color: -fx-outer-border, -fx-hover-base, -fx-hover-base;
-}
-.scroll-bar > .increment-button:hover > .increment-arrow,
-.scroll-bar > .decrement-button:hover > .decrement-arrow {
-    -fx-background-color: -fx-base, -fx-base;
-}
-.scroll-bar > .increment-button:hover:pressed > .increment-arrow,
-.scroll-bar > .decrement-button:hover:pressed > .decrement-arrow {
-    -fx-background-color: -fx-hover-base, -fx-hover-base;
-}
-.scroll-bar > .increment-button > .increment-arrow,
-.scroll-bar > .decrement-button > .decrement-arrow {
-    -fx-background-color: -fx-hover-base, -fx-hover-base;
-}
-.scroll-bar > .increment-button:hover:pressed,
-.scroll-bar > .decrement-button:hover:pressed {
-    -fx-background-color: -fx-outer-border, -fx-pressed-base, -fx-pressed-base;
-}
-.scroll-bar:horizontal > .decrement-button > .decrement-arrow,
-.scroll-bar:horizontal > .increment-button > .increment-arrow,
-.scroll-bar:vertical > .decrement-button > .decrement-arrow,
-.scroll-bar:vertical > .increment-button > .increment-arrow {
-    -fx-effect: null;
-}
-.scroll-bar > .thumb:pressed {
-    -fx-background-color: -fx-outer-border, -fx-pressed-base, -fx-pressed-base;
-}
-/*******************************************************************************
- *                                                                             *
- * HTML Editor                                                                 *
- *                                                                             *
- ******************************************************************************/
-.html-editor-foreground,
-.html-editor-foreground:showing:hover {
-    -fx-graphic: url("HTMLEditor-Text-Color-Black.png");
-}
-.html-editor-background,
-.html-editor-background:showing:hover {
-    -fx-graphic: url("HTMLEditor-Background-Color-Black.png");
-}
-.html-editor-cut,
-.html-editor-cut:hover:armed {
-    -fx-graphic: url("HTMLEditor-Cut-Black.png");
-}
-.html-editor-copy,
-.html-editor-copy:hover:armed {
-    -fx-graphic: url("HTMLEditor-Copy-Black.png");
-}
-.html-editor-paste,
-.html-editor-paste:hover:armed {
-    -fx-graphic: url("HTMLEditor-Paste-Black.png");
-}
-.html-editor-align-left,
-.html-editor-align-left:hover:armed,
-.html-editor-align-left:selected:armed {
-    -fx-graphic: url("HTMLEditor-Left-Black.png");
-}
-.html-editor-align-center,
-.html-editor-align-center:hover:armed,
-.html-editor-align-center:selected:armed {
-    -fx-graphic: url("HTMLEditor-Center-Black.png");
-}
-.html-editor-align-right,
-.html-editor-align-right:hover:armed,
-.html-editor-align-right:selected:armed {
-    -fx-graphic: url("HTMLEditor-Right-Black.png");
-}
-.html-editor-align-justify,
-.html-editor-align-justify:hover:armed,
-.html-editor-align-justify:selected:armed {
-    -fx-graphic: url("HTMLEditor-Justify-Black.png");
-}
-.html-editor-outdent,
-.html-editor-outdent:hover:armed {
-    -fx-graphic: url("HTMLEditor-Outdent-Black.png");
-}
-.html-editor-outdent:dir(rtl),
-.html-editor-outdent:hover:armed:dir(rtl) {
-    -fx-graphic: url("HTMLEditor-Outdent-Black-rtl.png");
-}
-.html-editor-indent,
-.html-editor-indent:hover:armed {
-    -fx-graphic: url("HTMLEditor-Indent-Black.png");
-}
-.html-editor-indent:dir(rtl),
-.html-editor-indent:hover:armed:dir(rtl) {
-    -fx-graphic: url("HTMLEditor-Indent-Black-rtl.png");
-}
-.html-editor-bullets,
-.html-editor-bullets:hover:armed,
-.html-editor-bullets:selected:armed {
-    -fx-graphic: url("HTMLEditor-Bullets-Black.png");
-}
-.html-editor-bullets:dir(rtl),
-.html-editor-bullets:hover:armed:dir(rtl),
-.html-editor-bullets:selected:armed:dir(rtl) {
-    -fx-graphic: url("HTMLEditor-Bullets-Black-rtl.png");
-}
-.html-editor-numbers,
-.html-editor-numbers:hover:armed,
-.html-editor-numbers:selected:armed {
-    -fx-graphic: url("HTMLEditor-Numbered-Black.png");
-}
-.html-editor-numbers:dir(rtl),
-.html-editor-numbers:hover:armed:dir(rtl),
-.html-editor-numbers:selected:armed:dir(rtl) {
-    -fx-graphic: url("HTMLEditor-Numbered-Black-rtl.png");
-}
-.html-editor-bold,
-.html-editor-bold:hover:armed,
-.html-editor-bold:selected:armed {
-    -fx-graphic: url("HTMLEditor-Bold-Black.png");
-}
-.html-editor-italic,
-.html-editor-italic:hover:armed,
-.html-editor-italic:selected:armed {
-    -fx-graphic: url("HTMLEditor-Italic-Black.png");
-}
-.html-editor-underline,
-.html-editor-underline:hover:armed,
-.html-editor-underline:selected:armed {
-    -fx-graphic: url("HTMLEditor-Underline-Black.png");
-}
-.html-editor-strike,
-.html-editor-strike:hover:armed,
-.html-editor-strike:selected:armed {
-    -fx-graphic: url("HTMLEditor-Strikethrough-Black.png");
-}
-.html-editor-hr,
-.html-editor-hr:hover:armed {
-    -fx-graphic: url("HTMLEditor-Break-Black.png");
-}
-.html-editor-foreground:hover {
-    -fx-graphic: url("HTMLEditor-Text-Color-White.png");
-}
-.html-editor-background:hover {
-    -fx-graphic: url("HTMLEditor-Background-Color-White.png");
-}
-.html-editor-cut:hover,
-.html-editor-cut:armed {
-    -fx-graphic: url("HTMLEditor-Cut-White.png");
-}
-.html-editor-copy:hover,
-.html-editor-copy:armed {
-    -fx-graphic: url("HTMLEditor-Copy-White.png");
-}
-.html-editor-paste:hover,
-.html-editor-paste:armed {
-    -fx-graphic: url("HTMLEditor-Paste-White.png");
-}
-.html-editor-align-left:hover,
-.html-editor-align-left:selected {
-    -fx-graphic: url("HTMLEditor-Left-White.png");
-}
-.html-editor-align-center:hover,
-.html-editor-align-center:selected {
-    -fx-graphic: url("HTMLEditor-Center-White.png");
-}
-.html-editor-align-right:hover,
-.html-editor-align-right:selected {
-    -fx-graphic: url("HTMLEditor-Right-White.png");
-}
-.html-editor-align-justify:hover,
-.html-editor-align-justify:selected {
-    -fx-graphic: url("HTMLEditor-Justify-White.png");
-}
-.html-editor-outdent:hover,
-.html-editor-outdent:armed {
-    -fx-graphic: url("HTMLEditor-Outdent-White.png");
-}
-.html-editor-indent:hover,
-.html-editor-indent:armed {
-    -fx-graphic: url("HTMLEditor-Indent-White.png");
-}
-.html-editor-bullets:hover,
-.html-editor-bullets:selected {
-    -fx-graphic: url("HTMLEditor-Bullets-White.png");
-}
-.html-editor-numbers:hover,
-.html-editor-numbers:selected {
-    -fx-graphic: url("HTMLEditor-Numbered-White.png");
-}
-.html-editor-bold:hover,
-.html-editor-bold:selected {
-    -fx-graphic: url("HTMLEditor-Bold-White.png");
-}
-.html-editor-italic:hover,
-.html-editor-italic:selected {
-    -fx-graphic: url("HTMLEditor-Italic-White.png");
-}
-.html-editor-underline:hover,
-.html-editor-underline:selected {
-    -fx-graphic: url("HTMLEditor-Underline-White.png");
-}
-.html-editor-strike:hover,
-.html-editor-strike:selected {
-    -fx-graphic: url("HTMLEditor-Strikethrough-White.png");
-}
-.html-editor-hr:hover,
-.html-editor-hr:armed {
-    -fx-graphic: url("HTMLEditor-Break-White.png");
-}
-/*******************************************************************************
- *                                                                             *
- * PopupMenu                                                                   *
- *                                                                             *
- ******************************************************************************/
-.context-menu {
-    -fx-background-color: -fx-hover-base, -fx-control-inner-background;
-    -fx-text-fill: red;
-}
-.context-menu > .scroll-arrow > .menu-up-arrow,
-.context-menu > .scroll-arrow > .menu-down-arrow {
-    -fx-background-color: -fx-hover-base;
-}
-.context-menu > .scroll-arrow:hover > .menu-up-arrow,
-.context-menu > .scroll-arrow:hover > .menu-down-arrow {
-    -fx-background-color: -fx-base;
-}
-/*******************************************************************************
- *                                                                             *
- * MenuBar                                                                     *
- *                                                                             *
- ******************************************************************************/
-.menu-bar {
-    -fx-background-color: -fx-hover-base, -fx-base;
-    -fx-background-insets: 1 1 0 1, 1;
-}
-/*******************************************************************************
- *                                                                             *
- * Menu                                                                        *
- *                                                                             *
- ******************************************************************************/
-.menu-up-arrow, .menu-down-arrow {
-    -fx-effect: null;
-}
-/*******************************************************************************
- *                                                                             *
- * TabPane                                                                     *
- *                                                                             *
- ******************************************************************************/
-.tab-header-area {
-    -fx-text-box-border: -fx-base;
-}
-.tab-pane > .tab-header-area > .headers-region > .tab:selected:hover {
-    -fx-background-color: -fx-hover-base;
-}
-.tab-pane:focused > .tab-header-area > .headers-region > .tab:selected .focus-indicator {
-    -fx-border-width: 4;
-    -fx-border-color: -fx-focus-color;
-    -fx-border-insets: -4 -4 -7 -5;
-    -fx-border-radius: 1;
-}
-.tab-pane:focused > .tab-header-area > .headers-region > .tab:bottom:selected .focus-indicator {
-    -fx-border-insets: -7 -5 -4 -4;
-}
-.tab-pane:bottom > .tab-header-area > .tab-header-background,
-.tab-pane:left > .tab-header-area > .tab-header-background,
-.tab-pane:right > .tab-header-area > .tab-header-background {
-    -fx-background-insets: 0, 0 0 1 0, 1;
-}
-/*******************************************************************************
- *                                                                             *
- * ComboBox                                                                    *
- *                                                                             *
- ******************************************************************************/
-.combo-box-popup > .list-view {
-    -fx-background-color: -fx-outer-border, -fx-control-inner-background;
-}
-.combo-box-popup > .list-view > .virtual-flow > .clipped-container > .sheet > .list-cell:filled:selected:hover {
-    -fx-text-fill: -fx-base;
-}
-/*******************************************************************************
- *                                                                             *
- * TitledPane                                                                  *
- *                                                                             *
- ******************************************************************************/
-.titled-pane > .title {
-    -fx-background-color: -fx-outer-border, -fx-inner-border, -fx-body-color;
-}
-.titled-pane:focused > .title {
-    -fx-background-color: -fx-faint-focus-color, -fx-focus-color, -fx-body-color;
-    -fx-background-insets: 0, 1, 4;
-}
-.titled-pane > .title:hover {
-    -fx-color: -fx-pressed-base;
-}
-.titled-pane > .title > .arrow-button > .arrow,
-.titled-pane:focused > .title > .arrow-button > .arrow {
-    -fx-background-color: -fx-mark-color;
-    -fx-background-insets: 0;
-    -fx-effect: null;
-}
-.titled-pane > .title:hover > .arrow-button > .arrow {
-    -fx-background-color: -fx-hover-base;
-    -fx-background-insets: 0;
-}
-/*******************************************************************************
- *                                                                             *
- * SplitPane                                                                   *
- *                                                                             *
- ******************************************************************************/
-.split-pane:horizontal > .split-pane-divider:hover {
-    -fx-background-color: -fx-box-border, -fx-hover-base;
-    -fx-background-insets: 0, 0 1 0 1;
-}
-.split-pane:vertical > .split-pane-divider:hover {
-    -fx-background-color: -fx-box-border, -fx-hover-base;
-    -fx-background-insets: 0, 1 0 1 0;
-}
-.split-pane:horizontal > .split-pane-divider:pressed {
-    -fx-background-color: -fx-box-border, -fx-pressed-base;
-    -fx-background-insets: 0, 0 1 0 1;
-}
-.split-pane:vertical > .split-pane-divider:pressed {
-    -fx-background-color: -fx-box-border, -fx-pressed-base;
-    -fx-background-insets: 0, 1 0 1 0;
-}
-/*******************************************************************************
- *                                                                             *
- * ColorPicker                                                                 *
- *                                                                             *
- ******************************************************************************/
-.color-palette {
-    -fx-background-color: -fx-hover-base, -fx-base;
-}
-.color-palette > .color-picker-grid > .color-square:selected {
-    -fx-background-color: -fx-hover-base;
-}
-.custom-color-dialog > .color-rect-pane #color-rect-indicator,
-.custom-color-dialog > .color-rect-pane > .color-bar > #color-bar-indicator {
-    -fx-border-width: 2;
-}
-/*******************************************************************************
- *                                                                             *
- * Pagination                                                                  *
- *                                                                             *
- ******************************************************************************/
-.pagination > .pagination-control > .control-box > .number-button:selected {
-    -fx-background-color: transparent, -fx-hover-base, -fx-inner-border, -fx-body-color;
-}
-.pagination > .pagination-control > .control-box > .bullet-button:selected {
-    -fx-background-color: transparent, -fx-hover-base, -fx-inner-border, -fx-body-color;
-}
-/*******************************************************************************
- *                                                                             *
- * Table Cells                                                                 *
- *                                                                             *
- ******************************************************************************/
-.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: -fx-base, -fx-background;
-}
-.table-view > .virtual-flow > .clipped-container > .sheet > .table-row-cell:filled > .check-box-table-cell:selected > .check-box > .box,
-.tree-table-view > .virtual-flow > .clipped-container > .sheet > .tree-table-row-cell:filled > .check-box-table-cell:selected > .check-box > .box,
-.table-view > .virtual-flow > .clipped-container > .sheet > .table-row-cell:filled:selected > .check-box-table-cell > .check-box > .box,
-.tree-table-view > .virtual-flow > .clipped-container > .sheet > .tree-table-row-cell:filled:selected > .check-box-table-cell > .check-box > .box {
-    -fx-background-color: -fx-hover-base, -fx-background;
-}
-/*******************************************************************************
-*                                                                              *
-* TableView                                                                    *
-*                                                                              *
-*******************************************************************************/
-.table-view,
-.tree-table-view {
-    /* Constants used throughout the tableview */
-    -fx-table-cell-border-color: derive(-fx-base, -30%);
-}
-/*******************************************************************************
- *                                                                             *
- * Tooltip                                                                     *
- *                                                                             *
- ******************************************************************************/
-.tooltip {
-    -fx-background-color: -fx-hover-base, rgba(30, 30, 30, 0.8);
-    -fx-background-radius: 6px, 5px;
-    -fx-background-insets: 0, 1;
-    -fx-font-size: 1em;
-    -fx-font-weight: bold;
-}
-/*******************************************************************************
- *                                                                             *
- * Charts                                                                      *
- *                                                                             *
- ******************************************************************************/
-.chart-legend {
-    -fx-background-color: -fx-hover-base, -fx-base;
-    -fx-background-insets: 0, 1;
-    -fx-background-radius: 4, 3;
-}
-/*******************************************************************************
- *                                                                             *
- * Axis                                                                        *
- *                                                                             *
- ******************************************************************************/
-.axis {
-    AXIS_COLOR: -fx-dark-text-color;
-    -fx-tick-label-fill: -fx-hover-base;
-}
-/*******************************************************************************
-*                                                                              *
-* ChartPlot                                                                    *
-*                                                                              *
-*******************************************************************************/
-.chart-vertical-grid-lines,
-.chart-horizontal-grid-lines {
-    -fx-stroke: derive(-fx-base, -30%);
-}
-/*******************************************************************************
- *                                                                             *
- * ScatterChart, LineChart, AreaChart                                          *
- *                                                                             *
- ******************************************************************************/
-.default-color5.chart-symbol, /* hollow circle */
-.chart-line-symbol,
-.chart-area-symbol {
-    -fx-background-radius: 6px;
-    -fx-padding: 6px;
-}
-.chart-area-symbol {
-    -fx-background-color: #f9d900, black;
-    -fx-background-insets: 0, 2;
-}
-.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-width: 3px;
-}
-.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-background-insets: 0, 2;
-}
+/*
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*******************************************************************************
+ *                                                                             *
+ * "Black on White" contrast theme.                                            *
+ *                                                                             *
+ ******************************************************************************/
+
+.root {
+    -fx-base: white;
+    -fx-background: -fx-base;
+    -fx-control-inner-background: -fx-base;
+    -fx-control-inner-background-alt: -fx-base;
+    -fx-faint-focus-color: -fx-accent;
+    -fx-hover-base: black;
+    -fx-pressed-base: derive(-fx-base, -8%);
+    -fx-box-border: -fx-hover-base;
+    -fx-text-box-border: -fx-hover-base;
+    -fx-shadow-highlight-color: -fx-base;
+    -fx-outer-border: -fx-hover-base;
+    -fx-selection-bar-non-focused: -fx-pressed-base;
+}
+/*******************************************************************************
+ *                                                                             *
+ * Font Weight                                                                 *
+ *                                                                             *
+ ******************************************************************************/
+.text,
+.text-input {
+    -fx-font-weight: bold;
+}
+.axis {
+    -fx-tick-label-font-weight: bold;
+}
+/*******************************************************************************
+ *                                                                             *
+ * ToggleButton                                                                *
+ *                                                                             *
+ ******************************************************************************/
+.toggle-button:selected,
+.toggle-button:selected:focused {
+    -fx-mid-text-color: -fx-base;
+}
+.toggle-button:selected:armed,
+.toggle-button:selected:focused:armed {
+    -fx-mid-text-color: -fx-hover-base;
+}
+.toggle-button:selected {
+    -fx-background-color: -fx-shadow-highlight-color, -fx-hover-base, -fx-hover-base;
+}
+.toggle-button:selected:focused {
+    -fx-background-color: -fx-focus-color, -fx-hover-base, -fx-faint-focus-color, -fx-hover-base;
+}
+.toggle-button:selected:armed {
+    -fx-background-color: -fx-shadow-highlight-color, -fx-hover-base, -fx-faint-focus-color, -fx-pressed-base;
+}
+.toggle-button:selected:focused:armed {
+    -fx-background-color: -fx-focus-color, -fx-hover-base, -fx-faint-focus-color, -fx-pressed-base;
+}
+/*******************************************************************************
+ *                                                                             *
+ * Slider                                                                      *
+ *                                                                             *
+ ******************************************************************************/
+.slider .thumb {
+    -fx-background-color: -fx-hover-base, -fx-inner-border, -fx-body-color;
+}
+.slider:focused .thumb {
+    -fx-background-color: -fx-focus-color, -fx-inner-border, -fx-body-color, -fx-faint-focus-color, -fx-body-color;
+}
+/*******************************************************************************
+ *                                                                             *
+ * ScrollBar                                                                   *
+ *                                                                             *
+ ******************************************************************************/
+.scroll-bar > .increment-button,
+.scroll-bar > .decrement-button {
+    -fx-background-color: -fx-outer-border, -fx-base, -fx-base;
+}
+.scroll-bar > .increment-button:hover,
+.scroll-bar > .decrement-button:hover {
+    -fx-background-color: -fx-outer-border, -fx-hover-base, -fx-hover-base;
+}
+.scroll-bar > .increment-button:hover > .increment-arrow,
+.scroll-bar > .decrement-button:hover > .decrement-arrow {
+    -fx-background-color: -fx-base, -fx-base;
+}
+.scroll-bar > .increment-button:hover:pressed > .increment-arrow,
+.scroll-bar > .decrement-button:hover:pressed > .decrement-arrow {
+    -fx-background-color: -fx-hover-base, -fx-hover-base;
+}
+.scroll-bar > .increment-button > .increment-arrow,
+.scroll-bar > .decrement-button > .decrement-arrow {
+    -fx-background-color: -fx-hover-base, -fx-hover-base;
+}
+.scroll-bar > .increment-button:hover:pressed,
+.scroll-bar > .decrement-button:hover:pressed {
+    -fx-background-color: -fx-outer-border, -fx-pressed-base, -fx-pressed-base;
+}
+.scroll-bar:horizontal > .decrement-button > .decrement-arrow,
+.scroll-bar:horizontal > .increment-button > .increment-arrow,
+.scroll-bar:vertical > .decrement-button > .decrement-arrow,
+.scroll-bar:vertical > .increment-button > .increment-arrow {
+    -fx-effect: null;
+}
+.scroll-bar > .thumb:pressed {
+    -fx-background-color: -fx-outer-border, -fx-pressed-base, -fx-pressed-base;
+}
+/*******************************************************************************
+ *                                                                             *
+ * HTML Editor                                                                 *
+ *                                                                             *
+ ******************************************************************************/
+.html-editor-foreground,
+.html-editor-foreground:showing:hover {
+    -fx-graphic: url("HTMLEditor-Text-Color-Black.png");
+}
+.html-editor-background,
+.html-editor-background:showing:hover {
+    -fx-graphic: url("HTMLEditor-Background-Color-Black.png");
+}
+.html-editor-cut,
+.html-editor-cut:hover:armed {
+    -fx-graphic: url("HTMLEditor-Cut-Black.png");
+}
+.html-editor-copy,
+.html-editor-copy:hover:armed {
+    -fx-graphic: url("HTMLEditor-Copy-Black.png");
+}
+.html-editor-paste,
+.html-editor-paste:hover:armed {
+    -fx-graphic: url("HTMLEditor-Paste-Black.png");
+}
+.html-editor-align-left,
+.html-editor-align-left:hover:armed,
+.html-editor-align-left:selected:armed {
+    -fx-graphic: url("HTMLEditor-Left-Black.png");
+}
+.html-editor-align-center,
+.html-editor-align-center:hover:armed,
+.html-editor-align-center:selected:armed {
+    -fx-graphic: url("HTMLEditor-Center-Black.png");
+}
+.html-editor-align-right,
+.html-editor-align-right:hover:armed,
+.html-editor-align-right:selected:armed {
+    -fx-graphic: url("HTMLEditor-Right-Black.png");
+}
+.html-editor-align-justify,
+.html-editor-align-justify:hover:armed,
+.html-editor-align-justify:selected:armed {
+    -fx-graphic: url("HTMLEditor-Justify-Black.png");
+}
+.html-editor-outdent,
+.html-editor-outdent:hover:armed {
+    -fx-graphic: url("HTMLEditor-Outdent-Black.png");
+}
+.html-editor-outdent:dir(rtl),
+.html-editor-outdent:hover:armed:dir(rtl) {
+    -fx-graphic: url("HTMLEditor-Outdent-Black-rtl.png");
+}
+.html-editor-indent,
+.html-editor-indent:hover:armed {
+    -fx-graphic: url("HTMLEditor-Indent-Black.png");
+}
+.html-editor-indent:dir(rtl),
+.html-editor-indent:hover:armed:dir(rtl) {
+    -fx-graphic: url("HTMLEditor-Indent-Black-rtl.png");
+}
+.html-editor-bullets,
+.html-editor-bullets:hover:armed,
+.html-editor-bullets:selected:armed {
+    -fx-graphic: url("HTMLEditor-Bullets-Black.png");
+}
+.html-editor-bullets:dir(rtl),
+.html-editor-bullets:hover:armed:dir(rtl),
+.html-editor-bullets:selected:armed:dir(rtl) {
+    -fx-graphic: url("HTMLEditor-Bullets-Black-rtl.png");
+}
+.html-editor-numbers,
+.html-editor-numbers:hover:armed,
+.html-editor-numbers:selected:armed {
+    -fx-graphic: url("HTMLEditor-Numbered-Black.png");
+}
+.html-editor-numbers:dir(rtl),
+.html-editor-numbers:hover:armed:dir(rtl),
+.html-editor-numbers:selected:armed:dir(rtl) {
+    -fx-graphic: url("HTMLEditor-Numbered-Black-rtl.png");
+}
+.html-editor-bold,
+.html-editor-bold:hover:armed,
+.html-editor-bold:selected:armed {
+    -fx-graphic: url("HTMLEditor-Bold-Black.png");
+}
+.html-editor-italic,
+.html-editor-italic:hover:armed,
+.html-editor-italic:selected:armed {
+    -fx-graphic: url("HTMLEditor-Italic-Black.png");
+}
+.html-editor-underline,
+.html-editor-underline:hover:armed,
+.html-editor-underline:selected:armed {
+    -fx-graphic: url("HTMLEditor-Underline-Black.png");
+}
+.html-editor-strike,
+.html-editor-strike:hover:armed,
+.html-editor-strike:selected:armed {
+    -fx-graphic: url("HTMLEditor-Strikethrough-Black.png");
+}
+.html-editor-hr,
+.html-editor-hr:hover:armed {
+    -fx-graphic: url("HTMLEditor-Break-Black.png");
+}
+.html-editor-foreground:hover {
+    -fx-graphic: url("HTMLEditor-Text-Color-White.png");
+}
+.html-editor-background:hover {
+    -fx-graphic: url("HTMLEditor-Background-Color-White.png");
+}
+.html-editor-cut:hover,
+.html-editor-cut:armed {
+    -fx-graphic: url("HTMLEditor-Cut-White.png");
+}
+.html-editor-copy:hover,
+.html-editor-copy:armed {
+    -fx-graphic: url("HTMLEditor-Copy-White.png");
+}
+.html-editor-paste:hover,
+.html-editor-paste:armed {
+    -fx-graphic: url("HTMLEditor-Paste-White.png");
+}
+.html-editor-align-left:hover,
+.html-editor-align-left:selected {
+    -fx-graphic: url("HTMLEditor-Left-White.png");
+}
+.html-editor-align-center:hover,
+.html-editor-align-center:selected {
+    -fx-graphic: url("HTMLEditor-Center-White.png");
+}
+.html-editor-align-right:hover,
+.html-editor-align-right:selected {
+    -fx-graphic: url("HTMLEditor-Right-White.png");
+}
+.html-editor-align-justify:hover,
+.html-editor-align-justify:selected {
+    -fx-graphic: url("HTMLEditor-Justify-White.png");
+}
+.html-editor-outdent:hover,
+.html-editor-outdent:armed {
+    -fx-graphic: url("HTMLEditor-Outdent-White.png");
+}
+.html-editor-indent:hover,
+.html-editor-indent:armed {
+    -fx-graphic: url("HTMLEditor-Indent-White.png");
+}
+.html-editor-bullets:hover,
+.html-editor-bullets:selected {
+    -fx-graphic: url("HTMLEditor-Bullets-White.png");
+}
+.html-editor-numbers:hover,
+.html-editor-numbers:selected {
+    -fx-graphic: url("HTMLEditor-Numbered-White.png");
+}
+.html-editor-bold:hover,
+.html-editor-bold:selected {
+    -fx-graphic: url("HTMLEditor-Bold-White.png");
+}
+.html-editor-italic:hover,
+.html-editor-italic:selected {
+    -fx-graphic: url("HTMLEditor-Italic-White.png");
+}
+.html-editor-underline:hover,
+.html-editor-underline:selected {
+    -fx-graphic: url("HTMLEditor-Underline-White.png");
+}
+.html-editor-strike:hover,
+.html-editor-strike:selected {
+    -fx-graphic: url("HTMLEditor-Strikethrough-White.png");
+}
+.html-editor-hr:hover,
+.html-editor-hr:armed {
+    -fx-graphic: url("HTMLEditor-Break-White.png");
+}
+/*******************************************************************************
+ *                                                                             *
+ * PopupMenu                                                                   *
+ *                                                                             *
+ ******************************************************************************/
+.context-menu {
+    -fx-background-color: -fx-hover-base, -fx-control-inner-background;
+    -fx-text-fill: red;
+}
+.context-menu > .scroll-arrow > .menu-up-arrow,
+.context-menu > .scroll-arrow > .menu-down-arrow {
+    -fx-background-color: -fx-hover-base;
+}
+.context-menu > .scroll-arrow:hover > .menu-up-arrow,
+.context-menu > .scroll-arrow:hover > .menu-down-arrow {
+    -fx-background-color: -fx-base;
+}
+/*******************************************************************************
+ *                                                                             *
+ * MenuBar                                                                     *
+ *                                                                             *
+ ******************************************************************************/
+.menu-bar {
+    -fx-background-color: -fx-hover-base, -fx-base;
+    -fx-background-insets: 1 1 0 1, 1;
+}
+/*******************************************************************************
+ *                                                                             *
+ * Menu                                                                        *
+ *                                                                             *
+ ******************************************************************************/
+.menu-up-arrow, .menu-down-arrow {
+    -fx-effect: null;
+}
+/*******************************************************************************
+ *                                                                             *
+ * TabPane                                                                     *
+ *                                                                             *
+ ******************************************************************************/
+.tab-header-area {
+    -fx-text-box-border: -fx-base;
+}
+.tab-pane > .tab-header-area > .headers-region > .tab:selected:hover {
+    -fx-background-color: -fx-hover-base;
+}
+.tab-pane:focused > .tab-header-area > .headers-region > .tab:selected .focus-indicator {
+    -fx-border-width: 4;
+    -fx-border-color: -fx-focus-color;
+    -fx-border-insets: -4 -4 -7 -5;
+    -fx-border-radius: 1;
+}
+.tab-pane:focused > .tab-header-area > .headers-region > .tab:bottom:selected .focus-indicator {
+    -fx-border-insets: -7 -5 -4 -4;
+}
+.tab-pane:bottom > .tab-header-area > .tab-header-background,
+.tab-pane:left > .tab-header-area > .tab-header-background,
+.tab-pane:right > .tab-header-area > .tab-header-background {
+    -fx-background-insets: 0, 0 0 1 0, 1;
+}
+/*******************************************************************************
+ *                                                                             *
+ * ComboBox                                                                    *
+ *                                                                             *
+ ******************************************************************************/
+.combo-box-popup > .list-view {
+    -fx-background-color: -fx-outer-border, -fx-control-inner-background;
+}
+.combo-box-popup > .list-view > .virtual-flow > .clipped-container > .sheet > .list-cell:filled:selected:hover {
+    -fx-text-fill: -fx-base;
+}
+/*******************************************************************************
+ *                                                                             *
+ * TitledPane                                                                  *
+ *                                                                             *
+ ******************************************************************************/
+.titled-pane > .title {
+    -fx-background-color: -fx-outer-border, -fx-inner-border, -fx-body-color;
+}
+.titled-pane:focused > .title {
+    -fx-background-color: -fx-faint-focus-color, -fx-focus-color, -fx-body-color;
+    -fx-background-insets: 0, 1, 4;
+}
+.titled-pane > .title:hover {
+    -fx-color: -fx-pressed-base;
+}
+.titled-pane > .title > .arrow-button > .arrow,
+.titled-pane:focused > .title > .arrow-button > .arrow {
+    -fx-background-color: -fx-mark-color;
+    -fx-background-insets: 0;
+    -fx-effect: null;
+}
+.titled-pane > .title:hover > .arrow-button > .arrow {
+    -fx-background-color: -fx-hover-base;
+    -fx-background-insets: 0;
+}
+/*******************************************************************************
+ *                                                                             *
+ * SplitPane                                                                   *
+ *                                                                             *
+ ******************************************************************************/
+.split-pane:horizontal > .split-pane-divider:hover {
+    -fx-background-color: -fx-box-border, -fx-hover-base;
+    -fx-background-insets: 0, 0 1 0 1;
+}
+.split-pane:vertical > .split-pane-divider:hover {
+    -fx-background-color: -fx-box-border, -fx-hover-base;
+    -fx-background-insets: 0, 1 0 1 0;
+}
+.split-pane:horizontal > .split-pane-divider:pressed {
+    -fx-background-color: -fx-box-border, -fx-pressed-base;
+    -fx-background-insets: 0, 0 1 0 1;
+}
+.split-pane:vertical > .split-pane-divider:pressed {
+    -fx-background-color: -fx-box-border, -fx-pressed-base;
+    -fx-background-insets: 0, 1 0 1 0;
+}
+/*******************************************************************************
+ *                                                                             *
+ * ColorPicker                                                                 *
+ *                                                                             *
+ ******************************************************************************/
+.color-palette {
+    -fx-background-color: -fx-hover-base, -fx-base;
+}
+.color-palette > .color-picker-grid > .color-square:selected {
+    -fx-background-color: -fx-hover-base;
+}
+.custom-color-dialog > .color-rect-pane #color-rect-indicator,
+.custom-color-dialog > .color-rect-pane > .color-bar > #color-bar-indicator {
+    -fx-border-width: 2;
+}
+/*******************************************************************************
+ *                                                                             *
+ * Pagination                                                                  *
+ *                                                                             *
+ ******************************************************************************/
+.pagination > .pagination-control > .control-box > .number-button:selected {
+    -fx-background-color: transparent, -fx-hover-base, -fx-inner-border, -fx-body-color;
+}
+.pagination > .pagination-control > .control-box > .bullet-button:selected {
+    -fx-background-color: transparent, -fx-hover-base, -fx-inner-border, -fx-body-color;
+}
+/*******************************************************************************
+ *                                                                             *
+ * Table Cells                                                                 *
+ *                                                                             *
+ ******************************************************************************/
+.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: -fx-base, -fx-background;
+}
+.table-view > .virtual-flow > .clipped-container > .sheet > .table-row-cell:filled > .check-box-table-cell:selected > .check-box > .box,
+.tree-table-view > .virtual-flow > .clipped-container > .sheet > .tree-table-row-cell:filled > .check-box-table-cell:selected > .check-box > .box,
+.table-view > .virtual-flow > .clipped-container > .sheet > .table-row-cell:filled:selected > .check-box-table-cell > .check-box > .box,
+.tree-table-view > .virtual-flow > .clipped-container > .sheet > .tree-table-row-cell:filled:selected > .check-box-table-cell > .check-box > .box {
+    -fx-background-color: -fx-hover-base, -fx-background;
+}
+/*******************************************************************************
+*                                                                              *
+* TableView                                                                    *
+*                                                                              *
+*******************************************************************************/
+.table-view,
+.tree-table-view {
+    /* Constants used throughout the tableview */
+    -fx-table-cell-border-color: derive(-fx-base, -30%);
+}
+/*******************************************************************************
+ *                                                                             *
+ * Tooltip                                                                     *
+ *                                                                             *
+ ******************************************************************************/
+.tooltip {
+    -fx-background-color: -fx-hover-base, rgba(30, 30, 30, 0.8);
+    -fx-background-radius: 6px, 5px;
+    -fx-background-insets: 0, 1;
+    -fx-font-size: 1em;
+    -fx-font-weight: bold;
+}
+/*******************************************************************************
+ *                                                                             *
+ * Charts                                                                      *
+ *                                                                             *
+ ******************************************************************************/
+.chart-legend {
+    -fx-background-color: -fx-hover-base, -fx-base;
+    -fx-background-insets: 0, 1;
+    -fx-background-radius: 4, 3;
+}
+/*******************************************************************************
+ *                                                                             *
+ * Axis                                                                        *
+ *                                                                             *
+ ******************************************************************************/
+.axis {
+    AXIS_COLOR: -fx-dark-text-color;
+    -fx-tick-label-fill: -fx-hover-base;
+}
+/*******************************************************************************
+*                                                                              *
+* ChartPlot                                                                    *
+*                                                                              *
+*******************************************************************************/
+.chart-vertical-grid-lines,
+.chart-horizontal-grid-lines {
+    -fx-stroke: derive(-fx-base, -30%);
+}
+/*******************************************************************************
+ *                                                                             *
+ * ScatterChart, LineChart, AreaChart                                          *
+ *                                                                             *
+ ******************************************************************************/
+.default-color5.chart-symbol, /* hollow circle */
+.chart-line-symbol,
+.chart-area-symbol {
+    -fx-background-radius: 6px;
+    -fx-padding: 6px;
+}
+.chart-area-symbol {
+    -fx-background-color: #f9d900, black;
+    -fx-background-insets: 0, 2;
+}
+.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-width: 3px;
+}
+.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-background-insets: 0, 2;
+}
--- a/modules/controls/src/main/resources/com/sun/javafx/scene/control/skin/modena/modena-embedded-performance.css	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/controls/src/main/resources/com/sun/javafx/scene/control/skin/modena/modena-embedded-performance.css	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -17,6 +17,7 @@
  * You should have received a copy of the GNU General Public License version
  * 2 along with this work; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
  * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  * or visit www.oracle.com if you need additional information or have any
  * questions.
@@ -42,4 +43,4 @@
 .custom-color-dialog > .color-rect-pane > .color-bar > #color-bar-indicator,
 .tooltip {
     -fx-effect: null;
-}
\ No newline at end of file
+}
--- a/modules/controls/src/main/resources/com/sun/javafx/scene/control/skin/modena/modena-no-transparency.css	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/controls/src/main/resources/com/sun/javafx/scene/control/skin/modena/modena-no-transparency.css	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,10 +21,8 @@
  * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  * or visit www.oracle.com if you need additional information or have any
  * questions.
- *
  */
 
-
 /*******************************************************************************
  *                                                                             *
  * PopupMenu                                                                   *
@@ -76,4 +74,4 @@
 .date-picker-popup {
     -fx-background-radius: 0;
     -fx-effect: null;
-}
\ No newline at end of file
+}
--- a/modules/controls/src/main/resources/com/sun/javafx/scene/control/skin/modena/modena.css	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/controls/src/main/resources/com/sun/javafx/scene/control/skin/modena/modena.css	Fri Jun 26 17:36:59 2015 -0700
@@ -1,33 +1,32 @@
 /*
-    Modena
-    
-    This is the second generation theme for JavaFX after Caspian.
-*/
+ * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
 
 /*
- * Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 
- *  
- * This code is free software; you can redistribute it and/or modify it 
- * under the terms of the GNU General Public License version 2 only, as 
- * published by the Free Software Foundation.  Oracle designates this 
- * particular file as subject to the "Classpath" exception as provided 
- * by Oracle in the LICENSE file that accompanied this code. 
- *  
- * This code is distributed in the hope that it will be useful, but WITHOUT 
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License 
- * version 2 for more details (a copy is included in the LICENSE file that 
- * accompanied this code). 
- *  
- * You should have received a copy of the GNU General Public License version 
- * 2 along with this work; if not, write to the Free Software Foundation, 
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 
- *  
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 
- * or visit www.oracle.com if you need additional information or have any 
- * questions.
- *                                                                              
+ *  Modena
+ *
+ *  This is the second generation theme for JavaFX after Caspian.
  */
 
 /*******************************************************************************
--- a/modules/controls/src/main/resources/com/sun/javafx/scene/control/skin/modena/touch.css	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/controls/src/main/resources/com/sun/javafx/scene/control/skin/modena/touch.css	Fri Jun 26 17:36:59 2015 -0700
@@ -1,27 +1,26 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved. 
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 
- *  
- * This code is free software; you can redistribute it and/or modify it 
- * under the terms of the GNU General Public License version 2 only, as 
- * published by the Free Software Foundation.  Oracle designates this 
- * particular file as subject to the "Classpath" exception as provided 
- * by Oracle in the LICENSE file that accompanied this code. 
- *  
- * This code is distributed in the hope that it will be useful, but WITHOUT 
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License 
- * version 2 for more details (a copy is included in the LICENSE file that 
- * accompanied this code). 
- *  
- * You should have received a copy of the GNU General Public License version 
- * 2 along with this work; if not, write to the Free Software Foundation, 
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 
- *  
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 
- * or visit www.oracle.com if you need additional information or have any 
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
  * questions.
- *                                                                              
  */
 
 /*******************************************************************************
@@ -90,7 +89,7 @@
 
 /*******************************************************************************
  *                                                                             *
- * ListView, TreeView, TableView, TreeTableView, ScrollPane, TextArea		   *
+ * ListView, TreeView, TableView, TreeTableView, ScrollPane, TextArea          *
  *                                                                             *
  ******************************************************************************/
 .list-view > .virtual-flow > .corner,
@@ -98,7 +97,7 @@
 .table-view > .virtual-flow > .corner,
 .tree-table-view > .virtual-flow > .corner,
 .scroll-pane > .corner {
-	-fx-opacity: 50%;
+    -fx-opacity: 50%;
     -fx-background-color: derive(-fx-base,5%);
 }
 .list-view > .virtual-flow > .corner,
--- a/modules/controls/src/main/resources/com/sun/javafx/scene/control/skin/modena/two-level-focus.css	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/controls/src/main/resources/com/sun/javafx/scene/control/skin/modena/two-level-focus.css	Fri Jun 26 17:36:59 2015 -0700
@@ -1,149 +1,149 @@
-/*
- * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/*******************************************************************************
- *																			   *
- * 2-level focus setting for Modena											   *
- *																			   *
- ******************************************************************************/
-
-/*******************************************************************************
- *																			   *
- * ChoiceBox																   *
- *																			   *
- ******************************************************************************/
-.choice-box:showing:external-focus {
-    -fx-background-color: -fx-shadow-highlight-color, -fx-outer-border, -fx-inner-border, -fx-body-color;
-    -fx-background-insets: 0 0 -1 0, 0, 1, 2;
-    -fx-background-radius: 3px, 3px, 2px, 1px;
-}
-/*******************************************************************************
- *																			   *
- * TextField																   *
- *																			   *
- ******************************************************************************/
-.text-input:focused:internal-focus {
-    -fx-highlight-fill: -fx-accent;
-    -fx-highlight-text-fill: white;
-    -fx-prompt-text-fill: transparent;
-    -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);
-}
-.text-input:focused:external-focus {
-    /*-fx-text-fill: -fx-text-inner-color;*/
-    -fx-highlight-fill: -fx-control-inner-background;
-    -fx-highlight-text-fill: -fx-text-inner-color;
-    -fx-prompt-text-fill: derive(-fx-control-inner-background,-30%);
-    -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);
-}
-/*******************************************************************************
- *																			   *
- * TextArea																	   *
- *																			   *
- ******************************************************************************/
-.text-area:focused:internal-focus .content {
-    -fx-background-color:
-        linear-gradient(from 0px 0px to 0px 4px, derive(-fx-control-inner-background, -8%), -fx-control-inner-background);
-}
-/*******************************************************************************
- *																			   *
- * Slider																	   *
- *																			   *
- ******************************************************************************/
-.slider {
-    -fx-padding: 5;
-}
-.slider:focused:external-focus {
-    -fx-background-color: -fx-focus-color, -fx-control-inner-background, -fx-faint-focus-color, -fx-control-inner-background;
-    -fx-background-insets: -0.2, 1, -1.4, 2;
-    -fx-background-radius: 3, 2, 4, 2;
-}
-.slider:focused:internal-focus {
-    -fx-background-color: transparent;
-}
-.slider:focused:external-focus .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;
-}
-/*******************************************************************************
- *																			   *
- * ListView, TableView														   *
- *																			   *
- ******************************************************************************/
-.list-view:focused:external-focus > .virtual-flow > .clipped-container > .sheet > .list-cell:filled:selected,
-.table-view:focused:external-focus > .virtual-flow > .clipped-container > .sheet > .table-row-cell:filled:selected,
-.table-view:focused:external-focus > .virtual-flow > .clipped-container > .sheet > .table-row-cell > .table-cell:selected {
-    -fx-background: -fx-selection-bar-non-focused;
-    -fx-table-cell-border-color: derive(-fx-selection-bar-non-focused, 20%);
-    -fx-cell-focus-inner-border: derive(-fx-selection-bar-non-focused, 20%);
-}
-
-.list-view:focused:internal-focus,
-.table-view:focused:internal-focus {
-    -fx-background-color: -fx-box-border, -fx-control-inner-background;
-    -fx-background-insets: 0, 1;
-}
-/*******************************************************************************
- *																			   *
- * ComboBox																	   *
- *																			   *
- ******************************************************************************/
-.combo-box-base:focused:showing:external-focus,
-.combo-box-base:editable:focused:showing:external-focus > .arrow-button {
-    -fx-background-color: -fx-shadow-highlight-color, -fx-outer-border, -fx-inner-border, -fx-body-color;
-    -fx-background-insets: 0 0 -1 0, 0, 1, 2;
-    -fx-background-radius: 3px, 3px, 2px, 1px;
-}
-.combo-box-base:editable:focused:internal-focus > .text-field,
-.combo-box-base:editable:focused:showing:external-focus > .text-field:focused {
-    -fx-background-color: -fx-control-inner-background;
-    -fx-background-insets: 1 0 1 1;
-    -fx-background-radius: 2 0 0 2;
-    -fx-prompt-text-fill: transparent;
-}
-.combo-box-base:editable:focused:showing:external-focus > .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;
-}
-.combo-box-popup > .list-view > .virtual-flow > .clipped-container > .sheet > .list-cell:filled:selected {
-    -fx-background: -fx-accent;
-    -fx-background-color: -fx-selection-bar !important;
-}
-.combo-box-base:editable:focused:external-focus > .text-field,
-.combo-box-base:editable:external-focus > .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-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;
-}
+/*
+ * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*******************************************************************************
+ *                                                                             *
+ * 2-level focus setting for Modena                                            *
+ *                                                                             *
+ ******************************************************************************/
+
+/*******************************************************************************
+ *                                                                             *
+ * ChoiceBox                                                                   *
+ *                                                                             *
+ ******************************************************************************/
+.choice-box:showing:external-focus {
+    -fx-background-color: -fx-shadow-highlight-color, -fx-outer-border, -fx-inner-border, -fx-body-color;
+    -fx-background-insets: 0 0 -1 0, 0, 1, 2;
+    -fx-background-radius: 3px, 3px, 2px, 1px;
+}
+/*******************************************************************************
+ *                                                                             *
+ * TextField                                                                   *
+ *                                                                             *
+ ******************************************************************************/
+.text-input:focused:internal-focus {
+    -fx-highlight-fill: -fx-accent;
+    -fx-highlight-text-fill: white;
+    -fx-prompt-text-fill: transparent;
+    -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);
+}
+.text-input:focused:external-focus {
+    /*-fx-text-fill: -fx-text-inner-color;*/
+    -fx-highlight-fill: -fx-control-inner-background;
+    -fx-highlight-text-fill: -fx-text-inner-color;
+    -fx-prompt-text-fill: derive(-fx-control-inner-background,-30%);
+    -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);
+}
+/*******************************************************************************
+ *                                                                             *
+ * TextArea                                                                    *
+ *                                                                             *
+ ******************************************************************************/
+.text-area:focused:internal-focus .content {
+    -fx-background-color:
+        linear-gradient(from 0px 0px to 0px 4px, derive(-fx-control-inner-background, -8%), -fx-control-inner-background);
+}
+/*******************************************************************************
+ *                                                                             *
+ * Slider                                                                      *
+ *                                                                             *
+ ******************************************************************************/
+.slider {
+    -fx-padding: 5;
+}
+.slider:focused:external-focus {
+    -fx-background-color: -fx-focus-color, -fx-control-inner-background, -fx-faint-focus-color, -fx-control-inner-background;
+    -fx-background-insets: -0.2, 1, -1.4, 2;
+    -fx-background-radius: 3, 2, 4, 2;
+}
+.slider:focused:internal-focus {
+    -fx-background-color: transparent;
+}
+.slider:focused:external-focus .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;
+}
+/*******************************************************************************
+ *                                                                             *
+ * ListView, TableView                                                         *
+ *                                                                             *
+ ******************************************************************************/
+.list-view:focused:external-focus > .virtual-flow > .clipped-container > .sheet > .list-cell:filled:selected,
+.table-view:focused:external-focus > .virtual-flow > .clipped-container > .sheet > .table-row-cell:filled:selected,
+.table-view:focused:external-focus > .virtual-flow > .clipped-container > .sheet > .table-row-cell > .table-cell:selected {
+    -fx-background: -fx-selection-bar-non-focused;
+    -fx-table-cell-border-color: derive(-fx-selection-bar-non-focused, 20%);
+    -fx-cell-focus-inner-border: derive(-fx-selection-bar-non-focused, 20%);
+}
+
+.list-view:focused:internal-focus,
+.table-view:focused:internal-focus {
+    -fx-background-color: -fx-box-border, -fx-control-inner-background;
+    -fx-background-insets: 0, 1;
+}
+/*******************************************************************************
+ *                                                                             *
+ * ComboBox                                                                    *
+ *                                                                             *
+ ******************************************************************************/
+.combo-box-base:focused:showing:external-focus,
+.combo-box-base:editable:focused:showing:external-focus > .arrow-button {
+    -fx-background-color: -fx-shadow-highlight-color, -fx-outer-border, -fx-inner-border, -fx-body-color;
+    -fx-background-insets: 0 0 -1 0, 0, 1, 2;
+    -fx-background-radius: 3px, 3px, 2px, 1px;
+}
+.combo-box-base:editable:focused:internal-focus > .text-field,
+.combo-box-base:editable:focused:showing:external-focus > .text-field:focused {
+    -fx-background-color: -fx-control-inner-background;
+    -fx-background-insets: 1 0 1 1;
+    -fx-background-radius: 2 0 0 2;
+    -fx-prompt-text-fill: transparent;
+}
+.combo-box-base:editable:focused:showing:external-focus > .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;
+}
+.combo-box-popup > .list-view > .virtual-flow > .clipped-container > .sheet > .list-cell:filled:selected {
+    -fx-background: -fx-accent;
+    -fx-background-color: -fx-selection-bar !important;
+}
+.combo-box-base:editable:focused:external-focus > .text-field,
+.combo-box-base:editable:external-focus > .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-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;
+}
--- a/modules/controls/src/main/resources/com/sun/javafx/scene/control/skin/modena/whiteOnBlack.css	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/controls/src/main/resources/com/sun/javafx/scene/control/skin/modena/whiteOnBlack.css	Fri Jun 26 17:36:59 2015 -0700
@@ -1,501 +1,526 @@
-/*******************************************************************************
- *                                                                             *
- * "White on Black" contrast theme.                                            *
- *                                                                             *
- ******************************************************************************/
-
-.root {
-    -fx-base: black;
-    -fx-background: -fx-base;
-    -fx-control-inner-background: -fx-base;
-    -fx-control-inner-background-alt: -fx-base;
-    -fx-faint-focus-color: -fx-accent;
-    -fx-hover-base: white;
-    -fx-pressed-base: derive(-fx-hover-base, -15%);
-    -fx-box-border: -fx-hover-base;
-    -fx-text-box-border: -fx-hover-base;
-    -fx-shadow-highlight-color: -fx-base;
-    -fx-outer-border: -fx-hover-base;
-}
-/*******************************************************************************
- *                                                                             *
- * Font Weight                                                                 *
- *                                                                             *
- ******************************************************************************/
-.text,
-.text-input {
-    -fx-font-weight: bold;
-}
-.axis {
-    -fx-tick-label-font-weight: bold;
-}
-/*******************************************************************************
- *                                                                             *
- * ToggleButton                                                                *
- *                                                                             *
- ******************************************************************************/
-.toggle-button:selected,
-.toggle-button:selected:focused {
-    -fx-light-text-color: -fx-base;
-}
-.toggle-button:selected {
-    -fx-background-color: -fx-shadow-highlight-color, -fx-hover-base, -fx-hover-base;
-}
-.toggle-button:selected:focused {
-    -fx-background-color: -fx-focus-color, -fx-hover-base, -fx-faint-focus-color, -fx-hover-base;
-}
-.toggle-button:selected:armed {
-    -fx-background-color: -fx-shadow-highlight-color, -fx-hover-base, -fx-faint-focus-color, -fx-pressed-base;
-}
-.toggle-button:selected:focused:armed {
-    -fx-background-color: -fx-focus-color, -fx-hover-base, -fx-faint-focus-color, -fx-pressed-base;
-}
-/*******************************************************************************
- *                                                                             *
- * Slider                                                                      *
- *                                                                             *
- ******************************************************************************/
-.slider .thumb {
-    -fx-background-color: -fx-hover-base, -fx-hover-base, -fx-body-color;
-}
-.slider:focused .thumb {
-    -fx-background-color: -fx-focus-color, -fx-hover-base, -fx-body-color, -fx-faint-focus-color, -fx-body-color;
-}
-/*******************************************************************************
- *                                                                             *
- * ScrollBar                                                                   *
- *                                                                             *
- ******************************************************************************/
-.scroll-bar > .increment-button,
-.scroll-bar > .decrement-button {
-    -fx-background-color: -fx-outer-border, -fx-base, -fx-base;
-}
-.scroll-bar > .increment-button:hover,
-.scroll-bar > .decrement-button:hover {
-    -fx-background-color: -fx-outer-border, -fx-hover-base, -fx-hover-base;
-}
-.scroll-bar > .increment-button:hover > .increment-arrow,
-.scroll-bar > .decrement-button:hover > .decrement-arrow,
-.scroll-bar > .increment-button:hover:pressed > .increment-arrow,
-.scroll-bar > .decrement-button:hover:pressed > .decrement-arrow {
-    -fx-background-color: -fx-base, -fx-base;
-}
-.scroll-bar > .increment-button > .increment-arrow,
-.scroll-bar > .decrement-button > .decrement-arrow {
-    -fx-background-color: -fx-hover-base, -fx-hover-base;
-}
-.scroll-bar > .increment-button:hover:pressed,
-.scroll-bar > .decrement-button:hover:pressed {
-    -fx-background-color: -fx-outer-border, -fx-pressed-base, -fx-pressed-base;
-}
-.scroll-bar:horizontal > .decrement-button > .decrement-arrow,
-.scroll-bar:horizontal > .increment-button > .increment-arrow,
-.scroll-bar:vertical > .decrement-button > .decrement-arrow,
-.scroll-bar:vertical > .increment-button > .increment-arrow {
-    -fx-effect: null;
-}
-.scroll-bar > .thumb:pressed {
-    -fx-background-color: -fx-outer-border, -fx-pressed-base, -fx-pressed-base;
-}
-/*******************************************************************************
- *                                                                             *
- * HTML Editor                                                                 *
- *                                                                             *
- ******************************************************************************/
-.html-editor-foreground{
-    -fx-graphic: url("HTMLEditor-Text-Color-White.png");
-}
-.html-editor-background {
-    -fx-graphic: url("HTMLEditor-Background-Color-White.png");
-}
-.html-editor-cut {
-    -fx-graphic: url("HTMLEditor-Cut-White.png");
-}
-.html-editor-copy {
-    -fx-graphic: url("HTMLEditor-Copy-White.png");
-}
-.html-editor-paste {
-    -fx-graphic: url("HTMLEditor-Paste-White.png");
-}
-.html-editor-align-left {
-    -fx-graphic: url("HTMLEditor-Left-White.png");
-}
-.html-editor-align-center {
-    -fx-graphic: url("HTMLEditor-Center-White.png");
-}
-.html-editor-align-right {
-    -fx-graphic: url("HTMLEditor-Right-White.png");
-}
-.html-editor-align-justify {
-    -fx-graphic: url("HTMLEditor-Justify-White.png");
-}
-.html-editor-outdent {
-    -fx-graphic: url("HTMLEditor-Outdent-White.png");
-}
-.html-editor-outdent:dir(rtl) {
-    -fx-graphic: url("HTMLEditor-Outdent-White-rtl.png");
-}
-.html-editor-indent {
-    -fx-graphic: url("HTMLEditor-Indent-White.png");
-}
-.html-editor-indent:dir(rtl) {
-    -fx-graphic: url("HTMLEditor-Indent-White-rtl.png");
-}
-.html-editor-bullets {
-    -fx-graphic: url("HTMLEditor-Bullets-White.png");
-}
-.html-editor-bullets:dir(rtl) {
-    -fx-graphic: url("HTMLEditor-Bullets-White-rtl.png");
-}
-.html-editor-numbers {
-    -fx-graphic: url("HTMLEditor-Numbered-White.png");
-}
-.html-editor-numbers:dir(rtl) {
-    -fx-graphic: url("HTMLEditor-Numbered-White-rtl.png");
-}
-.html-editor-bold {
-    -fx-graphic: url("HTMLEditor-Bold-White.png");
-}
-.html-editor-italic {
-    -fx-graphic: url("HTMLEditor-Italic-White.png");
-}
-.html-editor-underline {
-    -fx-graphic: url("HTMLEditor-Underline-White.png");
-}
-.html-editor-strike {
-    -fx-graphic: url("HTMLEditor-Strikethrough-White.png");
-}
-.html-editor-hr {
-    -fx-graphic: url("HTMLEditor-Break-White.png");
-}
-.html-editor-foreground:hover,
-.html-editor-foreground:showing {
-    -fx-graphic: url("HTMLEditor-Text-Color-Black.png");
-}
-.html-editor-background:hover,
-.html-editor-background:showing {
-    -fx-graphic: url("HTMLEditor-Background-Color-Black.png");
-}
-.html-editor-cut:hover,
-.html-editor-cut:selected {
-    -fx-graphic: url("HTMLEditor-Cut-Black.png");
-}
-.html-editor-copy:hover,
-.html-editor-copy:selected {
-    -fx-graphic: url("HTMLEditor-Copy-Black.png");
-}
-.html-editor-paste:hover,
-.html-editor-paste:selected {
-    -fx-graphic: url("HTMLEditor-Paste-Black.png");
-}
-.html-editor-align-left:hover,
-.html-editor-align-left:selected {
-    -fx-graphic: url("HTMLEditor-Left-Black.png");
-}
-.html-editor-align-center:hover,
-.html-editor-align-center:selected {
-    -fx-graphic: url("HTMLEditor-Center-Black.png");
-}
-.html-editor-align-right:hover,
-.html-editor-align-right:selected {
-    -fx-graphic: url("HTMLEditor-Right-Black.png");
-}
-.html-editor-align-justify:hover,
-.html-editor-align-justify:selected {
-    -fx-graphic: url("HTMLEditor-Justify-Black.png");
-}
-.html-editor-outdent:hover,
-.html-editor-outdent:armed {
-    -fx-graphic: url("HTMLEditor-Outdent-Black.png");
-}
-.html-editor-indent:hover,
-.html-editor-indent:armed {
-    -fx-graphic: url("HTMLEditor-Indent-Black.png");
-}
-.html-editor-bullets:hover,
-.html-editor-bullets:selected {
-    -fx-graphic: url("HTMLEditor-Bullets-Black.png");
-}
-.html-editor-numbers:hover,
-.html-editor-numbers:selected {
-    -fx-graphic: url("HTMLEditor-Numbered-Black.png");
-}
-.html-editor-bold:hover,
-.html-editor-bold:selected {
-    -fx-graphic: url("HTMLEditor-Bold-Black.png");
-}
-.html-editor-italic:hover,
-.html-editor-italic:selected {
-    -fx-graphic: url("HTMLEditor-Italic-Black.png");
-}
-.html-editor-underline:hover,
-.html-editor-underline:selected {
-    -fx-graphic: url("HTMLEditor-Underline-Black.png");
-}
-.html-editor-strike:hover,
-.html-editor-strike:selected {
-    -fx-graphic: url("HTMLEditor-Strikethrough-Black.png");
-}
-.html-editor-hr:hover,
-.html-editor-hr:armed {
-    -fx-graphic: url("HTMLEditor-Break-Black.png");
-}
-/*******************************************************************************
- *                                                                             *
- * PopupMenu                                                                   *
- *                                                                             *
- ******************************************************************************/
-.context-menu {
-    -fx-background-color: -fx-hover-base, -fx-control-inner-background;
-}
-.context-menu > .scroll-arrow > .menu-up-arrow,
-.context-menu > .scroll-arrow > .menu-down-arrow {
-    -fx-background-color: -fx-hover-base;
-}
-/*******************************************************************************
- *                                                                             *
- * MenuBar                                                                     *
- *                                                                             *
- ******************************************************************************/
-.menu-bar {
-    -fx-background-color: -fx-hover-base, -fx-base;
-    -fx-background-insets: 1 1 0 1, 1;
-}
-/*******************************************************************************
- *                                                                             *
- * Menu                                                                        *
- *                                                                             *
- ******************************************************************************/
-.menu-up-arrow, .menu-down-arrow {
-    -fx-effect: null;
-}
-/*******************************************************************************
- *                                                                             *
- * TabPane                                                                     *
- *                                                                             *
- ******************************************************************************/
-.tab-header-area {
-    -fx-text-box-border: -fx-base;
-}
-.tab-pane > .tab-header-area > .headers-region > .tab:selected:hover {
-    -fx-background-color: -fx-hover-base;
-}
-.tab-pane:focused > .tab-header-area > .headers-region > .tab:selected .focus-indicator {
-    -fx-border-width: 4;
-    -fx-border-color: -fx-focus-color;
-    -fx-border-insets: -4 -4 -7 -5;
-    -fx-border-radius: 1;
-}
-.tab-pane:focused > .tab-header-area > .headers-region > .tab:bottom:selected .focus-indicator {
-    -fx-border-insets: -7 -5 -4 -4;
-}
-.tab-pane:bottom > .tab-header-area > .tab-header-background,
-.tab-pane:left > .tab-header-area > .tab-header-background,
-.tab-pane:right > .tab-header-area > .tab-header-background {
-    -fx-background-insets: 0, 0 0 1 0, 1;
-}
-/*******************************************************************************
- *                                                                             *
- * ComboBox                                                                    *
- *                                                                             *
- ******************************************************************************/
-.combo-box-popup > .list-view {
-    -fx-background-color: -fx-outer-border, -fx-control-inner-background;
-}
-/*******************************************************************************
- *                                                                             *
- * TitledPane                                                                  *
- *                                                                             *
- ******************************************************************************/
-.titled-pane > .title {
-    -fx-background-color: -fx-outer-border, -fx-inner-border, -fx-body-color;
-}
-.titled-pane:focused > .title {
-    -fx-background-color: -fx-faint-focus-color, -fx-focus-color, -fx-body-color;
-    -fx-background-insets: 0, 1, 4;
-}
-.titled-pane > .title:hover {
-    -fx-color: -fx-base;
-}
-.titled-pane > .title > .arrow-button > .arrow,
-.titled-pane:focused > .title > .arrow-button > .arrow {
-    -fx-background-color: -fx-mark-color;
-    -fx-background-insets: 0;
-    -fx-effect: null;
-}
-.titled-pane > .title:hover > .arrow-button > .arrow {
-    -fx-background-color: -fx-mark-highlight-color;
-    -fx-background-insets: 0;
-}
-/*******************************************************************************
- *                                                                             *
- * SplitPane                                                                   *
- *                                                                             *
- ******************************************************************************/
-.split-pane:horizontal > .split-pane-divider:hover {
-    -fx-background-color: -fx-box-border, -fx-hover-base;
-    -fx-background-insets: 0, 0 1 0 1;
-}
-.split-pane:vertical > .split-pane-divider:hover {
-    -fx-background-color: -fx-box-border, -fx-hover-base;
-    -fx-background-insets: 0, 1 0 1 0;
-}
-.split-pane:horizontal > .split-pane-divider:pressed {
-    -fx-background-color: -fx-box-border, -fx-pressed-base;
-    -fx-background-insets: 0, 0 1 0 1;
-}
-.split-pane:vertical > .split-pane-divider:pressed {
-    -fx-background-color: -fx-box-border, -fx-pressed-base;
-    -fx-background-insets: 0, 1 0 1 0;
-}
-/*******************************************************************************
- *                                                                             *
- * ColorPicker                                                                 *
- *                                                                             *
- ******************************************************************************/
-.color-palette {
-    -fx-background-color: -fx-hover-base, -fx-base;
-}
-.color-palette > .color-picker-grid > .color-square:selected {
-    -fx-background-color: -fx-hover-base;
-}
-.custom-color-dialog .color-rect-pane .color-rect-border,
-.custom-color-dialog > .color-rect-pane > .color-bar,
-.custom-color-dialog .controls-pane .current-new-color-grid #current-new-color-border {
-    -fx-border-color: derive(-fx-hover-base, -20%);
-}
-.custom-color-dialog > .color-rect-pane #color-rect-indicator,
-.custom-color-dialog > .color-rect-pane > .color-bar > #color-bar-indicator {
-    -fx-border-color: -fx-hover-base;
-    -fx-border-width: 2;
-}
-/*******************************************************************************
- *                                                                             *
- * Pagination                                                                  *
- *                                                                             *
- ******************************************************************************/
-.pagination > .pagination-control > .control-box > .number-button:selected {
-    -fx-background-color: transparent, -fx-hover-base, -fx-inner-border, -fx-body-color;
-    -fx-text-fill: -fx-hover-base;
-}
-.pagination > .pagination-control > .control-box > .number-button:selected:hover:armed {
-    -fx-background-color: transparent, -fx-hover-base, -fx-inner-border, -fx-body-color;
-}
-.pagination > .pagination-control > .control-box > .number-button:selected:hover {
-    -fx-background-color: transparent, -fx-hover-base, -fx-hover-base, -fx-hover-base;
-    -fx-text-fill: -fx-dark-text-color;
-}
-.pagination > .pagination-control > .control-box > .bullet-button:selected,
-.pagination > .pagination-control > .control-box > .bullet-button:selected:hover:armed {
-    -fx-background-color: transparent, -fx-hover-base, -fx-inner-border, -fx-body-color;
-}
-/*******************************************************************************
- *                                                                             *
- * Table Cells                                                                 *
- *                                                                             *
- ******************************************************************************/
-.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: -fx-hover-base, -fx-background;
-}
-.table-view > .virtual-flow > .clipped-container > .sheet > .table-row-cell:filled > .check-box-table-cell:selected > .check-box > .box,
-.tree-table-view > .virtual-flow > .clipped-container > .sheet > .tree-table-row-cell:filled > .check-box-table-cell:selected > .check-box > .box,
-.table-view > .virtual-flow > .clipped-container > .sheet > .table-row-cell:filled:selected > .check-box-table-cell > .check-box > .box,
-.tree-table-view > .virtual-flow > .clipped-container > .sheet > .tree-table-row-cell:filled:selected > .check-box-table-cell > .check-box > .box {
-    -fx-background-color: -fx-base, -fx-background;
-}
-/*******************************************************************************
- *                                                                             *
- * TableView                                                                   *
- *                                                                             *
- ******************************************************************************/
-
-.table-view,
-.tree-table-view {
-    -fx-table-cell-border-color: derive(-fx-hover-base,-30%);
-}
-/*******************************************************************************
- *                                                                             *
- * Tooltip                                                                     *
- *                                                                             *
- ******************************************************************************/
-.tooltip {
-    -fx-background-color: -fx-hover-base, rgba(30, 30, 30, 0.8);
-    -fx-background-radius: 6px, 5px;
-    -fx-background-insets: 0, 1;
-    -fx-font-size: 1em;
-    -fx-font-weight: bold;
-}
-/*******************************************************************************
- *                                                                             *
- * Charts                                                                      *
- *                                                                             *
- ******************************************************************************/
-.chart-legend {
-    -fx-background-color: -fx-hover-base, -fx-base;
-    -fx-background-insets: 0, 1;
-    -fx-background-radius: 4, 3;
-}
-/*******************************************************************************
- *                                                                             *
- * Axis                                                                        *
- *                                                                             *
- ******************************************************************************/
-.axis {
-    AXIS_COLOR: -fx-light-text-color;
-    -fx-tick-label-fill: -fx-hover-base;
-}
-/*******************************************************************************
- *                                                                             *
- * ChartPlot                                                                   *
- *                                                                             *
- ******************************************************************************/
-.chart-vertical-grid-lines,
-.chart-horizontal-grid-lines {
-    -fx-stroke: derive(-fx-hover-base, -30%);
-}
-/*******************************************************************************
- *                                                                             *
- * ScatterChart, LineChart, AreaChart, PieChart                                *
- *                                                                             *
- ******************************************************************************/
-.default-color5.chart-symbol, /* hollow circle */
-.chart-line-symbol,
-.chart-area-symbol {
-    -fx-background-radius: 6px;
-    -fx-padding: 6px;
-}
-.chart-area-symbol {
-    -fx-background-color: #f9d900, black;
-    -fx-background-insets: 0, 2;
-}
-.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-width: 3px;
-}
-.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-background-insets: 0, 2;
-}
-.chart-pie-label-line {
-    -fx-stroke: -fx-hover-base;
-}
-.chart-pie-label {
-    -fx-fill: -fx-hover-base;
-}
+/*
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*******************************************************************************
+ *                                                                             *
+ * "White on Black" contrast theme.                                            *
+ *                                                                             *
+ ******************************************************************************/
+
+.root {
+    -fx-base: black;
+    -fx-background: -fx-base;
+    -fx-control-inner-background: -fx-base;
+    -fx-control-inner-background-alt: -fx-base;
+    -fx-faint-focus-color: -fx-accent;
+    -fx-hover-base: white;
+    -fx-pressed-base: derive(-fx-hover-base, -15%);
+    -fx-box-border: -fx-hover-base;
+    -fx-text-box-border: -fx-hover-base;
+    -fx-shadow-highlight-color: -fx-base;
+    -fx-outer-border: -fx-hover-base;
+}
+/*******************************************************************************
+ *                                                                             *
+ * Font Weight                                                                 *
+ *                                                                             *
+ ******************************************************************************/
+.text,
+.text-input {
+    -fx-font-weight: bold;
+}
+.axis {
+    -fx-tick-label-font-weight: bold;
+}
+/*******************************************************************************
+ *                                                                             *
+ * ToggleButton                                                                *
+ *                                                                             *
+ ******************************************************************************/
+.toggle-button:selected,
+.toggle-button:selected:focused {
+    -fx-light-text-color: -fx-base;
+}
+.toggle-button:selected {
+    -fx-background-color: -fx-shadow-highlight-color, -fx-hover-base, -fx-hover-base;
+}
+.toggle-button:selected:focused {
+    -fx-background-color: -fx-focus-color, -fx-hover-base, -fx-faint-focus-color, -fx-hover-base;
+}
+.toggle-button:selected:armed {
+    -fx-background-color: -fx-shadow-highlight-color, -fx-hover-base, -fx-faint-focus-color, -fx-pressed-base;
+}
+.toggle-button:selected:focused:armed {
+    -fx-background-color: -fx-focus-color, -fx-hover-base, -fx-faint-focus-color, -fx-pressed-base;
+}
+/*******************************************************************************
+ *                                                                             *
+ * Slider                                                                      *
+ *                                                                             *
+ ******************************************************************************/
+.slider .thumb {
+    -fx-background-color: -fx-hover-base, -fx-hover-base, -fx-body-color;
+}
+.slider:focused .thumb {
+    -fx-background-color: -fx-focus-color, -fx-hover-base, -fx-body-color, -fx-faint-focus-color, -fx-body-color;
+}
+/*******************************************************************************
+ *                                                                             *
+ * ScrollBar                                                                   *
+ *                                                                             *
+ ******************************************************************************/
+.scroll-bar > .increment-button,
+.scroll-bar > .decrement-button {
+    -fx-background-color: -fx-outer-border, -fx-base, -fx-base;
+}
+.scroll-bar > .increment-button:hover,
+.scroll-bar > .decrement-button:hover {
+    -fx-background-color: -fx-outer-border, -fx-hover-base, -fx-hover-base;
+}
+.scroll-bar > .increment-button:hover > .increment-arrow,
+.scroll-bar > .decrement-button:hover > .decrement-arrow,
+.scroll-bar > .increment-button:hover:pressed > .increment-arrow,
+.scroll-bar > .decrement-button:hover:pressed > .decrement-arrow {
+    -fx-background-color: -fx-base, -fx-base;
+}
+.scroll-bar > .increment-button > .increment-arrow,
+.scroll-bar > .decrement-button > .decrement-arrow {
+    -fx-background-color: -fx-hover-base, -fx-hover-base;
+}
+.scroll-bar > .increment-button:hover:pressed,
+.scroll-bar > .decrement-button:hover:pressed {
+    -fx-background-color: -fx-outer-border, -fx-pressed-base, -fx-pressed-base;
+}
+.scroll-bar:horizontal > .decrement-button > .decrement-arrow,
+.scroll-bar:horizontal > .increment-button > .increment-arrow,
+.scroll-bar:vertical > .decrement-button > .decrement-arrow,
+.scroll-bar:vertical > .increment-button > .increment-arrow {
+    -fx-effect: null;
+}
+.scroll-bar > .thumb:pressed {
+    -fx-background-color: -fx-outer-border, -fx-pressed-base, -fx-pressed-base;
+}
+/*******************************************************************************
+ *                                                                             *
+ * HTML Editor                                                                 *
+ *                                                                             *
+ ******************************************************************************/
+.html-editor-foreground{
+    -fx-graphic: url("HTMLEditor-Text-Color-White.png");
+}
+.html-editor-background {
+    -fx-graphic: url("HTMLEditor-Background-Color-White.png");
+}
+.html-editor-cut {
+    -fx-graphic: url("HTMLEditor-Cut-White.png");
+}
+.html-editor-copy {
+    -fx-graphic: url("HTMLEditor-Copy-White.png");
+}
+.html-editor-paste {
+    -fx-graphic: url("HTMLEditor-Paste-White.png");
+}
+.html-editor-align-left {
+    -fx-graphic: url("HTMLEditor-Left-White.png");
+}
+.html-editor-align-center {
+    -fx-graphic: url("HTMLEditor-Center-White.png");
+}
+.html-editor-align-right {
+    -fx-graphic: url("HTMLEditor-Right-White.png");
+}
+.html-editor-align-justify {
+    -fx-graphic: url("HTMLEditor-Justify-White.png");
+}
+.html-editor-outdent {
+    -fx-graphic: url("HTMLEditor-Outdent-White.png");
+}
+.html-editor-outdent:dir(rtl) {
+    -fx-graphic: url("HTMLEditor-Outdent-White-rtl.png");
+}
+.html-editor-indent {
+    -fx-graphic: url("HTMLEditor-Indent-White.png");
+}
+.html-editor-indent:dir(rtl) {
+    -fx-graphic: url("HTMLEditor-Indent-White-rtl.png");
+}
+.html-editor-bullets {
+    -fx-graphic: url("HTMLEditor-Bullets-White.png");
+}
+.html-editor-bullets:dir(rtl) {
+    -fx-graphic: url("HTMLEditor-Bullets-White-rtl.png");
+}
+.html-editor-numbers {
+    -fx-graphic: url("HTMLEditor-Numbered-White.png");
+}
+.html-editor-numbers:dir(rtl) {
+    -fx-graphic: url("HTMLEditor-Numbered-White-rtl.png");
+}
+.html-editor-bold {
+    -fx-graphic: url("HTMLEditor-Bold-White.png");
+}
+.html-editor-italic {
+    -fx-graphic: url("HTMLEditor-Italic-White.png");
+}
+.html-editor-underline {
+    -fx-graphic: url("HTMLEditor-Underline-White.png");
+}
+.html-editor-strike {
+    -fx-graphic: url("HTMLEditor-Strikethrough-White.png");
+}
+.html-editor-hr {
+    -fx-graphic: url("HTMLEditor-Break-White.png");
+}
+.html-editor-foreground:hover,
+.html-editor-foreground:showing {
+    -fx-graphic: url("HTMLEditor-Text-Color-Black.png");
+}
+.html-editor-background:hover,
+.html-editor-background:showing {
+    -fx-graphic: url("HTMLEditor-Background-Color-Black.png");
+}
+.html-editor-cut:hover,
+.html-editor-cut:selected {
+    -fx-graphic: url("HTMLEditor-Cut-Black.png");
+}
+.html-editor-copy:hover,
+.html-editor-copy:selected {
+    -fx-graphic: url("HTMLEditor-Copy-Black.png");
+}
+.html-editor-paste:hover,
+.html-editor-paste:selected {
+    -fx-graphic: url("HTMLEditor-Paste-Black.png");
+}
+.html-editor-align-left:hover,
+.html-editor-align-left:selected {
+    -fx-graphic: url("HTMLEditor-Left-Black.png");
+}
+.html-editor-align-center:hover,
+.html-editor-align-center:selected {
+    -fx-graphic: url("HTMLEditor-Center-Black.png");
+}
+.html-editor-align-right:hover,
+.html-editor-align-right:selected {
+    -fx-graphic: url("HTMLEditor-Right-Black.png");
+}
+.html-editor-align-justify:hover,
+.html-editor-align-justify:selected {
+    -fx-graphic: url("HTMLEditor-Justify-Black.png");
+}
+.html-editor-outdent:hover,
+.html-editor-outdent:armed {
+    -fx-graphic: url("HTMLEditor-Outdent-Black.png");
+}
+.html-editor-indent:hover,
+.html-editor-indent:armed {
+    -fx-graphic: url("HTMLEditor-Indent-Black.png");
+}
+.html-editor-bullets:hover,
+.html-editor-bullets:selected {
+    -fx-graphic: url("HTMLEditor-Bullets-Black.png");
+}
+.html-editor-numbers:hover,
+.html-editor-numbers:selected {
+    -fx-graphic: url("HTMLEditor-Numbered-Black.png");
+}
+.html-editor-bold:hover,
+.html-editor-bold:selected {
+    -fx-graphic: url("HTMLEditor-Bold-Black.png");
+}
+.html-editor-italic:hover,
+.html-editor-italic:selected {
+    -fx-graphic: url("HTMLEditor-Italic-Black.png");
+}
+.html-editor-underline:hover,
+.html-editor-underline:selected {
+    -fx-graphic: url("HTMLEditor-Underline-Black.png");
+}
+.html-editor-strike:hover,
+.html-editor-strike:selected {
+    -fx-graphic: url("HTMLEditor-Strikethrough-Black.png");
+}
+.html-editor-hr:hover,
+.html-editor-hr:armed {
+    -fx-graphic: url("HTMLEditor-Break-Black.png");
+}
+/*******************************************************************************
+ *                                                                             *
+ * PopupMenu                                                                   *
+ *                                                                             *
+ ******************************************************************************/
+.context-menu {
+    -fx-background-color: -fx-hover-base, -fx-control-inner-background;
+}
+.context-menu > .scroll-arrow > .menu-up-arrow,
+.context-menu > .scroll-arrow > .menu-down-arrow {
+    -fx-background-color: -fx-hover-base;
+}
+/*******************************************************************************
+ *                                                                             *
+ * MenuBar                                                                     *
+ *                                                                             *
+ ******************************************************************************/
+.menu-bar {
+    -fx-background-color: -fx-hover-base, -fx-base;
+    -fx-background-insets: 1 1 0 1, 1;
+}
+/*******************************************************************************
+ *                                                                             *
+ * Menu                                                                        *
+ *                                                                             *
+ ******************************************************************************/
+.menu-up-arrow, .menu-down-arrow {
+    -fx-effect: null;
+}
+/*******************************************************************************
+ *                                                                             *
+ * TabPane                                                                     *
+ *                                                                             *
+ ******************************************************************************/
+.tab-header-area {
+    -fx-text-box-border: -fx-base;
+}
+.tab-pane > .tab-header-area > .headers-region > .tab:selected:hover {
+    -fx-background-color: -fx-hover-base;
+}
+.tab-pane:focused > .tab-header-area > .headers-region > .tab:selected .focus-indicator {
+    -fx-border-width: 4;
+    -fx-border-color: -fx-focus-color;
+    -fx-border-insets: -4 -4 -7 -5;
+    -fx-border-radius: 1;
+}
+.tab-pane:focused > .tab-header-area > .headers-region > .tab:bottom:selected .focus-indicator {
+    -fx-border-insets: -7 -5 -4 -4;
+}
+.tab-pane:bottom > .tab-header-area > .tab-header-background,
+.tab-pane:left > .tab-header-area > .tab-header-background,
+.tab-pane:right > .tab-header-area > .tab-header-background {
+    -fx-background-insets: 0, 0 0 1 0, 1;
+}
+/*******************************************************************************
+ *                                                                             *
+ * ComboBox                                                                    *
+ *                                                                             *
+ ******************************************************************************/
+.combo-box-popup > .list-view {
+    -fx-background-color: -fx-outer-border, -fx-control-inner-background;
+}
+/*******************************************************************************
+ *                                                                             *
+ * TitledPane                                                                  *
+ *                                                                             *
+ ******************************************************************************/
+.titled-pane > .title {
+    -fx-background-color: -fx-outer-border, -fx-inner-border, -fx-body-color;
+}
+.titled-pane:focused > .title {
+    -fx-background-color: -fx-faint-focus-color, -fx-focus-color, -fx-body-color;
+    -fx-background-insets: 0, 1, 4;
+}
+.titled-pane > .title:hover {
+    -fx-color: -fx-base;
+}
+.titled-pane > .title > .arrow-button > .arrow,
+.titled-pane:focused > .title > .arrow-button > .arrow {
+    -fx-background-color: -fx-mark-color;
+    -fx-background-insets: 0;
+    -fx-effect: null;
+}
+.titled-pane > .title:hover > .arrow-button > .arrow {
+    -fx-background-color: -fx-mark-highlight-color;
+    -fx-background-insets: 0;
+}
+/*******************************************************************************
+ *                                                                             *
+ * SplitPane                                                                   *
+ *                                                                             *
+ ******************************************************************************/
+.split-pane:horizontal > .split-pane-divider:hover {
+    -fx-background-color: -fx-box-border, -fx-hover-base;
+    -fx-background-insets: 0, 0 1 0 1;
+}
+.split-pane:vertical > .split-pane-divider:hover {
+    -fx-background-color: -fx-box-border, -fx-hover-base;
+    -fx-background-insets: 0, 1 0 1 0;
+}
+.split-pane:horizontal > .split-pane-divider:pressed {
+    -fx-background-color: -fx-box-border, -fx-pressed-base;
+    -fx-background-insets: 0, 0 1 0 1;
+}
+.split-pane:vertical > .split-pane-divider:pressed {
+    -fx-background-color: -fx-box-border, -fx-pressed-base;
+    -fx-background-insets: 0, 1 0 1 0;
+}
+/*******************************************************************************
+ *                                                                             *
+ * ColorPicker                                                                 *
+ *                                                                             *
+ ******************************************************************************/
+.color-palette {
+    -fx-background-color: -fx-hover-base, -fx-base;
+}
+.color-palette > .color-picker-grid > .color-square:selected {
+    -fx-background-color: -fx-hover-base;
+}
+.custom-color-dialog .color-rect-pane .color-rect-border,
+.custom-color-dialog > .color-rect-pane > .color-bar,
+.custom-color-dialog .controls-pane .current-new-color-grid #current-new-color-border {
+    -fx-border-color: derive(-fx-hover-base, -20%);
+}
+.custom-color-dialog > .color-rect-pane #color-rect-indicator,
+.custom-color-dialog > .color-rect-pane > .color-bar > #color-bar-indicator {
+    -fx-border-color: -fx-hover-base;
+    -fx-border-width: 2;
+}
+/*******************************************************************************
+ *                                                                             *
+ * Pagination                                                                  *
+ *                                                                             *
+ ******************************************************************************/
+.pagination > .pagination-control > .control-box > .number-button:selected {
+    -fx-background-color: transparent, -fx-hover-base, -fx-inner-border, -fx-body-color;
+    -fx-text-fill: -fx-hover-base;
+}
+.pagination > .pagination-control > .control-box > .number-button:selected:hover:armed {
+    -fx-background-color: transparent, -fx-hover-base, -fx-inner-border, -fx-body-color;
+}
+.pagination > .pagination-control > .control-box > .number-button:selected:hover {
+    -fx-background-color: transparent, -fx-hover-base, -fx-hover-base, -fx-hover-base;
+    -fx-text-fill: -fx-dark-text-color;
+}
+.pagination > .pagination-control > .control-box > .bullet-button:selected,
+.pagination > .pagination-control > .control-box > .bullet-button:selected:hover:armed {
+    -fx-background-color: transparent, -fx-hover-base, -fx-inner-border, -fx-body-color;
+}
+/*******************************************************************************
+ *                                                                             *
+ * Table Cells                                                                 *
+ *                                                                             *
+ ******************************************************************************/
+.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: -fx-hover-base, -fx-background;
+}
+.table-view > .virtual-flow > .clipped-container > .sheet > .table-row-cell:filled > .check-box-table-cell:selected > .check-box > .box,
+.tree-table-view > .virtual-flow > .clipped-container > .sheet > .tree-table-row-cell:filled > .check-box-table-cell:selected > .check-box > .box,
+.table-view > .virtual-flow > .clipped-container > .sheet > .table-row-cell:filled:selected > .check-box-table-cell > .check-box > .box,
+.tree-table-view > .virtual-flow > .clipped-container > .sheet > .tree-table-row-cell:filled:selected > .check-box-table-cell > .check-box > .box {
+    -fx-background-color: -fx-base, -fx-background;
+}
+/*******************************************************************************
+ *                                                                             *
+ * TableView                                                                   *
+ *                                                                             *
+ ******************************************************************************/
+
+.table-view,
+.tree-table-view {
+    -fx-table-cell-border-color: derive(-fx-hover-base,-30%);
+}
+/*******************************************************************************
+ *                                                                             *
+ * Tooltip                                                                     *
+ *                                                                             *
+ ******************************************************************************/
+.tooltip {
+    -fx-background-color: -fx-hover-base, rgba(30, 30, 30, 0.8);
+    -fx-background-radius: 6px, 5px;
+    -fx-background-insets: 0, 1;
+    -fx-font-size: 1em;
+    -fx-font-weight: bold;
+}
+/*******************************************************************************
+ *                                                                             *
+ * Charts                                                                      *
+ *                                                                             *
+ ******************************************************************************/
+.chart-legend {
+    -fx-background-color: -fx-hover-base, -fx-base;
+    -fx-background-insets: 0, 1;
+    -fx-background-radius: 4, 3;
+}
+/*******************************************************************************
+ *                                                                             *
+ * Axis                                                                        *
+ *                                                                             *
+ ******************************************************************************/
+.axis {
+    AXIS_COLOR: -fx-light-text-color;
+    -fx-tick-label-fill: -fx-hover-base;
+}
+/*******************************************************************************
+ *                                                                             *
+ * ChartPlot                                                                   *
+ *                                                                             *
+ ******************************************************************************/
+.chart-vertical-grid-lines,
+.chart-horizontal-grid-lines {
+    -fx-stroke: derive(-fx-hover-base, -30%);
+}
+/*******************************************************************************
+ *                                                                             *
+ * ScatterChart, LineChart, AreaChart, PieChart                                *
+ *                                                                             *
+ ******************************************************************************/
+.default-color5.chart-symbol, /* hollow circle */
+.chart-line-symbol,
+.chart-area-symbol {
+    -fx-background-radius: 6px;
+    -fx-padding: 6px;
+}
+.chart-area-symbol {
+    -fx-background-color: #f9d900, black;
+    -fx-background-insets: 0, 2;
+}
+.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-width: 3px;
+}
+.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-background-insets: 0, 2;
+}
+.chart-pie-label-line {
+    -fx-stroke: -fx-hover-base;
+}
+.chart-pie-label {
+    -fx-fill: -fx-hover-base;
+}
--- a/modules/controls/src/main/resources/com/sun/javafx/scene/control/skin/modena/yellowOnBlack.css	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/controls/src/main/resources/com/sun/javafx/scene/control/skin/modena/yellowOnBlack.css	Fri Jun 26 17:36:59 2015 -0700
@@ -1,615 +1,640 @@
-/*******************************************************************************
- *                                                                             *
- * "Yellow on Black" contrast theme.                                           *
- *                                                                             *
- ******************************************************************************/
-
-.root {
-    -fx-base: black;
-    -fx-background: -fx-base;
-    -fx-control-inner-background: -fx-base;
-    -fx-control-inner-background-alt: -fx-base;
-    -fx-faint-focus-color: -fx-accent;
-    -fx-hover-base: yellow;
-    -fx-pressed-base: derive(-fx-hover-base, -18%);
-    -fx-box-border: -fx-hover-base;
-    -fx-text-box-border: -fx-hover-base;
-    -fx-shadow-highlight-color: -fx-base;
-    -fx-outer-border: -fx-hover-base;
-    -fx-light-text-color: -fx-hover-base;
-    -fx-mark-color: ladder(
-        -fx-color,
-        yellow 30%,
-        derive(-fx-color,-63%) 31%
-    );
-    -fx-selection-bar-non-focused: derive(-fx-hover-base, -80%);
-    -fx-contrast-color: white;
-}
-/*******************************************************************************
- *                                                                             *
- * Font Weight                                                                 *
- *                                                                             *
- ******************************************************************************/
-.text,
-.text-input {
-    -fx-font-weight: bold;
-}
-.axis {
-    -fx-tick-label-font-weight: bold;
-}
-/*******************************************************************************
- *                                                                             *
- * Label                                                                       *
- *                                                                             *
- ******************************************************************************/
-.label {
-    -fx-text-fill: -fx-hover-base;
-}
-/* ====   CHOICE BOX LIKE THINGS   ========================================== */
-.choice-box:hover > .label,
-.menu-button:hover > .label,
-.color-picker:hover > .label,
-.split-menu-button:hover > .label,
-.choice-box:showing > .label,
-.menu-button:armed > .label,
-.color-picker:showing > .label,
-.split-menu-button:armed > .label {
-    -fx-text-fill: -fx-mark-color;
-}
-/*******************************************************************************
- *                                                                             *
- * ToggleButton                                                                *
- *                                                                             *
- ******************************************************************************/
-.toggle-button:selected,
-.toggle-button:selected:focused {
-    -fx-light-text-color: -fx-base;
-}
-.toggle-button:selected:armed,
-.toggle-button:selected:focused:armed {
-    -fx-mid-text-color: -fx-base;
-}
-.toggle-button:selected {
-    -fx-background-color: -fx-shadow-highlight-color, -fx-hover-base, -fx-hover-base;
-}
-.toggle-button:selected:focused {
-    -fx-background-color: -fx-focus-color, -fx-hover-base, -fx-faint-focus-color, -fx-hover-base;
-}
-.toggle-button:selected:armed {
-    -fx-background-color: -fx-shadow-highlight-color, -fx-hover-base, -fx-faint-focus-color, -fx-pressed-base;
-}
-.toggle-button:selected:focused:armed {
-    -fx-background-color: -fx-focus-color, -fx-hover-base, -fx-faint-focus-color, -fx-pressed-base;
-}
-/*******************************************************************************
- *                                                                             *
- * Slider                                                                      *
- *                                                                             *
- ******************************************************************************/
-.slider .thumb {
-    -fx-background-color: -fx-hover-base, -fx-hover-base, -fx-body-color;
-}
-.slider:focused .thumb {
-    -fx-background-color: -fx-focus-color, -fx-hover-base, -fx-body-color, -fx-faint-focus-color, -fx-body-color;
-}
-/*******************************************************************************
- *                                                                             *
- * ScrollBar                                                                   *
- *                                                                             *
- ******************************************************************************/
-.scroll-bar > .increment-button,
-.scroll-bar > .decrement-button {
-    -fx-background-color: -fx-outer-border, -fx-base, -fx-base;
-}
-.scroll-bar > .increment-button:hover,
-.scroll-bar > .decrement-button:hover {
-    -fx-background-color: -fx-outer-border, -fx-hover-base, -fx-hover-base;
-}
-.scroll-bar > .increment-button:hover > .increment-arrow,
-.scroll-bar > .decrement-button:hover > .decrement-arrow,
-.scroll-bar > .increment-button:hover:pressed > .increment-arrow,
-.scroll-bar > .decrement-button:hover:pressed > .decrement-arrow {
-    -fx-background-color: -fx-base, -fx-base;
-}
-.scroll-bar > .increment-button > .increment-arrow,
-.scroll-bar > .decrement-button > .decrement-arrow {
-    -fx-background-color: -fx-hover-base, -fx-hover-base;
-}
-.scroll-bar > .increment-button:hover:pressed,
-.scroll-bar > .decrement-button:hover:pressed {
-    -fx-background-color: -fx-outer-border, -fx-pressed-base, -fx-pressed-base;
-}
-.scroll-bar:horizontal > .decrement-button > .decrement-arrow,
-.scroll-bar:horizontal > .increment-button > .increment-arrow,
-.scroll-bar:vertical > .decrement-button > .decrement-arrow,
-.scroll-bar:vertical > .increment-button > .increment-arrow {
-    -fx-effect: null;
-}
-.scroll-bar > .thumb:pressed {
-    -fx-background-color: -fx-outer-border, -fx-pressed-base, -fx-pressed-base;
-}
-/*******************************************************************************
- *                                                                             *
- * HTML Editor                                                                 *
- *                                                                             *
- ******************************************************************************/
-.html-editor-foreground {
-    -fx-graphic: url("HTMLEditor-Text-Color-Yellow.png");
-}
-.html-editor-background {
-    -fx-graphic: url("HTMLEditor-Background-Color-Yellow.png");
-}
-.html-editor-cut {
-    -fx-graphic: url("HTMLEditor-Cut-Yellow.png");
-}
-.html-editor-copy {
-    -fx-graphic: url("HTMLEditor-Copy-Yellow.png");
-}
-.html-editor-paste {
-    -fx-graphic: url("HTMLEditor-Paste-Yellow.png");
-}
-.html-editor-align-left {
-    -fx-graphic: url("HTMLEditor-Left-Yellow.png");
-}
-.html-editor-align-center {
-    -fx-graphic: url("HTMLEditor-Center-Yellow.png");
-}
-.html-editor-align-right {
-    -fx-graphic: url("HTMLEditor-Right-Yellow.png");
-}
-.html-editor-align-justify {
-    -fx-graphic: url("HTMLEditor-Justify-Yellow.png");
-}
-.html-editor-outdent {
-    -fx-graphic: url("HTMLEditor-Outdent-Yellow.png");
-}
-.html-editor-outdent:dir(rtl) {
-    -fx-graphic: url("HTMLEditor-Outdent-Yellow-rtl.png");
-}
-.html-editor-indent {
-    -fx-graphic: url("HTMLEditor-Indent-Yellow.png");
-}
-.html-editor-indent:dir(rtl) {
-    -fx-graphic: url("HTMLEditor-Indent-Yellow-rtl.png");
-}
-.html-editor-bullets {
-    -fx-graphic: url("HTMLEditor-Bullets-Yellow.png");
-}
-.html-editor-bullets:dir(rtl) {
-    -fx-graphic: url("HTMLEditor-Bullets-Yellow-rtl.png");
-}
-.html-editor-numbers {
-    -fx-graphic: url("HTMLEditor-Numbered-Yellow.png");
-}
-.html-editor-numbers:dir(rtl) {
-    -fx-graphic: url("HTMLEditor-Numbered-Yellow-rtl.png");
-}
-.html-editor-bold {
-    -fx-graphic: url("HTMLEditor-Bold-Yellow.png");
-}
-.html-editor-italic {
-    -fx-graphic: url("HTMLEditor-Italic-Yellow.png");
-}
-.html-editor-underline {
-    -fx-graphic: url("HTMLEditor-Underline-Yellow.png");
-}
-.html-editor-strike {
-    -fx-graphic: url("HTMLEditor-Strikethrough-Yellow.png");
-}
-.html-editor-hr {
-    -fx-graphic: url("HTMLEditor-Break-Yellow.png");
-}
-.html-editor-foreground:hover,
-.html-editor-foreground:showing:hover {
-    -fx-graphic: url("HTMLEditor-Text-Color-Black.png");
-}
-.html-editor-background:hover,
-.html-editor-background:showing:hover {
-    -fx-graphic: url("HTMLEditor-Background-Color-Black.png");
-}
-.html-editor-cut:hover,
-.html-editor-cut:armed,
-.html-editor-cut:hover:armed {
-    -fx-graphic: url("HTMLEditor-Cut-Black.png");
-}
-.html-editor-copy:hover,
-.html-editor-copy:armed,
-.html-editor-copy:hover:armed {
-    -fx-graphic: url("HTMLEditor-Copy-Black.png");
-}
-.html-editor-paste:hover,
-.html-editor-paste:armed,
-.html-editor-paste:hover:armed {
-    -fx-graphic: url("HTMLEditor-Paste-Black.png");
-}
-.html-editor-align-left:hover,
-.html-editor-align-left:selected,
-.html-editor-align-left:hover:armed,
-.html-editor-align-left:selected:armed {
-    -fx-graphic: url("HTMLEditor-Left-Black.png");
-}
-.html-editor-align-center:hover,
-.html-editor-align-center:selected,
-.html-editor-align-center:hover:armed,
-.html-editor-align-center:selected:armed {
-    -fx-graphic: url("HTMLEditor-Center-Black.png");
-}
-.html-editor-align-right:hover,
-.html-editor-align-right:selected,
-.html-editor-align-right:hover:armed,
-.html-editor-align-right:selected:armed {
-    -fx-graphic: url("HTMLEditor-Right-Black.png");
-}
-.html-editor-align-justify:hover,
-.html-editor-align-justify:selected,
-.html-editor-align-justify:hover:armed,
-.html-editor-align-justify:selected:armed {
-    -fx-graphic: url("HTMLEditor-Justify-Black.png");
-}
-.html-editor-outdent:hover,
-.html-editor-outdent:armed,
-.html-editor-outdent:hover:armed {
-    -fx-graphic: url("HTMLEditor-Outdent-Black.png");
-}
-.html-editor-indent:hover,
-.html-editor-indent:armed,
-.html-editor-indent:hover:armed {
-    -fx-graphic: url("HTMLEditor-Indent-Black.png");
-}
-.html-editor-bullets:hover,
-.html-editor-bullets:selected,
-.html-editor-bullets:hover:armed,
-.html-editor-bullets:selected:armed {
-    -fx-graphic: url("HTMLEditor-Bullets-Black.png");
-}
-.html-editor-numbers:hover,
-.html-editor-numbers:selected,
-.html-editor-numbers:hover:armed,
-.html-editor-numbers:selected:armed {
-    -fx-graphic: url("HTMLEditor-Numbered-Black.png");
-}
-.html-editor-bold:hover,
-.html-editor-bold:selected,
-.html-editor-bold:hover:armed,
-.html-editor-bold:selected:armed {
-    -fx-graphic: url("HTMLEditor-Bold-Black.png");
-}
-.html-editor-italic:hover,
-.html-editor-italic:selected,
-.html-editor-italic:hover:armed,
-.html-editor-italic:selected:armed {
-    -fx-graphic: url("HTMLEditor-Italic-Black.png");
-}
-.html-editor-underline:hover,
-.html-editor-underline:selected,
-.html-editor-underline:hover:armed,
-.html-editor-underline:selected:armed {
-    -fx-graphic: url("HTMLEditor-Underline-Black.png");
-}
-.html-editor-strike:hover,
-.html-editor-strike:selected,
-.html-editor-strike:hover:armed,
-.html-editor-strike:selected:armed {
-    -fx-graphic: url("HTMLEditor-Strikethrough-Black.png");
-}
-.html-editor-hr:hover,
-.html-editor-hr:armed,
-.html-editor-hr:hover:armed {
-    -fx-graphic: url("HTMLEditor-Break-Black.png");
-}
-/*******************************************************************************
- *                                                                             *
- * PopupMenu                                                                   *
- *                                                                             *
- ******************************************************************************/
-.context-menu {
-    -fx-background-color: -fx-hover-base, -fx-control-inner-background;
-}
-.context-menu > .scroll-arrow > .menu-up-arrow,
-.context-menu > .scroll-arrow > .menu-down-arrow {
-    -fx-background-color: -fx-hover-base;
-}
-.context-menu > .scroll-arrow:hover > .menu-up-arrow,
-.context-menu > .scroll-arrow:hover > .menu-down-arrow {
-    -fx-background-color: -fx-contrast-color;
-}
-/*******************************************************************************
- *                                                                             *
- * MenuBar                                                                     *
- *                                                                             *
- ******************************************************************************/
-.menu-bar {
-    -fx-background-color: -fx-hover-base, -fx-base;
-    -fx-background-insets: 1 1 0 1, 1;
-}
-.menu-bar > .container > .menu-button:hover > .label,
-.menu-bar > .container > .menu-button:focused > .label,
-.menu-bar > .container > .menu-button:showing  > .label {
-    -fx-text-fill: -fx-contrast-color !important;
-}
-/*******************************************************************************
- *                                                                             *
- * Menu                                                                        *
- *                                                                             *
- ******************************************************************************/
-.menu:focused > .right-container > .arrow {
-    -fx-background-color: -fx-contrast-color;
-}
-.menu-up-arrow, .menu-down-arrow {
-    -fx-effect: null;
-}
-/*******************************************************************************
- *                                                                             *
- * MenuItem                                                                    *
- *                                                                             *
- ******************************************************************************/
-.menu-item:focused > .label {
-    -fx-text-fill: -fx-contrast-color;
-}
-.radio-menu-item:focused:checked > .left-container > .radio,
-.check-menu-item:focused:checked > .left-container > .check {
-    -fx-background-color: -fx-contrast-color;
-}
-/*******************************************************************************
- *                                                                             *
- * TabPane                                                                     *
- *                                                                             *
- ******************************************************************************/
-.tab-header-area {
-    -fx-text-box-border: -fx-base;
-}
-.tab-pane > .tab-header-area > .headers-region > .tab:selected:hover {
-    -fx-background-color: -fx-hover-base;
-}
-.tab-pane:focused > .tab-header-area > .headers-region > .tab:selected .focus-indicator {
-    -fx-border-width: 4;
-    -fx-border-color: -fx-focus-color;
-    -fx-border-insets: -4 -4 -7 -5;
-    -fx-border-radius: 1;
-}
-.tab-pane:focused > .tab-header-area > .headers-region > .tab:bottom:selected .focus-indicator {
-    -fx-border-insets: -7 -5 -4 -4;
-}
-.tab-pane:bottom > .tab-header-area > .tab-header-background,
-.tab-pane:left > .tab-header-area > .tab-header-background,
-.tab-pane:right > .tab-header-area > .tab-header-background {
-    -fx-background-insets: 0, 0 0 1 0, 1;
-}
-/*******************************************************************************
- *                                                                             *
- * ComboBox                                                                    *
- *                                                                             *
- ******************************************************************************/
-.combo-box-popup > .list-view {
-    -fx-background-color: -fx-outer-border, -fx-control-inner-background;
-}
-.combo-box-popup > .list-view > .virtual-flow > .clipped-container > .sheet > .list-cell:filled {
-    -fx-text-fill: -fx-hover-base;
-}
-.combo-box-popup > .list-view > .virtual-flow > .clipped-container > .sheet > .list-cell:filled:hover {
-    -fx-text-fill: -fx-contrast-color;
-}
-/*******************************************************************************
- *                                                                             *
- * TitledPane                                                                  *
- *                                                                             *
- ******************************************************************************/
-.titled-pane > .title {
-    -fx-background-color: -fx-outer-border, -fx-inner-border, -fx-body-color;
-}
-.titled-pane:focused > .title {
-    -fx-background-color: -fx-faint-focus-color, -fx-focus-color, -fx-body-color;
-    -fx-background-insets: 0, 1, 4;
-}
-.titled-pane > .title:hover {
-    -fx-color: -fx-base;
-}
-.titled-pane > .title > .arrow-button > .arrow,
-.titled-pane:focused > .title > .arrow-button > .arrow {
-    -fx-background-color: -fx-mark-color;
-    -fx-background-insets: 0;
-    -fx-effect: null;
-}
-.titled-pane > .title:hover > .arrow-button > .arrow {
-    -fx-background-color: derive(-fx-hover-base, -50%);
-    -fx-background-insets: 0;
-}
-/*******************************************************************************
- *                                                                             *
- * SplitPane                                                                   *
- *                                                                             *
- ******************************************************************************/
-.split-pane:horizontal > .split-pane-divider:hover {
-    -fx-background-color: -fx-box-border, -fx-hover-base;
-    -fx-background-insets: 0, 0 1 0 1;
-}
-.split-pane:vertical > .split-pane-divider:hover {
-    -fx-background-color: -fx-box-border, -fx-hover-base;
-    -fx-background-insets: 0, 1 0 1 0;
-}
-.split-pane:horizontal > .split-pane-divider:pressed {
-    -fx-background-color: -fx-box-border, -fx-pressed-base;
-    -fx-background-insets: 0, 0 1 0 1;
-}
-.split-pane:vertical > .split-pane-divider:pressed {
-    -fx-background-color: -fx-box-border, -fx-pressed-base;
-    -fx-background-insets: 0, 1 0 1 0;
-}
-/*******************************************************************************
- *                                                                             *
- * ColorPicker                                                                 *
- *                                                                             *
- ******************************************************************************/
-.color-palette {
-    -fx-background-color: -fx-hover-base, -fx-base;
-}
-.color-palette > .color-picker-grid > .color-square:selected {
-    -fx-background-color: -fx-hover-base;
-}
-.custom-color-dialog .color-rect-pane .color-rect-border,
-.custom-color-dialog > .color-rect-pane > .color-bar,
-.custom-color-dialog .controls-pane .current-new-color-grid #current-new-color-border {
-    -fx-border-color: derive(-fx-hover-base, -20%);
-}
-.custom-color-dialog > .color-rect-pane #color-rect-indicator,
-.custom-color-dialog > .color-rect-pane > .color-bar > #color-bar-indicator {
-    -fx-border-color: -fx-hover-base;
-    -fx-border-width: 2;
-}
-/*******************************************************************************
- *                                                                             *
- * Pagination                                                                  *
- *                                                                             *
- ******************************************************************************/
-.pagination > .pagination-control > .control-box > .number-button:selected {
-    -fx-background-color: transparent, -fx-hover-base, -fx-inner-border, -fx-body-color;
-    -fx-text-fill: -fx-contrast-color;
-}
-.pagination > .pagination-control > .control-box > .number-button:selected:hover:armed {
-    -fx-background-color: transparent, -fx-hover-base, -fx-inner-border, -fx-body-color;
-}
-.pagination > .pagination-control > .control-box > .number-button:selected:hover {
-    -fx-background-color: transparent, -fx-hover-base, -fx-hover-base, -fx-hover-base;
-    -fx-text-fill: -fx-dark-text-color;
-}
-.pagination > .pagination-control > .control-box > .bullet-button:selected,
-.pagination > .pagination-control > .control-box > .bullet-button:selected:hover:armed {
-    -fx-background-color: transparent, -fx-hover-base, -fx-inner-border, -fx-body-color;
-}
-/*******************************************************************************
-*                                                                              *
-* List, Tree, Table COMMON                                                     *
-*                                                                              *
-*******************************************************************************/
-/* 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,
-.table-view:focused > .virtual-flow > .clipped-container > .sheet > .table-row-cell:filled:selected,
-.table-view:focused > .virtual-flow > .clipped-container > .sheet > .table-row-cell .table-cell:filled:selected,
-.tree-table-view:focused > .virtual-flow > .clipped-container > .sheet > .tree-table-row-cell:filled:selected,
-.tree-table-view:focused > .virtual-flow > .clipped-container > .sheet > .tree-table-row-cell .tree-table-cell:filled:selected {
-    -fx-text-fill: -fx-contrast-color;
-}
-/*******************************************************************************
-*                                                                              *
-* TreeView and TreeCell                                                        *
-*                                                                              *
-*******************************************************************************/
-.tree-view:focused > .virtual-flow > .clipped-container > .sheet > .tree-cell:filled:selected > .tree-disclosure-node > .arrow,
-.tree-table-view:focused > .virtual-flow > .clipped-container > .sheet > .tree-table-row-cell:filled:selected > .tree-disclosure-node > .arrow {
-    -fx-background-color: -fx-contrast-color;
-}
-/*******************************************************************************
- *                                                                             *
- * Table Cells                                                                 *
- *                                                                             *
- ******************************************************************************/
-.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: -fx-contrast-color, -fx-background;
-}
-.table-view > .virtual-flow > .clipped-container > .sheet > .table-row-cell:filled > .check-box-table-cell:selected > .check-box > .box,
-.tree-table-view > .virtual-flow > .clipped-container > .sheet > .tree-table-row-cell:filled > .check-box-table-cell:selected > .check-box > .box,
-.table-view > .virtual-flow > .clipped-container > .sheet > .table-row-cell:filled:selected > .check-box-table-cell > .check-box > .box,
-.tree-table-view > .virtual-flow > .clipped-container > .sheet > .tree-table-row-cell:filled:selected > .check-box-table-cell > .check-box > .box {
-    -fx-background-color: -fx-hover-base, -fx-background;
-}
-.table-view:focused > .virtual-flow > .clipped-container > .sheet > .table-row-cell:filled:selected > .check-box-table-cell > .check-box:selected > .box > .mark,
-.table-view:focused > .virtual-flow > .clipped-container > .sheet > .table-row-cell > .table-cell:filled:selected > .check-box-table-cell > .check-box:selected > .box > .mark {
-    -fx-background-color: -fx-contrast-color !important;
-}
-/*******************************************************************************
-*                                                                              *
-* TableView                                                                    *
-*                                                                              *
-*******************************************************************************/
-.table-view,
-.tree-table-view {
-    -fx-table-cell-border-color: derive(-fx-hover-base, -30%);
-}
-/*******************************************************************************
- *                                                                             *
- * Tooltip                                                                     *
- *                                                                             *
- ******************************************************************************/
-.tooltip {
-    -fx-background-color: -fx-hover-base, rgba(30, 30, 30, 0.8);
-    -fx-background-radius: 6px, 5px;
-    -fx-background-insets: 0, 1;
-    -fx-text-fill: -fx-hover-base;
-    -fx-font-size: 1em;
-    -fx-font-weight: bold;
-}
-/*******************************************************************************
- *                                                                             *
- * Charts                                                                      *
- *                                                                             *
- ******************************************************************************/
-.chart-legend {
-    -fx-background-color: -fx-hover-base, -fx-base;
-    -fx-background-insets: 0, 1;
-    -fx-background-radius: 4, 3;
-}
-/*******************************************************************************
- *                                                                             *
- * Axis                                                                        *
- *                                                                             *
- ******************************************************************************/
-.axis {
-    AXIS_COLOR: -fx-light-text-color;
-    -fx-tick-label-fill: -fx-hover-base;
-}
-/*******************************************************************************
- *                                                                             *
- * ChartPlot                                                                   *
- *                                                                             *
- ******************************************************************************/
-.chart-vertical-grid-lines,
-.chart-horizontal-grid-lines {
-    -fx-stroke: derive(-fx-hover-base, -30%);
-}
-/*******************************************************************************
- *                                                                             *
- * ScatterChart, LineChart, AreaChart, PieChart                                *
- *                                                                             *
- ******************************************************************************/
-.default-color5.chart-symbol, /* hollow circle */
-.chart-line-symbol,
-.chart-area-symbol {
-    -fx-background-radius: 6px;
-    -fx-padding: 6px;
-}
-.chart-area-symbol {
-    -fx-background-color: #f9d900, black;
-    -fx-background-insets: 0, 2;
-}
-.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-width: 3px;
-}
-.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-background-insets: 0, 2;
-}
-.chart-pie-label-line {
-    -fx-stroke: -fx-hover-base;
-}
-.chart-pie-label {
-    -fx-fill: -fx-hover-base;
-}
+/*
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*******************************************************************************
+ *                                                                             *
+ * "Yellow on Black" contrast theme.                                           *
+ *                                                                             *
+ ******************************************************************************/
+
+.root {
+    -fx-base: black;
+    -fx-background: -fx-base;
+    -fx-control-inner-background: -fx-base;
+    -fx-control-inner-background-alt: -fx-base;
+    -fx-faint-focus-color: -fx-accent;
+    -fx-hover-base: yellow;
+    -fx-pressed-base: derive(-fx-hover-base, -18%);
+    -fx-box-border: -fx-hover-base;
+    -fx-text-box-border: -fx-hover-base;
+    -fx-shadow-highlight-color: -fx-base;
+    -fx-outer-border: -fx-hover-base;
+    -fx-light-text-color: -fx-hover-base;
+    -fx-mark-color: ladder(
+        -fx-color,
+        yellow 30%,
+        derive(-fx-color,-63%) 31%
+    );
+    -fx-selection-bar-non-focused: derive(-fx-hover-base, -80%);
+    -fx-contrast-color: white;
+}
+/*******************************************************************************
+ *                                                                             *
+ * Font Weight                                                                 *
+ *                                                                             *
+ ******************************************************************************/
+.text,
+.text-input {
+    -fx-font-weight: bold;
+}
+.axis {
+    -fx-tick-label-font-weight: bold;
+}
+/*******************************************************************************
+ *                                                                             *
+ * Label                                                                       *
+ *                                                                             *
+ ******************************************************************************/
+.label {
+    -fx-text-fill: -fx-hover-base;
+}
+/* ====   CHOICE BOX LIKE THINGS   ========================================== */
+.choice-box:hover > .label,
+.menu-button:hover > .label,
+.color-picker:hover > .label,
+.split-menu-button:hover > .label,
+.choice-box:showing > .label,
+.menu-button:armed > .label,
+.color-picker:showing > .label,
+.split-menu-button:armed > .label {
+    -fx-text-fill: -fx-mark-color;
+}
+/*******************************************************************************
+ *                                                                             *
+ * ToggleButton                                                                *
+ *                                                                             *
+ ******************************************************************************/
+.toggle-button:selected,
+.toggle-button:selected:focused {
+    -fx-light-text-color: -fx-base;
+}
+.toggle-button:selected:armed,
+.toggle-button:selected:focused:armed {
+    -fx-mid-text-color: -fx-base;
+}
+.toggle-button:selected {
+    -fx-background-color: -fx-shadow-highlight-color, -fx-hover-base, -fx-hover-base;
+}
+.toggle-button:selected:focused {
+    -fx-background-color: -fx-focus-color, -fx-hover-base, -fx-faint-focus-color, -fx-hover-base;
+}
+.toggle-button:selected:armed {
+    -fx-background-color: -fx-shadow-highlight-color, -fx-hover-base, -fx-faint-focus-color, -fx-pressed-base;
+}
+.toggle-button:selected:focused:armed {
+    -fx-background-color: -fx-focus-color, -fx-hover-base, -fx-faint-focus-color, -fx-pressed-base;
+}
+/*******************************************************************************
+ *                                                                             *
+ * Slider                                                                      *
+ *                                                                             *
+ ******************************************************************************/
+.slider .thumb {
+    -fx-background-color: -fx-hover-base, -fx-hover-base, -fx-body-color;
+}
+.slider:focused .thumb {
+    -fx-background-color: -fx-focus-color, -fx-hover-base, -fx-body-color, -fx-faint-focus-color, -fx-body-color;
+}
+/*******************************************************************************
+ *                                                                             *
+ * ScrollBar                                                                   *
+ *                                                                             *
+ ******************************************************************************/
+.scroll-bar > .increment-button,
+.scroll-bar > .decrement-button {
+    -fx-background-color: -fx-outer-border, -fx-base, -fx-base;
+}
+.scroll-bar > .increment-button:hover,
+.scroll-bar > .decrement-button:hover {
+    -fx-background-color: -fx-outer-border, -fx-hover-base, -fx-hover-base;
+}
+.scroll-bar > .increment-button:hover > .increment-arrow,
+.scroll-bar > .decrement-button:hover > .decrement-arrow,
+.scroll-bar > .increment-button:hover:pressed > .increment-arrow,
+.scroll-bar > .decrement-button:hover:pressed > .decrement-arrow {
+    -fx-background-color: -fx-base, -fx-base;
+}
+.scroll-bar > .increment-button > .increment-arrow,
+.scroll-bar > .decrement-button > .decrement-arrow {
+    -fx-background-color: -fx-hover-base, -fx-hover-base;
+}
+.scroll-bar > .increment-button:hover:pressed,
+.scroll-bar > .decrement-button:hover:pressed {
+    -fx-background-color: -fx-outer-border, -fx-pressed-base, -fx-pressed-base;
+}
+.scroll-bar:horizontal > .decrement-button > .decrement-arrow,
+.scroll-bar:horizontal > .increment-button > .increment-arrow,
+.scroll-bar:vertical > .decrement-button > .decrement-arrow,
+.scroll-bar:vertical > .increment-button > .increment-arrow {
+    -fx-effect: null;
+}
+.scroll-bar > .thumb:pressed {
+    -fx-background-color: -fx-outer-border, -fx-pressed-base, -fx-pressed-base;
+}
+/*******************************************************************************
+ *                                                                             *
+ * HTML Editor                                                                 *
+ *                                                                             *
+ ******************************************************************************/
+.html-editor-foreground {
+    -fx-graphic: url("HTMLEditor-Text-Color-Yellow.png");
+}
+.html-editor-background {
+    -fx-graphic: url("HTMLEditor-Background-Color-Yellow.png");
+}
+.html-editor-cut {
+    -fx-graphic: url("HTMLEditor-Cut-Yellow.png");
+}
+.html-editor-copy {
+    -fx-graphic: url("HTMLEditor-Copy-Yellow.png");
+}
+.html-editor-paste {
+    -fx-graphic: url("HTMLEditor-Paste-Yellow.png");
+}
+.html-editor-align-left {
+    -fx-graphic: url("HTMLEditor-Left-Yellow.png");
+}
+.html-editor-align-center {
+    -fx-graphic: url("HTMLEditor-Center-Yellow.png");
+}
+.html-editor-align-right {
+    -fx-graphic: url("HTMLEditor-Right-Yellow.png");
+}
+.html-editor-align-justify {
+    -fx-graphic: url("HTMLEditor-Justify-Yellow.png");
+}
+.html-editor-outdent {
+    -fx-graphic: url("HTMLEditor-Outdent-Yellow.png");
+}
+.html-editor-outdent:dir(rtl) {
+    -fx-graphic: url("HTMLEditor-Outdent-Yellow-rtl.png");
+}
+.html-editor-indent {
+    -fx-graphic: url("HTMLEditor-Indent-Yellow.png");
+}
+.html-editor-indent:dir(rtl) {
+    -fx-graphic: url("HTMLEditor-Indent-Yellow-rtl.png");
+}
+.html-editor-bullets {
+    -fx-graphic: url("HTMLEditor-Bullets-Yellow.png");
+}
+.html-editor-bullets:dir(rtl) {
+    -fx-graphic: url("HTMLEditor-Bullets-Yellow-rtl.png");
+}
+.html-editor-numbers {
+    -fx-graphic: url("HTMLEditor-Numbered-Yellow.png");
+}
+.html-editor-numbers:dir(rtl) {
+    -fx-graphic: url("HTMLEditor-Numbered-Yellow-rtl.png");
+}
+.html-editor-bold {
+    -fx-graphic: url("HTMLEditor-Bold-Yellow.png");
+}
+.html-editor-italic {
+    -fx-graphic: url("HTMLEditor-Italic-Yellow.png");
+}
+.html-editor-underline {
+    -fx-graphic: url("HTMLEditor-Underline-Yellow.png");
+}
+.html-editor-strike {
+    -fx-graphic: url("HTMLEditor-Strikethrough-Yellow.png");
+}
+.html-editor-hr {
+    -fx-graphic: url("HTMLEditor-Break-Yellow.png");
+}
+.html-editor-foreground:hover,
+.html-editor-foreground:showing:hover {
+    -fx-graphic: url("HTMLEditor-Text-Color-Black.png");
+}
+.html-editor-background:hover,
+.html-editor-background:showing:hover {
+    -fx-graphic: url("HTMLEditor-Background-Color-Black.png");
+}
+.html-editor-cut:hover,
+.html-editor-cut:armed,
+.html-editor-cut:hover:armed {
+    -fx-graphic: url("HTMLEditor-Cut-Black.png");
+}
+.html-editor-copy:hover,
+.html-editor-copy:armed,
+.html-editor-copy:hover:armed {
+    -fx-graphic: url("HTMLEditor-Copy-Black.png");
+}
+.html-editor-paste:hover,
+.html-editor-paste:armed,
+.html-editor-paste:hover:armed {
+    -fx-graphic: url("HTMLEditor-Paste-Black.png");
+}
+.html-editor-align-left:hover,
+.html-editor-align-left:selected,
+.html-editor-align-left:hover:armed,
+.html-editor-align-left:selected:armed {
+    -fx-graphic: url("HTMLEditor-Left-Black.png");
+}
+.html-editor-align-center:hover,
+.html-editor-align-center:selected,
+.html-editor-align-center:hover:armed,
+.html-editor-align-center:selected:armed {
+    -fx-graphic: url("HTMLEditor-Center-Black.png");
+}
+.html-editor-align-right:hover,
+.html-editor-align-right:selected,
+.html-editor-align-right:hover:armed,
+.html-editor-align-right:selected:armed {
+    -fx-graphic: url("HTMLEditor-Right-Black.png");
+}
+.html-editor-align-justify:hover,
+.html-editor-align-justify:selected,
+.html-editor-align-justify:hover:armed,
+.html-editor-align-justify:selected:armed {
+    -fx-graphic: url("HTMLEditor-Justify-Black.png");
+}
+.html-editor-outdent:hover,
+.html-editor-outdent:armed,
+.html-editor-outdent:hover:armed {
+    -fx-graphic: url("HTMLEditor-Outdent-Black.png");
+}
+.html-editor-indent:hover,
+.html-editor-indent:armed,
+.html-editor-indent:hover:armed {
+    -fx-graphic: url("HTMLEditor-Indent-Black.png");
+}
+.html-editor-bullets:hover,
+.html-editor-bullets:selected,
+.html-editor-bullets:hover:armed,
+.html-editor-bullets:selected:armed {
+    -fx-graphic: url("HTMLEditor-Bullets-Black.png");
+}
+.html-editor-numbers:hover,
+.html-editor-numbers:selected,
+.html-editor-numbers:hover:armed,
+.html-editor-numbers:selected:armed {
+    -fx-graphic: url("HTMLEditor-Numbered-Black.png");
+}
+.html-editor-bold:hover,
+.html-editor-bold:selected,
+.html-editor-bold:hover:armed,
+.html-editor-bold:selected:armed {
+    -fx-graphic: url("HTMLEditor-Bold-Black.png");
+}
+.html-editor-italic:hover,
+.html-editor-italic:selected,
+.html-editor-italic:hover:armed,
+.html-editor-italic:selected:armed {
+    -fx-graphic: url("HTMLEditor-Italic-Black.png");
+}
+.html-editor-underline:hover,
+.html-editor-underline:selected,
+.html-editor-underline:hover:armed,
+.html-editor-underline:selected:armed {
+    -fx-graphic: url("HTMLEditor-Underline-Black.png");
+}
+.html-editor-strike:hover,
+.html-editor-strike:selected,
+.html-editor-strike:hover:armed,
+.html-editor-strike:selected:armed {
+    -fx-graphic: url("HTMLEditor-Strikethrough-Black.png");
+}
+.html-editor-hr:hover,
+.html-editor-hr:armed,
+.html-editor-hr:hover:armed {
+    -fx-graphic: url("HTMLEditor-Break-Black.png");
+}
+/*******************************************************************************
+ *                                                                             *
+ * PopupMenu                                                                   *
+ *                                                                             *
+ ******************************************************************************/
+.context-menu {
+    -fx-background-color: -fx-hover-base, -fx-control-inner-background;
+}
+.context-menu > .scroll-arrow > .menu-up-arrow,
+.context-menu > .scroll-arrow > .menu-down-arrow {
+    -fx-background-color: -fx-hover-base;
+}
+.context-menu > .scroll-arrow:hover > .menu-up-arrow,
+.context-menu > .scroll-arrow:hover > .menu-down-arrow {
+    -fx-background-color: -fx-contrast-color;
+}
+/*******************************************************************************
+ *                                                                             *
+ * MenuBar                                                                     *
+ *                                                                             *
+ ******************************************************************************/
+.menu-bar {
+    -fx-background-color: -fx-hover-base, -fx-base;
+    -fx-background-insets: 1 1 0 1, 1;
+}
+.menu-bar > .container > .menu-button:hover > .label,
+.menu-bar > .container > .menu-button:focused > .label,
+.menu-bar > .container > .menu-button:showing  > .label {
+    -fx-text-fill: -fx-contrast-color !important;
+}
+/*******************************************************************************
+ *                                                                             *
+ * Menu                                                                        *
+ *                                                                             *
+ ******************************************************************************/
+.menu:focused > .right-container > .arrow {
+    -fx-background-color: -fx-contrast-color;
+}
+.menu-up-arrow, .menu-down-arrow {
+    -fx-effect: null;
+}
+/*******************************************************************************
+ *                                                                             *
+ * MenuItem                                                                    *
+ *                                                                             *
+ ******************************************************************************/
+.menu-item:focused > .label {
+    -fx-text-fill: -fx-contrast-color;
+}
+.radio-menu-item:focused:checked > .left-container > .radio,
+.check-menu-item:focused:checked > .left-container > .check {
+    -fx-background-color: -fx-contrast-color;
+}
+/*******************************************************************************
+ *                                                                             *
+ * TabPane                                                                     *
+ *                                                                             *
+ ******************************************************************************/
+.tab-header-area {
+    -fx-text-box-border: -fx-base;
+}
+.tab-pane > .tab-header-area > .headers-region > .tab:selected:hover {
+    -fx-background-color: -fx-hover-base;
+}
+.tab-pane:focused > .tab-header-area > .headers-region > .tab:selected .focus-indicator {
+    -fx-border-width: 4;
+    -fx-border-color: -fx-focus-color;
+    -fx-border-insets: -4 -4 -7 -5;
+    -fx-border-radius: 1;
+}
+.tab-pane:focused > .tab-header-area > .headers-region > .tab:bottom:selected .focus-indicator {
+    -fx-border-insets: -7 -5 -4 -4;
+}
+.tab-pane:bottom > .tab-header-area > .tab-header-background,
+.tab-pane:left > .tab-header-area > .tab-header-background,
+.tab-pane:right > .tab-header-area > .tab-header-background {
+    -fx-background-insets: 0, 0 0 1 0, 1;
+}
+/*******************************************************************************
+ *                                                                             *
+ * ComboBox                                                                    *
+ *                                                                             *
+ ******************************************************************************/
+.combo-box-popup > .list-view {
+    -fx-background-color: -fx-outer-border, -fx-control-inner-background;
+}
+.combo-box-popup > .list-view > .virtual-flow > .clipped-container > .sheet > .list-cell:filled {
+    -fx-text-fill: -fx-hover-base;
+}
+.combo-box-popup > .list-view > .virtual-flow > .clipped-container > .sheet > .list-cell:filled:hover {
+    -fx-text-fill: -fx-contrast-color;
+}
+/*******************************************************************************
+ *                                                                             *
+ * TitledPane                                                                  *
+ *                                                                             *
+ ******************************************************************************/
+.titled-pane > .title {
+    -fx-background-color: -fx-outer-border, -fx-inner-border, -fx-body-color;
+}
+.titled-pane:focused > .title {
+    -fx-background-color: -fx-faint-focus-color, -fx-focus-color, -fx-body-color;
+    -fx-background-insets: 0, 1, 4;
+}
+.titled-pane > .title:hover {
+    -fx-color: -fx-base;
+}
+.titled-pane > .title > .arrow-button > .arrow,
+.titled-pane:focused > .title > .arrow-button > .arrow {
+    -fx-background-color: -fx-mark-color;
+    -fx-background-insets: 0;
+    -fx-effect: null;
+}
+.titled-pane > .title:hover > .arrow-button > .arrow {
+    -fx-background-color: derive(-fx-hover-base, -50%);
+    -fx-background-insets: 0;
+}
+/*******************************************************************************
+ *                                                                             *
+ * SplitPane                                                                   *
+ *                                                                             *
+ ******************************************************************************/
+.split-pane:horizontal > .split-pane-divider:hover {
+    -fx-background-color: -fx-box-border, -fx-hover-base;
+    -fx-background-insets: 0, 0 1 0 1;
+}
+.split-pane:vertical > .split-pane-divider:hover {
+    -fx-background-color: -fx-box-border, -fx-hover-base;
+    -fx-background-insets: 0, 1 0 1 0;
+}
+.split-pane:horizontal > .split-pane-divider:pressed {
+    -fx-background-color: -fx-box-border, -fx-pressed-base;
+    -fx-background-insets: 0, 0 1 0 1;
+}
+.split-pane:vertical > .split-pane-divider:pressed {
+    -fx-background-color: -fx-box-border, -fx-pressed-base;
+    -fx-background-insets: 0, 1 0 1 0;
+}
+/*******************************************************************************
+ *                                                                             *
+ * ColorPicker                                                                 *
+ *                                                                             *
+ ******************************************************************************/
+.color-palette {
+    -fx-background-color: -fx-hover-base, -fx-base;
+}
+.color-palette > .color-picker-grid > .color-square:selected {
+    -fx-background-color: -fx-hover-base;
+}
+.custom-color-dialog .color-rect-pane .color-rect-border,
+.custom-color-dialog > .color-rect-pane > .color-bar,
+.custom-color-dialog .controls-pane .current-new-color-grid #current-new-color-border {
+    -fx-border-color: derive(-fx-hover-base, -20%);
+}
+.custom-color-dialog > .color-rect-pane #color-rect-indicator,
+.custom-color-dialog > .color-rect-pane > .color-bar > #color-bar-indicator {
+    -fx-border-color: -fx-hover-base;
+    -fx-border-width: 2;
+}
+/*******************************************************************************
+ *                                                                             *
+ * Pagination                                                                  *
+ *                                                                             *
+ ******************************************************************************/
+.pagination > .pagination-control > .control-box > .number-button:selected {
+    -fx-background-color: transparent, -fx-hover-base, -fx-inner-border, -fx-body-color;
+    -fx-text-fill: -fx-contrast-color;
+}
+.pagination > .pagination-control > .control-box > .number-button:selected:hover:armed {
+    -fx-background-color: transparent, -fx-hover-base, -fx-inner-border, -fx-body-color;
+}
+.pagination > .pagination-control > .control-box > .number-button:selected:hover {
+    -fx-background-color: transparent, -fx-hover-base, -fx-hover-base, -fx-hover-base;
+    -fx-text-fill: -fx-dark-text-color;
+}
+.pagination > .pagination-control > .control-box > .bullet-button:selected,
+.pagination > .pagination-control > .control-box > .bullet-button:selected:hover:armed {
+    -fx-background-color: transparent, -fx-hover-base, -fx-inner-border, -fx-body-color;
+}
+/*******************************************************************************
+*                                                                              *
+* List, Tree, Table COMMON                                                     *
+*                                                                              *
+*******************************************************************************/
+/* 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,
+.table-view:focused > .virtual-flow > .clipped-container > .sheet > .table-row-cell:filled:selected,
+.table-view:focused > .virtual-flow > .clipped-container > .sheet > .table-row-cell .table-cell:filled:selected,
+.tree-table-view:focused > .virtual-flow > .clipped-container > .sheet > .tree-table-row-cell:filled:selected,
+.tree-table-view:focused > .virtual-flow > .clipped-container > .sheet > .tree-table-row-cell .tree-table-cell:filled:selected {
+    -fx-text-fill: -fx-contrast-color;
+}
+/*******************************************************************************
+*                                                                              *
+* TreeView and TreeCell                                                        *
+*                                                                              *
+*******************************************************************************/
+.tree-view:focused > .virtual-flow > .clipped-container > .sheet > .tree-cell:filled:selected > .tree-disclosure-node > .arrow,
+.tree-table-view:focused > .virtual-flow > .clipped-container > .sheet > .tree-table-row-cell:filled:selected > .tree-disclosure-node > .arrow {
+    -fx-background-color: -fx-contrast-color;
+}
+/*******************************************************************************
+ *                                                                             *
+ * Table Cells                                                                 *
+ *                                                                             *
+ ******************************************************************************/
+.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: -fx-contrast-color, -fx-background;
+}
+.table-view > .virtual-flow > .clipped-container > .sheet > .table-row-cell:filled > .check-box-table-cell:selected > .check-box > .box,
+.tree-table-view > .virtual-flow > .clipped-container > .sheet > .tree-table-row-cell:filled > .check-box-table-cell:selected > .check-box > .box,
+.table-view > .virtual-flow > .clipped-container > .sheet > .table-row-cell:filled:selected > .check-box-table-cell > .check-box > .box,
+.tree-table-view > .virtual-flow > .clipped-container > .sheet > .tree-table-row-cell:filled:selected > .check-box-table-cell > .check-box > .box {
+    -fx-background-color: -fx-hover-base, -fx-background;
+}
+.table-view:focused > .virtual-flow > .clipped-container > .sheet > .table-row-cell:filled:selected > .check-box-table-cell > .check-box:selected > .box > .mark,
+.table-view:focused > .virtual-flow > .clipped-container > .sheet > .table-row-cell > .table-cell:filled:selected > .check-box-table-cell > .check-box:selected > .box > .mark {
+    -fx-background-color: -fx-contrast-color !important;
+}
+/*******************************************************************************
+*                                                                              *
+* TableView                                                                    *
+*                                                                              *
+*******************************************************************************/
+.table-view,
+.tree-table-view {
+    -fx-table-cell-border-color: derive(-fx-hover-base, -30%);
+}
+/*******************************************************************************
+ *                                                                             *
+ * Tooltip                                                                     *
+ *                                                                             *
+ ******************************************************************************/
+.tooltip {
+    -fx-background-color: -fx-hover-base, rgba(30, 30, 30, 0.8);
+    -fx-background-radius: 6px, 5px;
+    -fx-background-insets: 0, 1;
+    -fx-text-fill: -fx-hover-base;
+    -fx-font-size: 1em;
+    -fx-font-weight: bold;
+}
+/*******************************************************************************
+ *                                                                             *
+ * Charts                                                                      *
+ *                                                                             *
+ ******************************************************************************/
+.chart-legend {
+    -fx-background-color: -fx-hover-base, -fx-base;
+    -fx-background-insets: 0, 1;
+    -fx-background-radius: 4, 3;
+}
+/*******************************************************************************
+ *                                                                             *
+ * Axis                                                                        *
+ *                                                                             *
+ ******************************************************************************/
+.axis {
+    AXIS_COLOR: -fx-light-text-color;
+    -fx-tick-label-fill: -fx-hover-base;
+}
+/*******************************************************************************
+ *                                                                             *
+ * ChartPlot                                                                   *
+ *                                                                             *
+ ******************************************************************************/
+.chart-vertical-grid-lines,
+.chart-horizontal-grid-lines {
+    -fx-stroke: derive(-fx-hover-base, -30%);
+}
+/*******************************************************************************
+ *                                                                             *
+ * ScatterChart, LineChart, AreaChart, PieChart                                *
+ *                                                                             *
+ ******************************************************************************/
+.default-color5.chart-symbol, /* hollow circle */
+.chart-line-symbol,
+.chart-area-symbol {
+    -fx-background-radius: 6px;
+    -fx-padding: 6px;
+}
+.chart-area-symbol {
+    -fx-background-color: #f9d900, black;
+    -fx-background-insets: 0, 2;
+}
+.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-width: 3px;
+}
+.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-background-insets: 0, 2;
+}
+.chart-pie-label-line {
+    -fx-stroke: -fx-hover-base;
+}
+.chart-pie-label {
+    -fx-fill: -fx-hover-base;
+}
--- a/modules/controls/src/test/java/com/sun/javafx/scene/control/infrastructure/ControlTestUtils.java	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/controls/src/test/java/com/sun/javafx/scene/control/infrastructure/ControlTestUtils.java	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/controls/src/test/java/javafx/scene/chart/AreaChartTest.java	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/controls/src/test/java/javafx/scene/chart/AreaChartTest.java	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/controls/src/test/java/javafx/scene/chart/BarChartTest.java	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/controls/src/test/java/javafx/scene/chart/BarChartTest.java	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/controls/src/test/java/javafx/scene/chart/ChartTestBase.java	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/controls/src/test/java/javafx/scene/chart/ChartTestBase.java	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/controls/src/test/java/javafx/scene/chart/LineChartTest.java	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/controls/src/test/java/javafx/scene/chart/LineChartTest.java	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/controls/src/test/java/javafx/scene/chart/StackedAreaChartTest.java	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/controls/src/test/java/javafx/scene/chart/StackedAreaChartTest.java	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/controls/src/test/java/javafx/scene/control/MultipleSelectionModelImplTest.java	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/controls/src/test/java/javafx/scene/control/MultipleSelectionModelImplTest.java	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/fxpackager/src/main/java/com/oracle/tools/packager/AbstractBundler.java	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/fxpackager/src/main/java/com/oracle/tools/packager/AbstractBundler.java	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/fxpackager/src/main/java/com/sun/javafx/tools/packager/JarSignature.java	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/fxpackager/src/main/java/com/sun/javafx/tools/packager/JarSignature.java	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/fxpackager/src/main/native/javapackager/win/javapackager.rc	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/fxpackager/src/main/native/javapackager/win/javapackager.rc	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,8 +37,8 @@
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION    JFX_VERSION
- PRODUCTVERSION JFX_VERSION
+ FILEVERSION    JFX_FVER
+ PRODUCTVERSION JFX_FVER
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -55,13 +55,15 @@
     BEGIN
         BLOCK "000004b0"
         BEGIN
-            VALUE "CompanyName",      "Oracle Corporation\0"       "\0"
-            VALUE "FileDescription",  "JavaFX(TM) Packager\0"
-            VALUE "InternalName",     "javapackager\0"
-            VALUE "LegalCopyright",   "Copyright 2014\0"     "\0"
-            VALUE "OriginalFilename", "javapackager.exe\0"
-            VALUE "ProductName",      "JavaFX(TM) Runtime\0"          "\0"
-            VALUE "ProductVersion",   XSTR(JFX_DVERSION)           "\0"
+            VALUE "CompanyName",      XSTR(JFX_COMPANY)        "\0"
+            VALUE "FileDescription",  XSTR(JFX_COMPONENT)      "\0"
+            VALUE "FileVersion",      XSTR(JFX_VER)            "\0"
+            VALUE "Full Version",     XSTR(JFX_BUILD_ID)       "\0"
+            VALUE "InternalName",     XSTR(JFX_INTERNAL_NAME)  "\0"
+            VALUE "LegalCopyright",   XSTR(JFX_COPYRIGHT)      "\0"
+            VALUE "OriginalFilename", XSTR(JFX_FNAME)          "\0"
+            VALUE "ProductName",      XSTR(JFX_NAME)           "\0"
+            VALUE "ProductVersion",   XSTR(JFX_VER)            "\0"
         END
     END
     BLOCK "VarFileInfo"
--- a/modules/fxpackager/src/main/native/library/common/Exports.cpp	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/fxpackager/src/main/native/library/common/Exports.cpp	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/modules/fxpackager/src/main/native/library/common/FilePath.cpp	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/fxpackager/src/main/native/library/common/FilePath.cpp	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/modules/fxpackager/src/main/native/library/common/FilePath.h	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/fxpackager/src/main/native/library/common/FilePath.h	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/modules/fxpackager/src/main/native/library/common/GenericPlatform.cpp	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/fxpackager/src/main/native/library/common/GenericPlatform.cpp	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/modules/fxpackager/src/main/native/library/common/GenericPlatform.h	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/fxpackager/src/main/native/library/common/GenericPlatform.h	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/modules/fxpackager/src/main/native/library/common/Helpers.cpp	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/fxpackager/src/main/native/library/common/Helpers.cpp	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/modules/fxpackager/src/main/native/library/common/Helpers.h	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/fxpackager/src/main/native/library/common/Helpers.h	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/modules/fxpackager/src/main/native/library/common/Java.cpp	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/fxpackager/src/main/native/library/common/Java.cpp	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/modules/fxpackager/src/main/native/library/common/Java.h	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/fxpackager/src/main/native/library/common/Java.h	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/modules/fxpackager/src/main/native/library/common/JavaUserPreferences.cpp	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/fxpackager/src/main/native/library/common/JavaUserPreferences.cpp	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/modules/fxpackager/src/main/native/library/common/JavaUserPreferences.h	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/fxpackager/src/main/native/library/common/JavaUserPreferences.h	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/modules/fxpackager/src/main/native/library/common/JavaVirtualMachine.h	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/fxpackager/src/main/native/library/common/JavaVirtualMachine.h	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/modules/fxpackager/src/main/native/library/common/LinuxPlatform.cpp	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/fxpackager/src/main/native/library/common/LinuxPlatform.cpp	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/modules/fxpackager/src/main/native/library/common/LinuxPlatform.h	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/fxpackager/src/main/native/library/common/LinuxPlatform.h	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/modules/fxpackager/src/main/native/library/common/Lock.h	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/fxpackager/src/main/native/library/common/Lock.h	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/modules/fxpackager/src/main/native/library/common/MacPlatform.mm	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/fxpackager/src/main/native/library/common/MacPlatform.mm	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/modules/fxpackager/src/main/native/library/common/Macros.cpp	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/fxpackager/src/main/native/library/common/Macros.cpp	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/modules/fxpackager/src/main/native/library/common/Messages.h	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/fxpackager/src/main/native/library/common/Messages.h	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/modules/fxpackager/src/main/native/library/common/Package.h	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/fxpackager/src/main/native/library/common/Package.h	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/modules/fxpackager/src/main/native/library/common/PlatformString.cpp	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/fxpackager/src/main/native/library/common/PlatformString.cpp	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/modules/fxpackager/src/main/native/library/common/PlatformString.h	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/fxpackager/src/main/native/library/common/PlatformString.h	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/modules/fxpackager/src/main/native/library/common/PropertyFile.cpp	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/fxpackager/src/main/native/library/common/PropertyFile.cpp	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/modules/fxpackager/src/main/native/library/common/PropertyFile.h	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/fxpackager/src/main/native/library/common/PropertyFile.h	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/modules/fxpackager/src/main/native/library/common/main.cpp	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/fxpackager/src/main/native/library/common/main.cpp	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
--- a/modules/fxpackager/src/main/native/tools/win/IconSwap.cpp	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/fxpackager/src/main/native/tools/win/IconSwap.cpp	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/fxpackager/src/test/java/com/oracle/tools/packager/linux/LinuxAppBundlerTest.java	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/fxpackager/src/test/java/com/oracle/tools/packager/linux/LinuxAppBundlerTest.java	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/fxpackager/src/test/java/com/oracle/tools/packager/linux/LinuxDebBundlerTest.java	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/fxpackager/src/test/java/com/oracle/tools/packager/linux/LinuxDebBundlerTest.java	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/fxpackager/src/test/java/com/oracle/tools/packager/linux/LinuxRpmBundlerTest.java	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/fxpackager/src/test/java/com/oracle/tools/packager/linux/LinuxRpmBundlerTest.java	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/fxpackager/src/test/java/com/oracle/tools/packager/windows/RuntimeFlagsParserTest.java	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/fxpackager/src/test/java/com/oracle/tools/packager/windows/RuntimeFlagsParserTest.java	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/fxpackager/src/test/java/com/oracle/tools/packager/windows/WinAppBundlerTest.java	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/fxpackager/src/test/java/com/oracle/tools/packager/windows/WinAppBundlerTest.java	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/fxpackager/src/test/java/hello/SimpleBundle.java	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/fxpackager/src/test/java/hello/SimpleBundle.java	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/fxpackager/src/test/java/hello/TestPackager.java	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/fxpackager/src/test/java/hello/TestPackager.java	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/graphics/src/dalvik/java/com/oracle/dalvik/InternalWebView.java	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/graphics/src/dalvik/java/com/oracle/dalvik/InternalWebView.java	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/graphics/src/dalvik/java/javafxports/android/DalvikLauncher.java	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/graphics/src/dalvik/java/javafxports/android/DalvikLauncher.java	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/graphics/src/dalvik/native/activity.c	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/graphics/src/dalvik/native/activity.c	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/graphics/src/main/java/com/sun/glass/ui/Application.java	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/graphics/src/main/java/com/sun/glass/ui/Application.java	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/graphics/src/main/java/com/sun/glass/ui/Cursor.java	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/graphics/src/main/java/com/sun/glass/ui/Cursor.java	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/graphics/src/main/java/com/sun/glass/ui/Screen.java	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/graphics/src/main/java/com/sun/glass/ui/Screen.java	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/graphics/src/main/java/com/sun/glass/ui/TouchInputSupport.java	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/graphics/src/main/java/com/sun/glass/ui/TouchInputSupport.java	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/graphics/src/main/java/com/sun/glass/ui/android/DalvikInput.java	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/graphics/src/main/java/com/sun/glass/ui/android/DalvikInput.java	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/graphics/src/main/java/com/sun/glass/ui/ios/IosApplication.java	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/graphics/src/main/java/com/sun/glass/ui/ios/IosApplication.java	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/graphics/src/main/java/com/sun/glass/ui/mac/MacApplication.java	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/graphics/src/main/java/com/sun/glass/ui/mac/MacApplication.java	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/graphics/src/main/java/com/sun/glass/ui/monocle/FBDevScreen.java	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/graphics/src/main/java/com/sun/glass/ui/monocle/FBDevScreen.java	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/graphics/src/main/java/com/sun/glass/ui/monocle/HeadlessScreen.java	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/graphics/src/main/java/com/sun/glass/ui/monocle/HeadlessScreen.java	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/graphics/src/main/java/com/sun/glass/ui/monocle/LinuxKeyProcessor.java	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/graphics/src/main/java/com/sun/glass/ui/monocle/LinuxKeyProcessor.java	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/graphics/src/main/java/com/sun/glass/ui/monocle/MonocleApplication.java	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/graphics/src/main/java/com/sun/glass/ui/monocle/MonocleApplication.java	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/graphics/src/main/java/com/sun/glass/ui/monocle/MonocleSettings.java	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/graphics/src/main/java/com/sun/glass/ui/monocle/MonocleSettings.java	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/graphics/src/main/java/com/sun/glass/ui/monocle/MonocleTrace.java	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/graphics/src/main/java/com/sun/glass/ui/monocle/MonocleTrace.java	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/graphics/src/main/java/com/sun/glass/ui/monocle/MonocleWindowManager.java	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/graphics/src/main/java/com/sun/glass/ui/monocle/MonocleWindowManager.java	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/graphics/src/main/java/com/sun/glass/ui/monocle/NativeScreen.java	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/graphics/src/main/java/com/sun/glass/ui/monocle/NativeScreen.java	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/graphics/src/main/java/com/sun/glass/ui/monocle/X11Screen.java	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/graphics/src/main/java/com/sun/glass/ui/monocle/X11Screen.java	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/graphics/src/main/java/com/sun/glass/ui/win/WinApplication.java	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/graphics/src/main/java/com/sun/glass/ui/win/WinApplication.java	Fri Jun 26 17:36:59 2015 -0700
@@ -94,7 +94,7 @@
                 if (PrismSettings.allowHiDPIScaling) {
                     overrideUIScale = getFloat("glass.win.uiScale", -1.0f, "Forcing UI scaling factor: ");
                     overrideRenderScale = getFloat("glass.win.renderScale", -1.0f, "Forcing Rendering scaling factor: ");
-                    minDPIScale = getFloat("glass.win.minHiDPI", 1.0f, "Threshold to enable UI scaling factor: ");
+                    minDPIScale = getFloat("glass.win.minHiDPI", 1.5f, "Threshold to enable UI scaling factor: ");
                     forceIntegerRenderScale = getBoolean("glass.win.forceIntegerRenderScale", true, "forcing integer rendering scale");
                 } else {
                     overrideUIScale = overrideRenderScale = 1.0f;
--- a/modules/graphics/src/main/java/com/sun/javafx/application/LauncherImpl.java	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/graphics/src/main/java/com/sun/javafx/application/LauncherImpl.java	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/graphics/src/main/java/com/sun/javafx/css/StyleCache.java	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/graphics/src/main/java/com/sun/javafx/css/StyleCache.java	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/graphics/src/main/java/com/sun/javafx/css/StyleCacheEntry.java	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/graphics/src/main/java/com/sun/javafx/css/StyleCacheEntry.java	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/graphics/src/main/java/com/sun/javafx/css/Stylesheet.java	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/graphics/src/main/java/com/sun/javafx/css/Stylesheet.java	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/graphics/src/main/java/com/sun/javafx/font/PrismFontFactory.java	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/graphics/src/main/java/com/sun/javafx/font/PrismFontFactory.java	Fri Jun 26 17:36:59 2015 -0700
@@ -1908,7 +1908,8 @@
     public static float getSystemFontSize() {
         if (systemFontSize == -1) {
             if (isWindows) {
-                systemFontSize = (float)getSystemFontSizeNative();
+                float uiScale = Screen.getMainScreen().getUIScale();
+                systemFontSize = getSystemFontSizeNative() / uiScale;
             } else if (isMacOSX || isIOS) {
                 systemFontSize = MacFontFinder.getSystemFontSize();
             } else if (isAndroid) {
--- a/modules/graphics/src/main/java/com/sun/javafx/iio/ImageStorage.java	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/graphics/src/main/java/com/sun/javafx/iio/ImageStorage.java	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/graphics/src/main/java/com/sun/javafx/sg/prism/NGExternalNode.java	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/graphics/src/main/java/com/sun/javafx/sg/prism/NGExternalNode.java	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/graphics/src/main/java/com/sun/javafx/sg/prism/NGRegion.java	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/graphics/src/main/java/com/sun/javafx/sg/prism/NGRegion.java	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -676,7 +676,7 @@
                 final BorderStroke stroke = strokes.get(i);
                 // We're stroking a path, so there is no point trying to figure out the length.
                 // Instead, we just pass -1, telling setBorderStyle to just do a simple stroke
-                setBorderStyle(g, stroke, -1);
+                setBorderStyle(g, stroke, -1, false);
                 final Insets insets = stroke.getInsets();
                 g.draw(resizeShape((float) insets.getTop(), (float) insets.getRight(),
                                    (float) insets.getBottom(), (float) insets.getLeft()));
@@ -1192,33 +1192,33 @@
                 // If the stroke is uniform, then that means that the style, width, and stroke of
                 // all four sides is the same.
                 if (!(topStroke instanceof Color && ((Color)topStroke).getOpacity() == 0f) && topStyle != BorderStrokeStyle.NONE) {
-                    float w = width - leftInset - rightInset;
-                    float h = height - topInset - bottomInset;
+                    float w = width - l - r;
+                    float h = height - t - b;
                     // The length of each side of the path we're going to stroke
                     final double di = 2 * radii.getTopLeftHorizontalRadius();
                     final double circle = di*Math.PI;
                     final double totalLineLength =
                             circle +
-                            2 * (width - di) +
-                            2 * (height - di);
+                            2 * (w - di) +
+                            2 * (h - di);
 
                     if (w >= 0 && h >= 0) {
-                        setBorderStyle(g, stroke, totalLineLength);
+                        setBorderStyle(g, stroke, totalLineLength, true);
                         if (radii.isUniform() && radius == 0) {
                             // We're just drawing a squared stroke on all four sides of the same style
                             // and width and color, so a simple drawRect call is all that is needed.
-                            g.drawRect(leftInset, topInset, w, h);
+                            g.drawRect(l, t, w, h);
                         } else if (radii.isUniform()) {
                             // The radii are uniform, but are not squared up, so we have to
                             // draw a rounded rectangle.
                             float ar = radius + radius;
                             if (ar > w) ar = w;
                             if (ar > h) ar = h;
-                            g.drawRoundRect(leftInset, topInset, w, h, ar, ar);
+                            g.drawRoundRect(l, t, w, h, ar, ar);
                         } else {
                             // We do not have uniform radii, so we need to create a path that represents
                             // the stroke and then draw that.
-                            g.draw(createPath(width, height, topInset, leftInset, bottomInset, rightInset, radii));
+                            g.draw(createPath(width, height, t, l, b, r, radii));
                         }
                     }
                 }
@@ -1251,7 +1251,7 @@
                                    rightWidth, height - topInset - bottomInset);
                     } else {
                         g.setStroke(createStroke(rightStyle, rightWidth, height, true));
-                        g.drawLine(width - r, topInset, width - r, height - bottomInset);
+                        g.drawLine(width - r, t, width - r, height - b);
                     }
                 }
 
@@ -1272,7 +1272,7 @@
                         g.fillRect(leftInset, topInset, leftWidth, height - topInset - bottomInset);
                     } else {
                         g.setStroke(createStroke(leftStyle, leftWidth, height, true));
-                        g.drawLine(l, topInset, l, height - bottomInset);
+                        g.drawLine(l, t, l, height - b);
                     }
                 }
             } else {
@@ -1467,26 +1467,20 @@
 
 
     /**
-     * Calls {@link #createStroke(javafx.scene.layout.BorderStrokeStyle, double, double, boolean)})
-     * with "forLine" set to false
-     */
-    private BasicStroke createStroke(BorderStrokeStyle sb, double strokeWidth, double lineLength) {
-        return createStroke(sb, strokeWidth, lineLength, false);
-    }
-
-    /**
      * Creates a Prism BasicStroke based on the stroke style, width, and line length.
      *
      * @param sb             The BorderStrokeStyle
      * @param strokeWidth    The width of the stroke we're going to draw
      * @param lineLength     The total linear length of this stroke. This is needed for
      *                       handling "dashed" and "dotted" cases, otherwise, it is ignored.
-     * @param forLine        When this is set to true, the stroke is always centered. Outer and inner stroke
-     *                       does not make any sense for line as it does not encloses any area
+     * @param forceCentered  When this is set to true, the stroke is always centered.
      *                       The "outer/inner" stroking has to be done by moving the line
      * @return A prism BasicStroke
      */
-    private BasicStroke createStroke(BorderStrokeStyle sb, double strokeWidth, double lineLength, boolean forLine) {
+    private BasicStroke createStroke(BorderStrokeStyle sb,
+                                     double strokeWidth,
+                                     double lineLength,
+                                     boolean forceCentered) {
         int cap;
         if (sb.getLineCap() == StrokeLineCap.BUTT) {
             cap = BasicStroke.CAP_BUTT;
@@ -1506,7 +1500,7 @@
         }
 
         int type;
-        if (forLine) {
+        if (forceCentered) {
             type = BasicStroke.TYPE_CENTERED;
         } else if (scaleShape) {
             // Note: this is just a workaround that allows us to avoid shape bounds computation with the given stroke.
@@ -1610,7 +1604,7 @@
         return bs;
     }
 
-    private void setBorderStyle(Graphics g, BorderStroke sb, double length) {
+    private void setBorderStyle(Graphics g, BorderStroke sb, double length, boolean forceCentered) {
         // Any one of, or all of, the sides could be 'none'.
         // Take the first side that isn't.
         final BorderWidths widths = sb.getWidths();
@@ -1635,7 +1629,8 @@
         if (bs == null || bs == BorderStrokeStyle.NONE) {
             return;
         }
-        g.setStroke(createStroke(bs, sbWidth, length));
+
+        g.setStroke(createStroke(bs, sbWidth, length, forceCentered));
         g.setPaint(sbFill);
     }
 
--- a/modules/graphics/src/main/java/com/sun/javafx/stage/ScreenHelper.java	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/graphics/src/main/java/com/sun/javafx/stage/ScreenHelper.java	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/graphics/src/main/java/com/sun/javafx/stage/WindowHelper.java	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/graphics/src/main/java/com/sun/javafx/stage/WindowHelper.java	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/graphics/src/main/java/com/sun/javafx/text/GlyphLayout.java	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/graphics/src/main/java/com/sun/javafx/text/GlyphLayout.java	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/graphics/src/main/java/com/sun/javafx/tk/ScreenConfigurationAccessor.java	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/graphics/src/main/java/com/sun/javafx/tk/ScreenConfigurationAccessor.java	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/graphics/src/main/java/com/sun/javafx/tk/TKStage.java	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/graphics/src/main/java/com/sun/javafx/tk/TKStage.java	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/GlassStage.java	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/graphics/src/main/java/com/sun/javafx/tk/quantum/GlassStage.java	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/graphics/src/main/java/com/sun/prism/impl/BaseMesh.java	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/graphics/src/main/java/com/sun/prism/impl/BaseMesh.java	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/graphics/src/main/java/com/sun/prism/j2d/print/J2DPrinterJob.java	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/graphics/src/main/java/com/sun/prism/j2d/print/J2DPrinterJob.java	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/graphics/src/main/java/com/sun/scenario/animation/shared/TimelineClipCore.java	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/graphics/src/main/java/com/sun/scenario/animation/shared/TimelineClipCore.java	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/graphics/src/main/java/javafx/print/PrinterJob.java	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/graphics/src/main/java/javafx/print/PrinterJob.java	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/graphics/src/main/java/javafx/scene/layout/HBox.java	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/graphics/src/main/java/javafx/scene/layout/HBox.java	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/graphics/src/main/java/javafx/scene/layout/VBox.java	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/graphics/src/main/java/javafx/scene/layout/VBox.java	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/graphics/src/main/java/javafx/stage/Stage.java	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/graphics/src/main/java/javafx/stage/Stage.java	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/graphics/src/main/native-font/fontpath.c	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/graphics/src/main/native-font/fontpath.c	Fri Jun 26 17:36:59 2015 -0700
@@ -741,10 +741,7 @@
     NONCLIENTMETRICSW ncmetrics;
 
     if (getSysParams(&ncmetrics)) {
-        HDC hDC = CreateDC(TEXT("DISPLAY"), NULL, NULL, NULL);
-        UINT resy = GetDeviceCaps(hDC, LOGPIXELSY);
-        DeleteDC(hDC);
-        return -ncmetrics.lfMessageFont.lfHeight * 96 / resy;
+        return -ncmetrics.lfMessageFont.lfHeight;
     } else {
         return 12;
     }
--- a/modules/graphics/src/main/native-glass/gtk/GlassApplication.cpp	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/graphics/src/main/native-glass/gtk/GlassApplication.cpp	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/graphics/src/main/native-glass/gtk/glass_dnd.h	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/graphics/src/main/native-glass/gtk/glass_dnd.h	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/graphics/src/main/native-glass/gtk/glass_window.cpp	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/graphics/src/main/native-glass/gtk/glass_window.cpp	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/graphics/src/main/native-glass/gtk/glass_window.h	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/graphics/src/main/native-glass/gtk/glass_window.h	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/graphics/src/main/native-glass/ios/GlassApplication.m	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/graphics/src/main/native-glass/ios/GlassApplication.m	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/graphics/src/main/native-glass/ios/GlassViewDelegate.m	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/graphics/src/main/native-glass/ios/GlassViewDelegate.m	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/graphics/src/main/native-glass/ios/GlassViewGL.m	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/graphics/src/main/native-glass/ios/GlassViewGL.m	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/graphics/src/main/native-glass/mac/GlassApplication.h	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/graphics/src/main/native-glass/mac/GlassApplication.h	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/graphics/src/main/native-glass/mac/GlassCursor.m	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/graphics/src/main/native-glass/mac/GlassCursor.m	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/graphics/src/main/native-glass/mac/GlassMacros.h	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/graphics/src/main/native-glass/mac/GlassMacros.h	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/graphics/src/main/native-glass/mac/GlassViewDelegate.m	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/graphics/src/main/native-glass/mac/GlassViewDelegate.m	Fri Jun 26 17:36:59 2015 -0700
@@ -189,7 +189,9 @@
     
     [self->fullscreenWindow release];
     self->fullscreenWindow = nil;
-    
+
+    [GlassTouches stopTracking:self];
+
     GET_MAIN_JENV;
     if (env != NULL)
     {
--- a/modules/graphics/src/main/native-glass/mac/GlassWindow+Java.m	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/graphics/src/main/native-glass/mac/GlassWindow+Java.m	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/graphics/src/main/native-glass/mac/GlassWindow+Overrides.m	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/graphics/src/main/native-glass/mac/GlassWindow+Overrides.m	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/graphics/src/main/native-glass/monocle/android/AndroidScreen.c	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/graphics/src/main/native-glass/monocle/android/AndroidScreen.c	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/graphics/src/main/native-glass/monocle/android/Udev.c	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/graphics/src/main/native-glass/monocle/android/Udev.c	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/graphics/src/main/native-glass/monocle/android/dalvikConst.h	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/graphics/src/main/native-glass/monocle/android/dalvikConst.h	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/graphics/src/main/native-glass/monocle/android/dalvikInput.c	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/graphics/src/main/native-glass/monocle/android/dalvikInput.c	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/graphics/src/main/native-glass/monocle/android/dalvikInput.h	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/graphics/src/main/native-glass/monocle/android/dalvikInput.h	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/graphics/src/main/native-glass/monocle/android/dalvikUtils.c	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/graphics/src/main/native-glass/monocle/android/dalvikUtils.c	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/graphics/src/main/native-glass/monocle/android/dalvikUtils.h	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/graphics/src/main/native-glass/monocle/android/dalvikUtils.h	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/graphics/src/main/native-glass/win/GlassApplication.h	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/graphics/src/main/native-glass/win/GlassApplication.h	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/graphics/src/main/native-glass/win/ViewContainer.h	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/graphics/src/main/native-glass/win/ViewContainer.h	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/graphics/src/main/native-iio/jpegloader.c	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/graphics/src/main/native-iio/jpegloader.c	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/graphics/src/main/native-prism-d3d/D3DContext.cc	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/graphics/src/main/native-prism-d3d/D3DContext.cc	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/graphics/src/main/native-prism-d3d/D3DContext.h	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/graphics/src/main/native-prism-d3d/D3DContext.h	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/graphics/src/main/native-prism-es2/PrismES2Defs.h	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/graphics/src/main/native-prism-es2/PrismES2Defs.h	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/graphics/src/main/native-prism-es2/eglWrapper/eglWrapper.c	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/graphics/src/main/native-prism-es2/eglWrapper/eglWrapper.c	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/graphics/src/main/native-prism-es2/eglWrapper/eglWrapper.h	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/graphics/src/main/native-prism-es2/eglWrapper/eglWrapper.h	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/graphics/src/main/native-prism-es2/eglfb/eglUtils.c	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/graphics/src/main/native-prism-es2/eglfb/eglUtils.c	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/graphics/src/main/native-prism-es2/ios/IOSGLContext.c	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/graphics/src/main/native-prism-es2/ios/IOSGLContext.c	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/graphics/src/main/native-prism-es2/monocle/MonocleGLFactory.c	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/graphics/src/main/native-prism-es2/monocle/MonocleGLFactory.c	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/graphics/src/main/native-prism-es2/monocle/eglUtils.c	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/graphics/src/main/native-prism-es2/monocle/eglUtils.c	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/graphics/src/main/native-prism/Helpers.c	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/graphics/src/main/native-prism/Helpers.c	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/graphics/src/main/native-prism/NativePiscesRasterizer.c	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/graphics/src/main/native-prism/NativePiscesRasterizer.c	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/graphics/src/main/resources/com/sun/prism/es2/glsl/diffuse_color.frag	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/graphics/src/main/resources/com/sun/prism/es2/glsl/diffuse_color.frag	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -56,4 +56,4 @@
 vec4 apply_diffuse() {
     return diffuseColor;
 }
-*/
\ No newline at end of file
+*/
--- a/modules/graphics/src/main/resources/com/sun/prism/es2/glsl/diffuse_texture.frag	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/graphics/src/main/resources/com/sun/prism/es2/glsl/diffuse_texture.frag	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -55,4 +55,4 @@
 vec4 apply_diffuse() {
     vec4 dTexColor = texture2D(diffuseTexture, oTexCoords);
     return dTexColor * diffuseColor; 
-}
\ No newline at end of file
+}
--- a/modules/graphics/src/main/resources/com/sun/prism/es2/glsl/main.vert	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/graphics/src/main/resources/com/sun/prism/es2/glsl/main.vert	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -74,9 +74,9 @@
     tangentFrame[2] *= (tangent.w>=0.0) ? 1.0 : -1.0;
     
     mat3 sWorldMatrix = mat3(worldMatrix[0].xyz, 
-    	 	      	     worldMatrix[1].xyz, 
-			     worldMatrix[2].xyz);
-    
+                             worldMatrix[1].xyz, 
+                             worldMatrix[2].xyz);
+
     //Translate the tangent frame to world space.
     tangentFrame[0] = sWorldMatrix * tangentFrame[0];
     tangentFrame[1] = sWorldMatrix * tangentFrame[1];
--- a/modules/graphics/src/main/resources/com/sun/prism/es2/glsl/main0Lights.frag	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/graphics/src/main/resources/com/sun/prism/es2/glsl/main0Lights.frag	Fri Jun 26 17:36:59 2015 -0700
@@ -65,4 +65,4 @@
     rez += apply_selfIllum().xyz;
 
     gl_FragColor = vec4(clamp(rez, 0.0, 1.0) , diffuse.a);
-}
\ No newline at end of file
+}
--- a/modules/graphics/src/test/java/com/sun/javafx/css/StyleManagerTest.java	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/graphics/src/test/java/com/sun/javafx/css/StyleManagerTest.java	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/graphics/src/test/java/com/sun/javafx/iio/ImageLoaderScalingTest.java	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/graphics/src/test/java/com/sun/javafx/iio/ImageLoaderScalingTest.java	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/graphics/src/test/java/com/sun/javafx/pgstub/StubStage.java	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/graphics/src/test/java/com/sun/javafx/pgstub/StubStage.java	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/graphics/src/test/java/javafx/scene/NodeTest.java	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/graphics/src/test/java/javafx/scene/NodeTest.java	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/graphics/src/test/java/javafx/scene/Parent_structure_sync_Test.java	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/graphics/src/test/java/javafx/scene/Parent_structure_sync_Test.java	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/media/src/main/java/com/sun/javafx/media/PrismMediaFrameHandler.java	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/media/src/main/java/com/sun/javafx/media/PrismMediaFrameHandler.java	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/media/src/main/native/gstreamer/gstreamer-lite/gstreamer/plugins/elements/gstqueue.c	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/media/src/main/native/gstreamer/gstreamer-lite/gstreamer/plugins/elements/gstqueue.c	Fri Jun 26 17:36:59 2015 -0700
@@ -1298,6 +1298,12 @@
               gst_flow_get_name (ret), ret));
       gst_pad_push_event (queue->srcpad, gst_event_new_eos ());
     }
+#ifdef GSTREAMER_LITE
+    else if (ret == GST_FLOW_ERROR) { // Fail immediately even if there is no eos
+      GST_ELEMENT_ERROR (queue, STREAM, FAILED, (_("Internal data flow error.")), 
+          ("streaming task paused, reason %s (%d)", gst_flow_get_name (ret), ret));
+    }
+#endif
     return;
   }
 }
--- a/modules/media/src/main/native/gstreamer/plugins/av/videodecoder.c	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/media/src/main/native/gstreamer/plugins/av/videodecoder.c	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/media/src/main/native/gstreamer/plugins/dshowwrapper/dshowwrapper.cpp	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/media/src/main/native/gstreamer/plugins/dshowwrapper/dshowwrapper.cpp	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -705,7 +705,11 @@
         return 1; // DShow may not like failures
     }
 
-    decoder->is_data_produced = TRUE;
+    if (decoder->pDSLock)
+    {
+        CAutoLock lock(decoder->pDSLock);
+        decoder->is_data_produced = TRUE;
+    }
 
     decoder->offset[pUserData->output_index] += GST_BUFFER_SIZE(pBuffer);
     GST_BUFFER_OFFSET_END(pBuffer) = decoder->offset[pUserData->output_index];
@@ -830,14 +834,20 @@
     switch (sinkEvent)
     {
     case SINK_EOS:
+    {
         if (decoder->is_eos[pUserData->output_index])
             break;
 
-        if (!decoder->is_data_produced)
+        bool error = false;
+        if (decoder->pDSLock) 
         {
+            CAutoLock lock(decoder->pDSLock);
+            if (!decoder->is_data_produced)
+                error = decoder->is_data_produced = TRUE; // Do not send more errors
+        }
+
+        if (error)
             gst_element_message_full(GST_ELEMENT(decoder), GST_MESSAGE_ERROR, GST_STREAM_ERROR, GST_STREAM_ERROR_DECODE, g_strdup("Failed to decode stream"), NULL, ("dshowwrapper.c"), ("dshowwrapper_sink_event"), 0);
-            decoder->is_data_produced = TRUE; // Do not send more errors
-        }
 
         // Deliver last buffer
         if (decoder->out_buffer[pUserData->output_index] != NULL)
@@ -860,6 +870,7 @@
 #endif
         gst_pad_push_event (decoder->srcpad[pUserData->output_index], gst_event_new_eos());
         break;
+    }
     case SINK_CODEC_DATA:
         if (pData != NULL && size > 0)
         {
@@ -2719,14 +2730,25 @@
     }
 
     // MP2T has too many small buffers and we can get false error here. We will detect stream issues at the EOS anyway.
-    if (!decoder->is_data_produced && decoder->eInputFormat != MEDIA_FORMAT_STREAM_MP2T)
+    if (decoder->pDSLock) 
     {
-        decoder->input_buffers_count++;
-        if (decoder->input_buffers_count > INPUT_BUFFERS_BEFORE_ERROR)
+        decoder->pDSLock->Lock();
+        bool unlock = true;
+        if (!decoder->is_data_produced && decoder->eInputFormat != MEDIA_FORMAT_STREAM_MP2T)
         {
-            gst_element_message_full(GST_ELEMENT(decoder), GST_MESSAGE_ERROR, GST_STREAM_ERROR, GST_STREAM_ERROR_DECODE, g_strdup("Failed to decode stream"), NULL, ("dshowwrapper.c"), ("dshowwrapper_chain"), 0);
-            decoder->is_data_produced = TRUE; // Do not send more errors
+            decoder->input_buffers_count++;
+            if (decoder->input_buffers_count > INPUT_BUFFERS_BEFORE_ERROR)
+            {
+                decoder->is_data_produced = TRUE; // Do not send more errors
+                unlock = false;
+                decoder->pDSLock->Unlock();
+
+                gst_element_message_full(GST_ELEMENT(decoder), GST_MESSAGE_ERROR, GST_STREAM_ERROR, GST_STREAM_ERROR_DECODE, g_strdup("Failed to decode stream"), NULL, ("dshowwrapper.c"), ("dshowwrapper_chain"), 0);
+            }
         }
+
+        if (unlock)
+            decoder->pDSLock->Unlock();
     }
 
     if (decoder->force_discontinuity)
@@ -2738,8 +2760,12 @@
 
     if (decoder->is_flushing)
         ret = GST_FLOW_WRONG_STATE;
-    else if (FAILED(decoder->pSrc->DeliverSample(buf)))
-        ret = GST_FLOW_ERROR;
+    else 
+    {
+        HRESULT hres = decoder->pSrc->DeliverSample(buf);
+        if (hres != S_OK && hres != E_FAIL)
+            ret = GST_FLOW_ERROR;
+    }
 
     return ret;
 }
@@ -2883,6 +2909,7 @@
                 decoder->pMediaControl->Run();
 
             decoder->is_flushing = FALSE;
+            decoder->is_data_produced = FALSE;
         }
         break;
     case GST_EVENT_EOS:
--- a/modules/media/src/main/native/gstreamer/plugins/vp6/flvdemux.c	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/media/src/main/native/gstreamer/plugins/vp6/flvdemux.c	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -874,10 +874,6 @@
         }
     }
 
-    if (result == GST_FLOW_ERROR) {
-        gst_element_message_full(GST_ELEMENT(filter), GST_MESSAGE_ERROR, GST_STREAM_ERROR, GST_STREAM_ERROR_DEMUX, g_strdup("Failed to demux FLV stream"), NULL, ("flvdemux.c"), ("flv_demux_parse_next_block"), 0);
-    }
-
     return result;
 }
 
--- a/modules/media/src/main/native/jfxmedia/platform/gstreamer/GstAudioPlaybackPipeline.cpp	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/media/src/main/native/jfxmedia/platform/gstreamer/GstAudioPlaybackPipeline.cpp	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/swing/src/main/java/javafx/embed/swing/SwingNode.java	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/swing/src/main/java/javafx/embed/swing/SwingNode.java	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/swt/src/main/java/javafx/embed/swt/FXCanvas.java	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/swt/src/main/java/javafx/embed/swt/FXCanvas.java	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/web/src/android/java/com/sun/webkit/NativeWebView.java	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/web/src/android/java/com/sun/webkit/NativeWebView.java	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/web/src/android/java/com/sun/webkit/WebPage.java	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/web/src/android/java/com/sun/webkit/WebPage.java	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/web/src/android/native/android_webview.c	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/web/src/android/native/android_webview.c	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/web/src/android/native/android_webview.h	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/web/src/android/native/android_webview.h	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/web/src/android/native/native_webview.c	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/web/src/android/native/native_webview.c	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/web/src/ios/java/com/sun/javafx/scene/web/behavior/HTMLEditorBehavior.java	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/web/src/ios/java/com/sun/javafx/scene/web/behavior/HTMLEditorBehavior.java	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/web/src/ios/java/com/sun/javafx/scene/web/skin/HTMLEditorSkin.java	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/web/src/ios/java/com/sun/javafx/scene/web/skin/HTMLEditorSkin.java	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/web/src/ios/java/javafx/scene/web/JS2JavaBridge.java	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/web/src/ios/java/javafx/scene/web/JS2JavaBridge.java	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/web/src/ios/java/javafx/scene/web/PopupFeatures.java	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/web/src/ios/java/javafx/scene/web/PopupFeatures.java	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/web/src/ios/java/javafx/scene/web/PromptData.java	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/web/src/ios/java/javafx/scene/web/PromptData.java	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/web/src/ios/java/javafx/scene/web/WebEngine.java	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/web/src/ios/java/javafx/scene/web/WebEngine.java	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/web/src/ios/java/javafx/scene/web/WebErrorEvent.java	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/web/src/ios/java/javafx/scene/web/WebErrorEvent.java	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/web/src/ios/java/javafx/scene/web/WebEvent.java	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/web/src/ios/java/javafx/scene/web/WebEvent.java	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/web/src/ios/java/javafx/scene/web/WebView.java	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/web/src/ios/java/javafx/scene/web/WebView.java	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/web/src/ios/native/WebViewImpl.h	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/web/src/ios/native/WebViewImpl.h	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/web/src/ios/native/WebViewImpl.m	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/web/src/ios/native/WebViewImpl.m	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/web/src/main/java/com/sun/javafx/webkit/UIClientImpl.java	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/web/src/main/java/com/sun/javafx/webkit/UIClientImpl.java	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/web/src/main/java/com/sun/javafx/webkit/prism/WCRenderQueueImpl.java	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/web/src/main/java/com/sun/javafx/webkit/prism/WCRenderQueueImpl.java	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/web/src/main/java/com/sun/webkit/WCPasteboard.java	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/web/src/main/java/com/sun/webkit/WCPasteboard.java	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/web/src/main/java/com/sun/webkit/WebPage.java	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/web/src/main/java/com/sun/webkit/WebPage.java	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/web/src/main/java/com/sun/webkit/graphics/GraphicsDecoder.java	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/web/src/main/java/com/sun/webkit/graphics/GraphicsDecoder.java	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/web/src/main/java/com/sun/webkit/graphics/RenderTheme.java	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/web/src/main/java/com/sun/webkit/graphics/RenderTheme.java	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/web/src/main/java/com/sun/webkit/graphics/ScrollBarTheme.java	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/web/src/main/java/com/sun/webkit/graphics/ScrollBarTheme.java	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/web/src/main/java/com/sun/webkit/graphics/WCRenderQueue.java	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/web/src/main/java/com/sun/webkit/graphics/WCRenderQueue.java	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/web/src/main/java/com/sun/webkit/network/URLLoader.java	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/web/src/main/java/com/sun/webkit/network/URLLoader.java	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/modules/web/src/main/native/Source/JavaScriptCore/runtime/WatchdogJava.cpp	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/web/src/main/native/Source/JavaScriptCore/runtime/WatchdogJava.cpp	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  */
 
 #include "config.h"
@@ -19,7 +19,7 @@
 
 void Watchdog::initTimer()
 {
-    JNIEnv* env = JavaScriptCore_GetJavaEnv();
+    JSC_GETJAVAENV_CHKRET(env);
 
     static jmethodID mid = env->GetStaticMethodID(
             GetWatchdogTimerClass(env),
@@ -36,7 +36,7 @@
 
 void Watchdog::destroyTimer()
 {
-    JNIEnv* env = JavaScriptCore_GetJavaEnv();
+    JSC_GETJAVAENV_CHKRET(env);
 
     static jmethodID mid = env->GetMethodID(
             GetWatchdogTimerClass(env),
@@ -52,7 +52,7 @@
 
 void Watchdog::startTimer(double limit)
 {
-    JNIEnv* env = JavaScriptCore_GetJavaEnv();
+    JSC_GETJAVAENV_CHKRET(env);
 
     static jmethodID mid = env->GetMethodID(
             GetWatchdogTimerClass(env),
@@ -66,7 +66,7 @@
 
 void Watchdog::stopTimer()
 {
-    JNIEnv* env = JavaScriptCore_GetJavaEnv();
+    JSC_GETJAVAENV_CHKRET(env);
 
     static jmethodID mid = env->GetMethodID(
             GetWatchdogTimerClass(env),
--- a/modules/web/src/main/native/Source/WTF/wtf/java/JavaRef.h	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/web/src/main/native/Source/WTF/wtf/java/JavaRef.h	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  */
 #ifndef JavaRef_h
 #define JavaRef_h
@@ -18,6 +18,10 @@
     return 0;
 }
 
+#define JSC_GETJAVAENV_CHKRET(_env_var, ... /* ret val */)   \
+    JNIEnv* _env_var = JavaScriptCore_GetJavaEnv(); \
+    if (!_env_var) return __VA_ARGS__;
+
 extern bool CheckAndClearException(JNIEnv* env);
 
 #define jlong_to_ptr(a) ((void*)(uintptr_t)(a))
--- a/modules/web/src/main/native/Source/WTF/wtf/java/MainThreadJava.cpp	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/web/src/main/native/Source/WTF/wtf/java/MainThreadJava.cpp	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  */
 #include "config.h"
 #include "MainThreadJava.h"
@@ -16,7 +16,7 @@
 namespace WTF {
     void scheduleDispatchFunctionsOnMainThread()
     {
-        JNIEnv* env = JavaScriptCore_GetJavaEnv();
+	JSC_GETJAVAENV_CHKRET(env);
 
         static JGClass jMainThreadCls(env->FindClass("com/sun/webkit/MainThread"));
 
--- a/modules/web/src/main/native/Source/WebCore/bindings/java/JavaEventListener.cpp	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/web/src/main/native/Source/WebCore/bindings/java/JavaEventListener.cpp	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  */
 #include "config.h"
 
@@ -51,7 +51,7 @@
 
 JavaEventListener::~JavaEventListener()
 {
-    JNIEnv* env = WebCore_GetJavaEnv();
+    WC_GETJAVAENV_CHKRET(env);
 
     JGClass eli(env->FindClass("com/sun/webkit/dom/EventListenerImpl"));
     static jmethodID midDispose(env->GetStaticMethodID(
--- a/modules/web/src/main/native/Source/WebCore/platform/graphics/java/BitmapImageJava.cpp	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/web/src/main/native/Source/WebCore/platform/graphics/java/BitmapImageJava.cpp	Fri Jun 26 17:36:59 2015 -0700
@@ -26,7 +26,7 @@
 
     if (m_frame) {
 #if USE(IMAGEIO)
-        JNIEnv* env = WebCore_GetJavaEnv();
+	WC_GETJAVAENV_CHKRET(env, false);
         static jmethodID midDestroyDecodedData = env->GetMethodID(
                 JLClass(env->GetObjectClass(*m_frame)),
                 "destroyDecodedData",
@@ -60,10 +60,8 @@
 
 PassRefPtr<Image> BitmapImage::createFromName(const char* name)
 {
-    JNIEnv* env = WebCore_GetJavaEnv();
-    if (!env)
-        return NULL;
-
+    WC_GETJAVAENV_CHKRET(env, NULL);
+    
     RefPtr<BitmapImage> img(create());
 
 #if USE(IMAGEIO)
--- a/modules/web/src/main/native/Source/WebCore/platform/graphics/java/MediaPlayerPrivateJava.cpp	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/web/src/main/native/Source/WebCore/platform/graphics/java/MediaPlayerPrivateJava.cpp	Fri Jun 26 17:36:59 2015 -0700
@@ -251,7 +251,7 @@
 
 MediaPlayerPrivate::~MediaPlayerPrivate()
 {
-    JNIEnv* env = WebCore_GetJavaEnv();
+    WC_GETJAVAENV_CHKRET(env);
     static jmethodID s_mID
         = env->GetMethodID(PG_GetMediaPlayerClass(env), "fwkDispose", "()V");
     ASSERT(s_mID);
--- a/modules/web/src/main/native/Source/WebCore/platform/graphics/java/RenderingQueue.h	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/web/src/main/native/Source/WebCore/platform/graphics/java/RenderingQueue.h	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  */
 #ifndef RenderingQueue_h
 #define RenderingQueue_h
--- a/modules/web/src/main/native/Source/WebCore/platform/java/EventLoopJava.cpp	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/web/src/main/native/Source/WebCore/platform/java/EventLoopJava.cpp	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  */
 #include "config.h"
 #include "EventLoop.h"
@@ -25,7 +25,7 @@
 
 void EventLoop::cycle()
 {
-    JNIEnv* env = WebCore_GetJavaEnv();
+    WC_GETJAVAENV_CHKRET(env);
     initRefs(env);
 
     env->CallStaticVoidMethod(eventLoopClass, cycleMethod);
--- a/modules/web/src/main/native/Source/WebCore/platform/java/FrameLoaderClientJava.cpp	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/web/src/main/native/Source/WebCore/platform/java/FrameLoaderClientJava.cpp	Fri Jun 26 17:36:59 2015 -0700
@@ -161,7 +161,7 @@
 void FrameLoaderClientJava::destroyIfNeeded() {
     if (m_FrameLoaderClientDestroyed && m_ProgressTrackerClientDestroyed) {
 
-        JNIEnv* env = WebCore_GetJavaEnv();
+	WC_GETJAVAENV_CHKRET(env);
         initRefs(env);
 
         ASSERT(m_webPage);
--- a/modules/web/src/main/native/Source/WebCore/platform/java/JavaEnv.h	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/web/src/main/native/Source/WebCore/platform/java/JavaEnv.h	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  */
 #ifndef JavaEnv_h
 #define JavaEnv_h
@@ -17,6 +17,10 @@
     return (JNIEnv*)env;
 }
 
+#define WC_GETJAVAENV_CHKRET(_env_var, ... /* ret val */)	\
+    JNIEnv* _env_var = WebCore_GetJavaEnv(); \
+    if (!_env_var) return __VA_ARGS__;
+
 bool CheckAndClearException(JNIEnv* env);
 
 namespace WebCore {
--- a/modules/web/src/main/native/Source/WebCore/platform/java/PopupMenuJava.cpp	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/web/src/main/native/Source/WebCore/platform/java/PopupMenuJava.cpp	Fri Jun 26 17:36:59 2015 -0700
@@ -52,8 +52,8 @@
     if (!m_popup)
         return;
 
-    JNIEnv* env = WebCore_GetJavaEnv();
-
+    WC_GETJAVAENV_CHKRET(env);
+    
     static jmethodID mid = env->GetMethodID(getJPopupMenuClass(),
         "fwkDestroy", "()V");
     ASSERT(mid);
--- a/modules/web/src/main/native/Source/WebCore/platform/java/SharedTimerJava.cpp	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/web/src/main/native/Source/WebCore/platform/java/SharedTimerJava.cpp	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  */
 #include "config.h"
 
@@ -26,7 +26,7 @@
     if (fireTime < MINIMAL_INTERVAL) {
         fireTime = MINIMAL_INTERVAL;
     }
-    JNIEnv* env = WebCore_GetJavaEnv();
+    WC_GETJAVAENV_CHKRET(env);
 
     static jmethodID mid = env->GetStaticMethodID(getTimerClass(env),
                                                   "fwkSetFireTime", "(D)V");
@@ -38,8 +38,8 @@
 
 void stopSharedTimer()
 {
-    JNIEnv* env = WebCore_GetJavaEnv();
-
+    WC_GETJAVAENV_CHKRET(env);
+    
     static jmethodID mid = env->GetStaticMethodID(getTimerClass(env),
                                                   "fwkStopTimer", "()V");
     ASSERT(mid);
--- a/modules/web/src/main/native/Source/WebCore/platform/java/SoundJava.cpp	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/web/src/main/native/Source/WebCore/platform/java/SoundJava.cpp	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  */
 #include "config.h"
 
@@ -11,8 +11,8 @@
 
 void systemBeep()
 {
-    JNIEnv* env = WebCore_GetJavaEnv();
-
+    WC_GETJAVAENV_CHKRET(env);
+    
     JLClass cls( env->FindClass("java/awt/Toolkit") );
     ASSERT(cls);
 
--- a/modules/web/src/main/native/Source/WebCore/platform/java/TextCodecJava.cpp	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/web/src/main/native/Source/WebCore/platform/java/TextCodecJava.cpp	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  */
 #include "config.h"
 #include "TextCodecJava.h"
@@ -26,7 +26,7 @@
 
 static JNIEnv* setUpCodec() {
     JNIEnv* env = WebCore_GetJavaEnv();
-
+    
     if (!textCodecClass) {
         textCodecClass =  JLClass(env->FindClass("com/sun/webkit/text/TextCodec"));
         ASSERT(textCodecClass);
@@ -129,7 +129,7 @@
 
 TextCodecJava::~TextCodecJava()
 {
-    JNIEnv* env = WebCore_GetJavaEnv();
+    WC_GETJAVAENV_CHKRET(env);
 
     if (m_codec) {
         env->DeleteGlobalRef(m_codec);
--- a/modules/web/src/main/native/Source/WebCore/platform/java/api/BackForwardListJava.cpp	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/web/src/main/native/Source/WebCore/platform/java/api/BackForwardListJava.cpp	Fri Jun 26 17:36:59 2015 -0700
@@ -92,8 +92,8 @@
 }
 
 void notifyHistoryItemDestroyed(const JLObject &host)
-{
-    JNIEnv* env = WebCore_GetJavaEnv();
+{    
+    WC_GETJAVAENV_CHKRET(env);
     static jmethodID notifyItemDestroyedMID =
             initMethod(env, getJEntryClass(), "notifyItemDestroyed", "()V");
     if (host) {
--- a/modules/web/src/main/native/Source/WebCore/platform/network/java/SocketStreamHandleJava.cpp	Thu Jun 25 02:26:46 2015 -0700
+++ b/modules/web/src/main/native/Source/WebCore/platform/network/java/SocketStreamHandleJava.cpp	Fri Jun 26 17:36:59 2015 -0700
@@ -50,7 +50,7 @@
 
 SocketStreamHandle::~SocketStreamHandle()
 {
-    JNIEnv* env = WebCore_GetJavaEnv();
+    WC_GETJAVAENV_CHKRET(env);
 
     static jmethodID mid = env->GetMethodID(
             GetSocketStreamHandleClass(env),
--- a/tests/system/src/test/java/javafx/scene/layout/RegionBackgroundFillUITest.java	Thu Jun 25 02:26:46 2015 -0700
+++ b/tests/system/src/test/java/javafx/scene/layout/RegionBackgroundFillUITest.java	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
--- a/tests/system/src/test/java/javafx/scene/text/TextNodeTest.java	Thu Jun 25 02:26:46 2015 -0700
+++ b/tests/system/src/test/java/javafx/scene/text/TextNodeTest.java	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,18 +25,34 @@
 
 package javafx.scene.text;
 
+import com.sun.javafx.application.PlatformImpl;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
 import javafx.geometry.Bounds;
 import javafx.geometry.VPos;
 import javafx.scene.shape.LineTo;
 import javafx.scene.shape.MoveTo;
 import javafx.scene.shape.PathElement;
 
+import org.junit.BeforeClass;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
 public class TextNodeTest {
 
-    public TextNodeTest() {
+    @BeforeClass
+    public static void initFX() {
+        final CountDownLatch startupLatch = new CountDownLatch(1);
+        PlatformImpl.startup(() -> {
+            startupLatch.countDown();
+        });
+        try {
+            if (!startupLatch.await(5, TimeUnit.SECONDS)) {
+                fail("Timeout waiting for FX runtime to start");
+            }
+        } catch (InterruptedException ex) {
+            fail("Unexpected exception: " + ex);
+        }
     }
 
     @Test public void testBounds() {
--- a/tests/system/src/test/java/javafx/stage/ShowAndWaitTest.java	Thu Jun 25 02:26:46 2015 -0700
+++ b/tests/system/src/test/java/javafx/stage/ShowAndWaitTest.java	Fri Jun 26 17:36:59 2015 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it