diff --git a/org.jrebirth.presentation.javafx2/JFX Presentation.launch b/org.jrebirth.presentation.javafx2/JFX Presentation.launch
new file mode 100644
index 0000000..a4593d4
--- /dev/null
+++ b/org.jrebirth.presentation.javafx2/JFX Presentation.launch	
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/org.jrebirth.presentation.javafx2/src/main/java/org/jrebirth/presentation/javafx/Presentation.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
+<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
+<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jrebirth.presentation.javafx.Presentation"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.jrebirth.presentation.javafx2"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
+<stringAttribute key="yk-options" value="&#13;&#10;additional-options2=onexit\=snapshot&#13;&#10;"/>
+</launchConfiguration>
diff --git a/org.jrebirth.presentation.javafx2/pom.xml b/org.jrebirth.presentation.javafx2/pom.xml
index 38db830..dec7830 100644
--- a/org.jrebirth.presentation.javafx2/pom.xml
+++ b/org.jrebirth.presentation.javafx2/pom.xml
@@ -217,13 +217,13 @@
 		<dependency>
 			<groupId>org.jrebirth</groupId>
 			<artifactId>core</artifactId>
-			<version>0.6.0-SNAPSHOT</version>
+			<version>0.7.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.jrebirth</groupId>
 			<artifactId>presentation</artifactId>
-			<version>0.6.0-SNAPSHOT</version>
+			<version>0.7.0-SNAPSHOT</version>
 		</dependency>
 
 
diff --git a/org.jrebirth.presentation.javafx2/src/main/java/org/jrebirth/presentation/javafx/JfxColors.java b/org.jrebirth.presentation.javafx2/src/main/java/org/jrebirth/presentation/javafx/JfxColors.java
index 1da1349..b66b1a7 100644
--- a/org.jrebirth.presentation.javafx2/src/main/java/org/jrebirth/presentation/javafx/JfxColors.java
+++ b/org.jrebirth.presentation.javafx2/src/main/java/org/jrebirth/presentation/javafx/JfxColors.java
@@ -2,9 +2,9 @@
 
 import javafx.scene.paint.Color;
 
-import org.jrebirth.core.resource.ResourceFactories;
+import org.jrebirth.core.resource.ResourceBuilders;
+import org.jrebirth.core.resource.color.ColorBuilder;
 import org.jrebirth.core.resource.color.ColorEnum;
-import org.jrebirth.core.resource.color.ColorFactory;
 import org.jrebirth.core.resource.color.ColorParams;
 import org.jrebirth.core.resource.color.RGB255Color;
 import org.jrebirth.core.resource.color.WebColor;
@@ -51,7 +51,7 @@ public Color get() {
      * {@inheritDoc}
      */
     @Override
-    public ColorFactory factory() {
-        return (ColorFactory) ResourceFactories.COLOR_FACTORY.use();
+    public ColorBuilder factory() {
+        return (ColorBuilder) ResourceBuilders.COLOR_BUILDER.use();
     }
 }
diff --git a/org.jrebirth.presentation.javafx2/src/main/java/org/jrebirth/presentation/javafx/JfxFonts.java b/org.jrebirth.presentation.javafx2/src/main/java/org/jrebirth/presentation/javafx/JfxFonts.java
index 5817cab..ac9f23c 100644
--- a/org.jrebirth.presentation.javafx2/src/main/java/org/jrebirth/presentation/javafx/JfxFonts.java
+++ b/org.jrebirth.presentation.javafx2/src/main/java/org/jrebirth/presentation/javafx/JfxFonts.java
@@ -2,9 +2,9 @@
 
 import javafx.scene.text.Font;
 
-import org.jrebirth.core.resource.ResourceFactories;
+import org.jrebirth.core.resource.ResourceBuilders;
+import org.jrebirth.core.resource.font.FontBuilder;
 import org.jrebirth.core.resource.font.FontEnum;
-import org.jrebirth.core.resource.font.FontFactory;
 import org.jrebirth.core.resource.font.FontParams;
 import org.jrebirth.core.resource.font.RealFont;
 import org.jrebirth.presentation.FontsLoader;
@@ -28,7 +28,7 @@ public enum JfxFonts implements FontEnum {
 
     /** The typewriter font. */
     TYPEWRITER(new RealFont(FontsLoader.Report_1942, 72)),
-    
+
     /** The typewriter font. */
     TYPEWRITER2(new RealFont(FontsLoader.OliJo, 72)),
 
@@ -56,8 +56,8 @@ public Font get() {
      * {@inheritDoc}
      */
     @Override
-    public FontFactory factory() {
-        return (FontFactory) ResourceFactories.FONT_FACTORY.use();
+    public FontBuilder factory() {
+        return (FontBuilder) ResourceBuilders.FONT_BUILDER.use();
     }
 
 }