diff --git a/.classpath b/.classpath
index f6a74d0..cca1874 100644
--- a/.classpath
+++ b/.classpath
@@ -2,7 +2,7 @@
 <classpath>
 	<classpathentry kind="src" path="javasource"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="C:/Program Files (x86)/Mendix/5.6.0/runtime/bundles/biz.aQute.bnd.annotation.jar"/><classpathentry kind="lib" path="C:/Program Files (x86)/Mendix/5.6.0/runtime/bundles/org.scala-lang.scala-library.jar"/><classpathentry kind="lib" path="C:/Program Files (x86)/Mendix/5.6.0/runtime/bundles/json.jar"/><classpathentry kind="lib" path="C:/Program Files (x86)/Mendix/5.6.0/runtime/bundles/logging.jar"/><classpathentry kind="lib" path="C:/Program Files (x86)/Mendix/5.6.0/runtime/bundles/m2ee-api.jar"/><classpathentry kind="lib" path="C:/Program Files (x86)/Mendix/5.6.0/runtime/bundles/mxruntime.jar"/><classpathentry kind="lib" path="C:/Program Files (x86)/Mendix/5.6.0/runtime/bundles/integration.jar"/><classpathentry kind="lib" path="C:/Program Files (x86)/Mendix/5.6.0/runtime/bundles/osgi.cmpn.jar"/><classpathentry kind="lib" path="C:/Program Files (x86)/Mendix/5.6.0/runtime/bundles/webui.jar"/><classpathentry kind="lib" path="C:/Program Files (x86)/Mendix/5.6.0/runtime/bundles/javax.servlet.jar"/>
+	<classpathentry kind="lib" path="C:/Program Files (x86)/Mendix/5.12.0/runtime/bundles/biz.aQute.bnd.annotation.jar"/><classpathentry kind="lib" path="C:/Program Files (x86)/Mendix/5.12.0/runtime/bundles/org.scala-lang.scala-library.jar"/><classpathentry kind="lib" path="C:/Program Files (x86)/Mendix/5.12.0/runtime/bundles/json.jar"/><classpathentry kind="lib" path="C:/Program Files (x86)/Mendix/5.12.0/runtime/bundles/logging.jar"/><classpathentry kind="lib" path="C:/Program Files (x86)/Mendix/5.12.0/runtime/bundles/m2ee-api.jar"/><classpathentry kind="lib" path="C:/Program Files (x86)/Mendix/5.12.0/runtime/bundles/mxruntime.jar"/><classpathentry kind="lib" path="C:/Program Files (x86)/Mendix/5.12.0/runtime/bundles/integration.jar"/><classpathentry kind="lib" path="C:/Program Files (x86)/Mendix/5.12.0/runtime/bundles/osgi.cmpn.jar"/><classpathentry kind="lib" path="C:/Program Files (x86)/Mendix/5.12.0/runtime/bundles/webui.jar"/><classpathentry kind="lib" path="C:/Program Files (x86)/Mendix/5.12.0/runtime/bundles/javax.servlet.jar"/>
 	
 	<classpathentry kind="output" path="deployment/run/bin"/>
 </classpath>
diff --git a/Bootswatch.mpr b/Bootswatch.mpr
index f335fe4..c1f6f18 100644
Binary files a/Bootswatch.mpr and b/Bootswatch.mpr differ
diff --git a/MxBootswatch.launch b/MxBootswatch.launch
index ac23eb9..01de81a 100644
--- a/MxBootswatch.launch
+++ b/MxBootswatch.launch
@@ -10,9 +10,9 @@
 <mapEntry key="M2EE_ADMIN_PASS" value="1"/>
 <mapEntry key="M2EE_ADMIN_PORT" value="8090"/>
 <mapEntry key="M2EE_ADMIN_LISTEN_ADDRESSES" value="*"/>
-<mapEntry key="M2EE_CONSOLE_PATH" value="C:/Program Files (x86)/Mendix/5.6.0/modeler/MendixConsoleLog.exe"/>
+<mapEntry key="M2EE_CONSOLE_PATH" value="C:/Program Files (x86)/Mendix/5.12.0/modeler/MendixConsoleLog.exe"/>
 <mapEntry key="MXCONSOLE_BASE_PATH" value="//psf/Home/Documents/GitHub/MxBootswatch/deployment"/>
-<mapEntry key="MXCONSOLE_RUNTIME_PATH" value="C:/Program Files (x86)/Mendix/5.6.0/runtime"/>
+<mapEntry key="MXCONSOLE_RUNTIME_PATH" value="C:/Program Files (x86)/Mendix/5.12.0/runtime"/>
 <mapEntry key="MXCONSOLE_RUNTIME_PORT" value="8080"/>
 <mapEntry key="MXCONSOLE_RUNTIME_LISTEN_ADDRESSES" value="*"/>
 <mapEntry key="MXCONSOLE_SERVER_URL" value="http://127.0.0.1:8090/"/>
@@ -21,12 +21,12 @@
 <stringAttribute key="org.eclipse.debug.core.source_locator_memento" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;sourceLookupDirector&gt;&#13;&#10;&lt;sourceContainers duplicates=&quot;false&quot;&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;javaProject name=&amp;quot;MxBootswatch&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.javaProject&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;default/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.debug.core.containerType.default&quot;/&gt;&#13;&#10;&lt;/sourceContainers&gt;&#13;&#10;&lt;/sourceLookupDirector&gt;&#13;&#10;"/>
 <listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.eclipse.jdt.launching.JRE_CONTAINER&quot; javaProject=&quot;MxBootswatch&quot; path=&quot;1&quot; type=&quot;4&quot;/&gt;&#13;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry externalArchive=&quot;C:/Program Files (x86)/Mendix/5.6.0/runtime/felix/bin/felix.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry externalArchive=&quot;C:/Program Files (x86)/Mendix/5.6.0/runtime/lib/com.mendix.xml-apis-1.4.1.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry externalArchive=&quot;C:/Program Files (x86)/Mendix/5.12.0/runtime/felix/bin/felix.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry externalArchive=&quot;C:/Program Files (x86)/Mendix/5.12.0/runtime/lib/com.mendix.xml-apis-1.4.1.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
 </listAttribute>
 <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.apache.felix.main.Main"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="MxBootswatch"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Djava.net.preferIPv4Stack=true -Djava.library.path=&quot;C:/Program Files (x86)/Mendix/5.6.0/runtime/lib/x64;//psf/Home/Documents/GitHub/MxBootswatch/deployment/model/lib/userlib&quot; -Dfile.encoding=UTF-8 -Djava.io.tmpdir=&quot;//psf/Home/Documents/GitHub/MxBootswatch/deployment/data/tmp&quot; -Djava.security.policy==&quot;\\psf\Home\Documents\GitHub\MxBootswatch\deployment\data\.policy&quot; -Dorg.osgi.framework.security=&quot;osgi&quot; -Dcom.mendix.policy.file=&quot;\\psf\Home\Documents\GitHub\MxBootswatch\deployment\data\security.policy&quot; -Dfelix.config.properties=file:run/felixconfig.properties -Dorg.osgi.service.http.port=8080"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Djava.net.preferIPv4Stack=true -Djava.library.path=&quot;C:/Program Files (x86)/Mendix/5.12.0/runtime/lib/x64;//psf/Home/Documents/GitHub/MxBootswatch/deployment/model/lib/userlib&quot; -Dfile.encoding=UTF-8 -Djava.io.tmpdir=&quot;//psf/Home/Documents/GitHub/MxBootswatch/deployment/data/tmp&quot; -Djava.security.policy==&quot;\\psf\Home\Documents\GitHub\MxBootswatch\deployment\data\.policy&quot; -Dorg.osgi.framework.security=&quot;osgi&quot; -Dcom.mendix.policy.file=&quot;\\psf\Home\Documents\GitHub\MxBootswatch\deployment\data\security.policy&quot; -Dfelix.config.properties=file:run/felixconfig.properties -Dorg.osgi.service.http.port=8080"/>
 <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="//psf/Home/Documents/GitHub/MxBootswatch/deployment"/>
 </launchConfiguration>
\ No newline at end of file
diff --git a/dist/Bootswatch-4.0.mpk b/dist/Bootswatch-4.0.mpk
new file mode 100644
index 0000000..6700588
Binary files /dev/null and b/dist/Bootswatch-4.0.mpk differ
diff --git a/javasource/administration/proxies/Account.java b/javasource/administration/proxies/Account.java
index 5537209..56b1b2f 100644
--- a/javasource/administration/proxies/Account.java
+++ b/javasource/administration/proxies/Account.java
@@ -25,7 +25,18 @@ public class Account extends system.proxies.User
 	 */
 	public enum MemberNames
 	{
-		FullName("FullName");
+		FullName("FullName"),
+		Name("Name"),
+		Password("Password"),
+		LastLogin("LastLogin"),
+		Blocked("Blocked"),
+		Active("Active"),
+		FailedLogins("FailedLogins"),
+		WebServiceUser("WebServiceUser"),
+		IsAnonymous("IsAnonymous"),
+		UserRoles("System.UserRoles"),
+		User_Language("System.User_Language"),
+		User_TimeZone("System.User_TimeZone");
 
 		private String metaName;
 
diff --git a/javasource/bootswatch/proxies/Theme.java b/javasource/bootswatch/proxies/Theme.java
index 268ab52..570ba36 100644
--- a/javasource/bootswatch/proxies/Theme.java
+++ b/javasource/bootswatch/proxies/Theme.java
@@ -28,7 +28,13 @@ public enum MemberNames
 		PreviewUrl("PreviewUrl"),
 		ThemeName("ThemeName"),
 		TagLine("TagLine"),
-		DevicePreview("DevicePreview");
+		DevicePreview("DevicePreview"),
+		PublicThumbnailPath("PublicThumbnailPath"),
+		FileID("FileID"),
+		Name("Name"),
+		DeleteAfterDownload("DeleteAfterDownload"),
+		Contents("Contents"),
+		HasContents("HasContents");
 
 		private String metaName;
 
diff --git a/javasource/bootswatch/proxies/ThemePackage.java b/javasource/bootswatch/proxies/ThemePackage.java
index 0d01fbb..cc82c66 100644
--- a/javasource/bootswatch/proxies/ThemePackage.java
+++ b/javasource/bootswatch/proxies/ThemePackage.java
@@ -27,6 +27,11 @@ public enum MemberNames
 	{
 		Minified("Minified"),
 		Defaulttheme("Defaulttheme"),
+		FileID("FileID"),
+		Name("Name"),
+		DeleteAfterDownload("DeleteAfterDownload"),
+		Contents("Contents"),
+		HasContents("HasContents"),
 		ThemePackage_Theme("Bootswatch.ThemePackage_Theme");
 
 		private String metaName;
diff --git a/javasource/system/proxies/Image.java b/javasource/system/proxies/Image.java
index 05e8c17..5944b07 100644
--- a/javasource/system/proxies/Image.java
+++ b/javasource/system/proxies/Image.java
@@ -25,7 +25,12 @@ public class Image extends system.proxies.FileDocument
 	 */
 	public enum MemberNames
 	{
-		PublicThumbnailPath("PublicThumbnailPath");
+		PublicThumbnailPath("PublicThumbnailPath"),
+		FileID("FileID"),
+		Name("Name"),
+		DeleteAfterDownload("DeleteAfterDownload"),
+		Contents("Contents"),
+		HasContents("HasContents");
 
 		private String metaName;
 
diff --git a/javasource/system/proxies/SoapFault.java b/javasource/system/proxies/SoapFault.java
index b398b7d..8282c0f 100644
--- a/javasource/system/proxies/SoapFault.java
+++ b/javasource/system/proxies/SoapFault.java
@@ -29,7 +29,10 @@ public enum MemberNames
 		Reason("Reason"),
 		Node("Node"),
 		Role("Role"),
-		Detail("Detail");
+		Detail("Detail"),
+		ErrorType("ErrorType"),
+		Message("Message"),
+		Stacktrace("Stacktrace");
 
 		private String metaName;