diff --git a/maven/codenameone-maven-plugin/src/main/resources/com/codename1/maven/intellij/workspace.xml b/maven/codenameone-maven-plugin/src/main/resources/com/codename1/maven/intellij/workspace.xml
index 7c9238c41f..964032c5c3 100644
--- a/maven/codenameone-maven-plugin/src/main/resources/com/codename1/maven/intellij/workspace.xml
+++ b/maven/codenameone-maven-plugin/src/main/resources/com/codename1/maven/intellij/workspace.xml
@@ -181,6 +181,50 @@
             </MavenSettings>
             <method v="2" />
         </configuration>
+        <configuration name="Create GUI Form" type="MavenRunConfiguration" factoryName="Maven" folderName="Tools">
+            <MavenSettings>
+                <option name="myGeneralSettings" />
+                <option name="myRunnerSettings">
+                    <MavenRunnerSettings>
+                        <option name="delegateBuildToMaven" value="true" />
+                        <option name="environmentProperties">
+                            <map />
+                        </option>
+                        <option name="jreName" value="#USE_PROJECT_JDK" />
+                        <option name="mavenProperties">
+                            <map>
+                                <entry key="className" value="$Prompt$" />
+                                <entry key="guiType" value="Form" />
+                            </map>
+                        </option>
+                        <option name="passParentEnv" value="true" />
+                        <option name="runMavenInBackground" value="true" />
+                        <option name="skipTests" value="true" />
+                        <option name="vmOptions" value="" />
+                    </MavenRunnerSettings>
+                </option>
+                <option name="myRunnerParameters">
+                    <MavenRunnerParameters>
+                        <option name="profiles">
+                            <set />
+                        </option>
+                        <option name="goals">
+                            <list>
+                                <option value="cn1:create-gui-form" />
+                                <option value="-e" />
+                            </list>
+                        </option>
+                        <option name="pomFileName" />
+                        <option name="profilesMap">
+                            <map />
+                        </option>
+                        <option name="resolveToWorkspace" value="false" />
+                        <option name="workingDirPath" value="$PROJECT_DIR$" />
+                    </MavenRunnerParameters>
+                </option>
+            </MavenSettings>
+            <method v="2" />
+        </configuration>
         <configuration name="Generate Native Interfaces" type="MavenRunConfiguration" factoryName="Maven" folderName="Tools">
             <MavenSettings>
                 <option name="myGeneralSettings" />
@@ -222,6 +266,49 @@
             </MavenSettings>
             <method v="2" />
         </configuration>
+        <configuration name="Open GUI Builder" type="MavenRunConfiguration" factoryName="Maven" folderName="Tools">
+            <MavenSettings>
+                <option name="myGeneralSettings" />
+                <option name="myRunnerSettings">
+                    <MavenRunnerSettings>
+                        <option name="delegateBuildToMaven" value="true" />
+                        <option name="environmentProperties">
+                            <map />
+                        </option>
+                        <option name="jreName" value="#USE_PROJECT_JDK" />
+                        <option name="mavenProperties">
+                            <map>
+                                <entry key="className" value="$Prompt$" />
+                            </map>
+                        </option>
+                        <option name="passParentEnv" value="true" />
+                        <option name="runMavenInBackground" value="true" />
+                        <option name="skipTests" value="true" />
+                        <option name="vmOptions" value="" />
+                    </MavenRunnerSettings>
+                </option>
+                <option name="myRunnerParameters">
+                    <MavenRunnerParameters>
+                        <option name="profiles">
+                            <set />
+                        </option>
+                        <option name="goals">
+                            <list>
+                                <option value="cn1:guibuilder" />
+                                <option value="-e" />
+                            </list>
+                        </option>
+                        <option name="pomFileName" />
+                        <option name="profilesMap">
+                            <map />
+                        </option>
+                        <option name="resolveToWorkspace" value="false" />
+                        <option name="workingDirPath" value="$PROJECT_DIR$" />
+                    </MavenRunnerParameters>
+                </option>
+            </MavenSettings>
+            <method v="2" />
+        </configuration>
         <configuration name="Gradle Android Project" type="MavenRunConfiguration" factoryName="Maven" folderName="Local Builds">
             <MavenSettings>
                 <option name="myGeneralSettings" />
@@ -704,6 +791,8 @@
             <item itemvalue="Maven.Xcode iOS Project" />
             <item itemvalue="Maven.Gradle Android Project" />
             <item itemvalue="Maven.Generate Native Interfaces" />
+            <item itemvalue="Maven.Create GUI Form" />
+            <item itemvalue="Maven.Open GUI Builder" />
             <item itemvalue="Maven.Codename One Settings" />
             <item itemvalue="Maven.Update Codename One" />
             <item itemvalue="Maven.Run in Simulator" />
diff --git a/scripts/initializr/common/src/main/resources/idea.zip b/scripts/initializr/common/src/main/resources/idea.zip
index 6e1254cdf7..e67e59361a 100644
Binary files a/scripts/initializr/common/src/main/resources/idea.zip and b/scripts/initializr/common/src/main/resources/idea.zip differ