diff --git a/Projects/Community-Plugins/Icons-SVG-Sources/disable-saving-with-workspace.svg b/Projects/Community-Plugins/Icons-SVG-Sources/disable-saving-with-workspace.svg
new file mode 100644
index 000000000..94d074615
--- /dev/null
+++ b/Projects/Community-Plugins/Icons-SVG-Sources/disable-saving-with-workspace.svg
@@ -0,0 +1,238 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="96 11 512 512"
+   style="enable-background:new 96 11 512 512;"
+   xml:space="preserve"
+   sodipodi:docname="disable-saving-with-workspace.svg"
+   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"
+   inkscape:export-filename="E:\Superalgos\Projects\Community-Plugins\Icons\disable-saving-with-workspace.png"
+   inkscape:export-xdpi="100"
+   inkscape:export-ydpi="100"><metadata
+   id="metadata33"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+   id="defs31" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1920"
+   inkscape:window-height="1017"
+   id="namedview29"
+   showgrid="false"
+   inkscape:zoom="0.83007813"
+   inkscape:cx="52.865353"
+   inkscape:cy="305.68259"
+   inkscape:window-x="-8"
+   inkscape:window-y="-8"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="Layer_1" />
+<style
+   type="text/css"
+   id="style2">
+	.st0{fill:#FFD1A9;}
+	.st1{fill:none;stroke:#4ACFD9;stroke-width:26;stroke-linecap:round;stroke-miterlimit:10;}
+	.st2{fill:#9BAAAB;}
+	.st3{fill:#FD6A33;}
+	.st4{fill:#FF8C29;}
+	.st5{fill:#4ACFD9;}
+	.st6{fill:#0295AA;}
+	.st7{fill:#365558;}
+</style>
+<path
+   class="st0"
+   d="M96.1,171.9c0-7.9,6.5-14.3,14.3-14.3h81.1c7.9,0,14.3,6.5,14.3,14.3c0,0,0-0.8,0,9c0,9.9,3.5,17.5,17.5,17.5  c14,0,342.8,0,342.8,0c7.9,0,14.3,6.5,14.3,14.3v295.9c0,7.9-6.5,14.3-14.3,14.3H110.3c-7.9,0-14.3-6.5-14.3-14.3V171.9"
+   id="path4" />
+<path
+   class="st1"
+   d="M343.9,420.5c20.9-31.3,49-71.2,43.7-111.6s-27.5-66.7-21-101.9"
+   id="path6" />
+<circle
+   class="st2"
+   cx="366.7"
+   cy="206.9"
+   r="27.9"
+   id="circle8" />
+<path
+   class="st3"
+   d="M384.9,86.3l-0.1-54.4c0-2.8,2.3-5.2,5.2-5.2h2.6c2.8,0,5.2,2.3,5.2,5.2v54.3c0,2.8-2.3,5.2-5.2,5.2H390  C387.2,91.4,384.9,89.1,384.9,86.3z"
+   id="path10" />
+<path
+   class="st4"
+   d="M359.2,75.8V21.5c0-2.8,2.3-5.2,5.2-5.2h2.6c2.8,0,5.2,2.3,5.2,5.2v54.3c0,2.8-2.3,5.2-5.2,5.2h-2.6  C361.5,80.9,359.2,78.6,359.2,75.8z"
+   id="path12" />
+<path
+   class="st3"
+   d="M342.4,85l-0.1-51.8c0-3.5-2.9-6.5-6.5-6.5l0,0c-3.5,0-6.5,2.9-6.5,6.5v51.7c0,3.5,2.9,6.5,6.5,6.5l0,0  C339.6,91.4,342.4,88.5,342.4,85z"
+   id="path14" />
+<path
+   class="st5"
+   d="M414.7,206.1c12.7,0,23.1-10.4,23.1-23.1v-64.6c0-12.7-10.4-23.1-23.1-23.1h-49.8v110.8H414.7z"
+   id="path16" />
+<path
+   class="st6"
+   d="M291.9,118.4V183c0,12.7,10.4,23.1,23.1,23.1l49.8,0l0-110.8H315C302.3,95.3,291.9,105.6,291.9,118.4z"
+   id="path18" />
+<path
+   class="st6"
+   d="M398,106.4c6,0,11.1-5,11.1-11.1V86c0-6-5-11.1-11.1-11.1h-33.3v31.4L398,106.4z"
+   id="path20" />
+<path
+   class="st7"
+   d="M320.5,86v9.3c0,6,5,11.1,11.1,11.1h33.3V75h-33.3C325.5,75,320.5,79.9,320.5,86z"
+   id="path22" />
+<path
+   class="st4"
+   d="M564.9,523H109.2c-7.9,0-13.2-6.5-11.8-14.3l26.1-147.9c1.4-7.9,8.9-14.3,16.8-14.3H596  c7.9,0,13.2,6.5,11.8,14.3l-26.1,147.9C580.4,516.5,572.8,523,564.9,523z"
+   id="path24" />
+<path
+   class="st7"
+   d="M123.3,505.4c-1.9,0-3.5-0.7-4.6-2c-1.1-1.4-1.5-3.3-1.2-5.4l1.3-6.9c1.8-5.4,5.6-9.5,8.2-9.5h434.8  c1.9,0,3.5,0.7,4.6,2c1.1,1.4,1.5,3.3,1.2,5.4l-1.3,6.9c-0.8,5.1-4.6,9.5-9.4,9.5H123.3z"
+   id="path26" />
+<g
+   id="g938"><rect
+     x="-517.32117"
+     y="-7.1964717"
+     class="st1"
+     width="128"
+     height="128"
+     id="rect14"
+     style="fill:#f0353d" /><rect
+     x="-389.32117"
+     y="-7.1964717"
+     class="st2"
+     width="128"
+     height="128"
+     id="rect16"
+     style="fill:#fd6a33" /><rect
+     x="-261.32117"
+     y="-7.1964717"
+     class="st3"
+     width="128"
+     height="128"
+     id="rect18"
+     style="fill:#ff8c29" /><rect
+     x="-133.32117"
+     y="-7.1964717"
+     class="st4"
+     width="128"
+     height="128"
+     id="rect20"
+     style="fill:#ffd1a9" /><rect
+     x="-517.32117"
+     y="120.80353"
+     class="st5"
+     width="128"
+     height="128"
+     id="rect22"
+     style="fill:#365558" /><rect
+     x="-389.32117"
+     y="120.80353"
+     class="st6"
+     width="128"
+     height="128"
+     id="rect24"
+     style="fill:#0295aa" /><rect
+     x="-261.32117"
+     y="120.80353"
+     class="st7"
+     width="128"
+     height="128"
+     id="rect26"
+     style="fill:#4acfd9" /><rect
+     x="-517.32117"
+     y="248.80353"
+     class="st8"
+     width="128"
+     height="128"
+     id="rect28"
+     style="fill:#9baaab" /><rect
+     x="-389.32117"
+     y="248.80353"
+     class="st9"
+     width="128"
+     height="128"
+     id="rect30"
+     style="fill:#cdd4d5" /><rect
+     x="-261.32117"
+     y="248.80353"
+     class="st10"
+     width="128"
+     height="128"
+     id="rect32"
+     style="fill:#e6eaea" /><rect
+     x="-133.32117"
+     y="248.80353"
+     class="st11"
+     width="128"
+     height="128"
+     id="rect34"
+     style="fill:#ffffff" /><rect
+     x="-517.32117"
+     y="376.80353"
+     class="st12"
+     width="128"
+     height="128"
+     id="rect36"
+     style="fill:#bcd643" /></g><g
+   id="g969"
+   transform="matrix(0.77038955,0,0,0.77038955,-261.71998,171.77067)"><path
+     id="rect948"
+     style="opacity:1;fill:#365558;fill-opacity:1;stroke-width:10;stroke-linejoin:round"
+     d="m 706.00706,-16.708235 h 302.55714 c 20.2631,0.223428 36.757,16.39992772 61.4379,41.427977 35.2757,35.77189 40.8092,44.366126 41.005,64.415093 V 388.29176 c 0,24.93 -20.07,45 -45,45 H 706.00706 c -24.93,0 -45,-20.07 -45,-45 V 28.291765 c 0,-24.9300003 20.07,-45 45,-45 z"
+     sodipodi:nodetypes="scscssssss" /><rect
+     style="opacity:1;fill:#e6eaea;fill-opacity:1;stroke-width:10;stroke-linejoin:round"
+     id="rect959"
+     width="349.36472"
+     height="210.82353"
+     x="711.60474"
+     y="207.36705" /><rect
+     style="opacity:1;fill:#0295aa;fill-opacity:1;stroke-width:10;stroke-linejoin:round"
+     id="rect953"
+     width="260.21646"
+     height="161.43059"
+     x="747.74591"
+     y="-1.0470586"
+     rx="20"
+     ry="20" /><rect
+     style="opacity:1;fill:#e6eaea;fill-opacity:1;stroke-width:10;stroke-linejoin:round"
+     id="rect963"
+     width="53.007057"
+     height="119.26588"
+     x="920.01886"
+     y="20.637648" /></g><g
+   id="g1017"
+   transform="translate(132.693,140.52896)"><rect
+     style="opacity:1;fill:#f0353d;fill-opacity:1;stroke-width:10.9366;stroke-linejoin:round"
+     id="rect991"
+     width="101.24419"
+     height="377.13632"
+     x="291.71393"
+     y="-248.67224"
+     rx="19.248959"
+     ry="25.844498"
+     transform="rotate(45)" /><rect
+     style="opacity:1;fill:#f0353d;fill-opacity:1;stroke-width:10.9366;stroke-linejoin:round"
+     id="rect991-3"
+     width="101.24419"
+     height="377.13632"
+     x="-110.72624"
+     y="-530.90424"
+     rx="19.248959"
+     ry="25.844498"
+     transform="rotate(135)" /></g></svg>
diff --git a/Projects/Community-Plugins/Icons-SVG-Sources/enable-saving-with-workspace.svg b/Projects/Community-Plugins/Icons-SVG-Sources/enable-saving-with-workspace.svg
new file mode 100644
index 000000000..e6afe3802
--- /dev/null
+++ b/Projects/Community-Plugins/Icons-SVG-Sources/enable-saving-with-workspace.svg
@@ -0,0 +1,222 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="96 11 512 512"
+   style="enable-background:new 96 11 512 512;"
+   xml:space="preserve"
+   sodipodi:docname="enable-saving-with-workspace.svg"
+   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"
+   inkscape:export-filename="E:\Superalgos\Projects\Community-Plugins\Icons\enable-saving-with-workspace.png"
+   inkscape:export-xdpi="100"
+   inkscape:export-ydpi="100"><metadata
+   id="metadata33"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
+   id="defs31" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1920"
+   inkscape:window-height="1017"
+   id="namedview29"
+   showgrid="false"
+   inkscape:zoom="0.83007813"
+   inkscape:cx="52.865353"
+   inkscape:cy="305.68259"
+   inkscape:window-x="-8"
+   inkscape:window-y="-8"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="Layer_1"
+   inkscape:document-rotation="0" />
+<style
+   type="text/css"
+   id="style2">
+	.st0{fill:#FFD1A9;}
+	.st1{fill:none;stroke:#4ACFD9;stroke-width:26;stroke-linecap:round;stroke-miterlimit:10;}
+	.st2{fill:#9BAAAB;}
+	.st3{fill:#FD6A33;}
+	.st4{fill:#FF8C29;}
+	.st5{fill:#4ACFD9;}
+	.st6{fill:#0295AA;}
+	.st7{fill:#365558;}
+</style>
+<path
+   class="st0"
+   d="M96.1,171.9c0-7.9,6.5-14.3,14.3-14.3h81.1c7.9,0,14.3,6.5,14.3,14.3c0,0,0-0.8,0,9c0,9.9,3.5,17.5,17.5,17.5  c14,0,342.8,0,342.8,0c7.9,0,14.3,6.5,14.3,14.3v295.9c0,7.9-6.5,14.3-14.3,14.3H110.3c-7.9,0-14.3-6.5-14.3-14.3V171.9"
+   id="path4" />
+<path
+   class="st1"
+   d="M343.9,420.5c20.9-31.3,49-71.2,43.7-111.6s-27.5-66.7-21-101.9"
+   id="path6" />
+<circle
+   class="st2"
+   cx="366.7"
+   cy="206.9"
+   r="27.9"
+   id="circle8" />
+<path
+   class="st3"
+   d="M384.9,86.3l-0.1-54.4c0-2.8,2.3-5.2,5.2-5.2h2.6c2.8,0,5.2,2.3,5.2,5.2v54.3c0,2.8-2.3,5.2-5.2,5.2H390  C387.2,91.4,384.9,89.1,384.9,86.3z"
+   id="path10" />
+<path
+   class="st4"
+   d="M359.2,75.8V21.5c0-2.8,2.3-5.2,5.2-5.2h2.6c2.8,0,5.2,2.3,5.2,5.2v54.3c0,2.8-2.3,5.2-5.2,5.2h-2.6  C361.5,80.9,359.2,78.6,359.2,75.8z"
+   id="path12" />
+<path
+   class="st3"
+   d="M342.4,85l-0.1-51.8c0-3.5-2.9-6.5-6.5-6.5l0,0c-3.5,0-6.5,2.9-6.5,6.5v51.7c0,3.5,2.9,6.5,6.5,6.5l0,0  C339.6,91.4,342.4,88.5,342.4,85z"
+   id="path14" />
+<path
+   class="st5"
+   d="M414.7,206.1c12.7,0,23.1-10.4,23.1-23.1v-64.6c0-12.7-10.4-23.1-23.1-23.1h-49.8v110.8H414.7z"
+   id="path16" />
+<path
+   class="st6"
+   d="M291.9,118.4V183c0,12.7,10.4,23.1,23.1,23.1l49.8,0l0-110.8H315C302.3,95.3,291.9,105.6,291.9,118.4z"
+   id="path18" />
+<path
+   class="st6"
+   d="M398,106.4c6,0,11.1-5,11.1-11.1V86c0-6-5-11.1-11.1-11.1h-33.3v31.4L398,106.4z"
+   id="path20" />
+<path
+   class="st7"
+   d="M320.5,86v9.3c0,6,5,11.1,11.1,11.1h33.3V75h-33.3C325.5,75,320.5,79.9,320.5,86z"
+   id="path22" />
+<path
+   class="st4"
+   d="M564.9,523H109.2c-7.9,0-13.2-6.5-11.8-14.3l26.1-147.9c1.4-7.9,8.9-14.3,16.8-14.3H596  c7.9,0,13.2,6.5,11.8,14.3l-26.1,147.9C580.4,516.5,572.8,523,564.9,523z"
+   id="path24" />
+<path
+   class="st7"
+   d="M123.3,505.4c-1.9,0-3.5-0.7-4.6-2c-1.1-1.4-1.5-3.3-1.2-5.4l1.3-6.9c1.8-5.4,5.6-9.5,8.2-9.5h434.8  c1.9,0,3.5,0.7,4.6,2c1.1,1.4,1.5,3.3,1.2,5.4l-1.3,6.9c-0.8,5.1-4.6,9.5-9.4,9.5H123.3z"
+   id="path26" />
+<g
+   id="g938"><rect
+     x="-517.32117"
+     y="-7.1964717"
+     class="st1"
+     width="128"
+     height="128"
+     id="rect14"
+     style="fill:#f0353d" /><rect
+     x="-389.32117"
+     y="-7.1964717"
+     class="st2"
+     width="128"
+     height="128"
+     id="rect16"
+     style="fill:#fd6a33" /><rect
+     x="-261.32117"
+     y="-7.1964717"
+     class="st3"
+     width="128"
+     height="128"
+     id="rect18"
+     style="fill:#ff8c29" /><rect
+     x="-133.32117"
+     y="-7.1964717"
+     class="st4"
+     width="128"
+     height="128"
+     id="rect20"
+     style="fill:#ffd1a9" /><rect
+     x="-517.32117"
+     y="120.80353"
+     class="st5"
+     width="128"
+     height="128"
+     id="rect22"
+     style="fill:#365558" /><rect
+     x="-389.32117"
+     y="120.80353"
+     class="st6"
+     width="128"
+     height="128"
+     id="rect24"
+     style="fill:#0295aa" /><rect
+     x="-261.32117"
+     y="120.80353"
+     class="st7"
+     width="128"
+     height="128"
+     id="rect26"
+     style="fill:#4acfd9" /><rect
+     x="-517.32117"
+     y="248.80353"
+     class="st8"
+     width="128"
+     height="128"
+     id="rect28"
+     style="fill:#9baaab" /><rect
+     x="-389.32117"
+     y="248.80353"
+     class="st9"
+     width="128"
+     height="128"
+     id="rect30"
+     style="fill:#cdd4d5" /><rect
+     x="-261.32117"
+     y="248.80353"
+     class="st10"
+     width="128"
+     height="128"
+     id="rect32"
+     style="fill:#e6eaea" /><rect
+     x="-133.32117"
+     y="248.80353"
+     class="st11"
+     width="128"
+     height="128"
+     id="rect34"
+     style="fill:#ffffff" /><rect
+     x="-517.32117"
+     y="376.80353"
+     class="st12"
+     width="128"
+     height="128"
+     id="rect36"
+     style="fill:#bcd643" /></g><g
+   id="g969"
+   transform="matrix(0.77038955,0,0,0.77038955,-261.71998,171.77067)"><path
+     id="rect948"
+     style="opacity:1;fill:#365558;fill-opacity:1;stroke-width:10;stroke-linejoin:round"
+     d="m 706.00706,-16.708235 h 302.55714 c 20.2631,0.223428 36.757,16.39992772 61.4379,41.427977 35.2757,35.77189 40.8092,44.366126 41.005,64.415093 V 388.29176 c 0,24.93 -20.07,45 -45,45 H 706.00706 c -24.93,0 -45,-20.07 -45,-45 V 28.291765 c 0,-24.9300003 20.07,-45 45,-45 z"
+     sodipodi:nodetypes="scscssssss" /><rect
+     style="opacity:1;fill:#e6eaea;fill-opacity:1;stroke-width:10;stroke-linejoin:round"
+     id="rect959"
+     width="349.36472"
+     height="210.82353"
+     x="711.60474"
+     y="207.36705" /><rect
+     style="opacity:1;fill:#0295aa;fill-opacity:1;stroke-width:10;stroke-linejoin:round"
+     id="rect953"
+     width="260.21646"
+     height="161.43059"
+     x="747.74591"
+     y="-1.0470586"
+     rx="20"
+     ry="20" /><rect
+     style="opacity:1;fill:#e6eaea;fill-opacity:1;stroke-width:10;stroke-linejoin:round"
+     id="rect963"
+     width="53.007057"
+     height="119.26588"
+     x="920.01886"
+     y="20.637648" /></g><path
+   id="rect989"
+   style="opacity:1;fill:#bcd643;fill-opacity:1;stroke-width:8.16418;stroke-linejoin:round"
+   d="m 549.56859,244.40334 c -6.03717,-6.03718 -16.85955,-4.93428 -24.26623,2.4724 L 383.81719,388.36091 318.96535,323.50907 c -6.75261,-6.75261 -17.06733,-7.31168 -23.12622,-1.25278 l -36.09859,36.09858 c -6.05888,6.05888 -5.49982,16.37361 1.25279,23.12623 l 109.97976,109.97975 c 6.75261,6.75262 17.06735,7.31168 23.12623,1.25279 l 20.16509,-20.16509 15.93349,-15.93349 152.4219,-152.42189 c 7.40666,-7.40667 8.50846,-18.23016 2.47129,-24.26733 z" /></svg>
diff --git a/Projects/Community-Plugins/Icons/disable-saving-with-workspace.png b/Projects/Community-Plugins/Icons/disable-saving-with-workspace.png
new file mode 100644
index 000000000..9671bdebb
Binary files /dev/null and b/Projects/Community-Plugins/Icons/disable-saving-with-workspace.png differ
diff --git a/Projects/Community-Plugins/Icons/enable-saving-with-workspace.png b/Projects/Community-Plugins/Icons/enable-saving-with-workspace.png
new file mode 100644
index 000000000..92aa8fc01
Binary files /dev/null and b/Projects/Community-Plugins/Icons/enable-saving-with-workspace.png differ
diff --git a/Projects/Community-Plugins/Schemas/App-Schema/plugin-file.json b/Projects/Community-Plugins/Schemas/App-Schema/plugin-file.json
index 3f2b0b8e4..24f4d053a 100644
--- a/Projects/Community-Plugins/Schemas/App-Schema/plugin-file.json
+++ b/Projects/Community-Plugins/Schemas/App-Schema/plugin-file.json
@@ -23,15 +23,15 @@
             "action": "Enable Saving With Workspace",
             "actionFunction": "payload.executeAction",
             "label": "Enable Saving With Workspace",
-            "relatedUiObject": "Plugin File",
-            "actionProject": "Community-Plugins",
-            "relatedUiObjectProject": "Community-Plugins"
-        },
-        {
-            "action": "Disable Saving With Workspace",
-            "actionFunction": "payload.executeAction",
-            "label": "Disable Saving With Workspace",
-            "relatedUiObject": "Plugin File",
+            "workDoneLabel": "Enabled",
+            "secondaryAction": "Disable Saving With Workspace",
+            "secondaryLabel": "Disable Saving With Workspace",
+            "secondaryWorkDoneLabel": "Disabled",
+            "secondaryIcon": "disable-saving-with-workspace",
+            "booleanProperty": "saveWithWorkspace",
+            "iconPathOn": "enable-saving-with-workspace",
+            "iconPathOff": "enable-saving-with-workspace",
+            "iconProject": "Community-Plugins",
             "actionProject": "Community-Plugins",
             "relatedUiObjectProject": "Community-Plugins"
         },
diff --git a/Projects/Community-Plugins/UI/Function-Libraries/ActionSwitch.js b/Projects/Community-Plugins/UI/Function-Libraries/ActionSwitch.js
index 2f96c6f67..085ea3b13 100644
--- a/Projects/Community-Plugins/UI/Function-Libraries/ActionSwitch.js
+++ b/Projects/Community-Plugins/UI/Function-Libraries/ActionSwitch.js
@@ -80,12 +80,12 @@ function newCommunityPluginsActionSwitch() {
                 break
             case 'Enable Saving With Workspace':
                 {
-                    UI.projects.communityPlugins.functionLibraries.pluginsFunctions.enableSavingWithWorkspace(action.node, action.rootNodes)
+                    UI.projects.communityPlugins.functionLibraries.pluginsFunctions.enableSavingWithWorkspace(action.node, action.rootNodes, action.callBackFunction)
                 }
                 break
             case 'Disable Saving With Workspace':
                 {
-                    UI.projects.communityPlugins.functionLibraries.pluginsFunctions.disableSavingWithWorkspace(action.node, action.rootNodes)
+                    UI.projects.communityPlugins.functionLibraries.pluginsFunctions.disableSavingWithWorkspace(action.node, action.rootNodes, action.callBackFunction)
                 }
                 break
             case 'Save Plugin':
diff --git a/Projects/Community-Plugins/UI/Function-Libraries/PluginsFunctions.js b/Projects/Community-Plugins/UI/Function-Libraries/PluginsFunctions.js
index 0b19c15da..46a9045d7 100644
--- a/Projects/Community-Plugins/UI/Function-Libraries/PluginsFunctions.js
+++ b/Projects/Community-Plugins/UI/Function-Libraries/PluginsFunctions.js
@@ -193,14 +193,16 @@ function newPluginsFunctionLibraryPluginsFunctions() {
         }
     }
 
-    function enableSavingWithWorkspace(node, rootNodes) {
+    function enableSavingWithWorkspace(node, rootNodes, callBackFunction) {
         UI.projects.visualScripting.utilities.nodeConfig.saveConfigProperty(node.payload, 'saveWithWorkspace', true)
         node.payload.uiObject.setInfoMessage('Saving with Workspace Enabled')
+        callBackFunction(GLOBAL.DEFAULT_OK_RESPONSE)
     }
 
-    function disableSavingWithWorkspace(node, rootNodes) {
+    function disableSavingWithWorkspace(node, rootNodes, callBackFunction) {
         UI.projects.visualScripting.utilities.nodeConfig.saveConfigProperty(node.payload, 'saveWithWorkspace', false)
         node.payload.uiObject.setInfoMessage('Saving with Workspace Disabled')
+        callBackFunction(GLOBAL.DEFAULT_OK_RESPONSE)
     }
 
     function savePlugin(node, rootNodes) {
diff --git a/Projects/Foundations/Schemas/App-Schema/phase.json b/Projects/Foundations/Schemas/App-Schema/phase.json
index 5038d4358..0414744a9 100644
--- a/Projects/Foundations/Schemas/App-Schema/phase.json
+++ b/Projects/Foundations/Schemas/App-Schema/phase.json
@@ -26,7 +26,7 @@
             "label": "Add Move To Phase Event",
             "relatedUiObject": "Move To Phase Event",
             "actionFunction": "payload.executeAction",
-            "relatedUiObjectProject": "Social-Bots",
+            "relatedUiObjectProject": "Foundations",
             "actionProject": "Visual-Scripting"
         },
         {
diff --git a/Projects/Foundations/UI/Spaces/Floating-Space/CircularMenu.js b/Projects/Foundations/UI/Spaces/Floating-Space/CircularMenu.js
index 18701154a..08de42283 100644
--- a/Projects/Foundations/UI/Spaces/Floating-Space/CircularMenu.js
+++ b/Projects/Foundations/UI/Spaces/Floating-Space/CircularMenu.js
@@ -70,6 +70,7 @@ function newCircularMenu() {
             menuItem.secondaryWorkDoneLabel = menuItemInitialValue.secondaryWorkDoneLabel
             menuItem.secondaryWorkFailedLabel = menuItemInitialValue.secondaryWorkFailedLabel
             menuItem.secondaryIcon = menuItemInitialValue.secondaryIcon
+            menuItem.booleanProperty = menuItemInitialValue.booleanProperty
             menuItem.visible = menuItemInitialValue.visible
             menuItem.iconPathOn = menuItemInitialValue.iconPathOn
             menuItem.iconPathOff = menuItemInitialValue.iconPathOff
diff --git a/Projects/Foundations/UI/Spaces/Floating-Space/CircularMenuItem.js b/Projects/Foundations/UI/Spaces/Floating-Space/CircularMenuItem.js
index abb7b2cc1..f01dcfd1b 100644
--- a/Projects/Foundations/UI/Spaces/Floating-Space/CircularMenuItem.js
+++ b/Projects/Foundations/UI/Spaces/Floating-Space/CircularMenuItem.js
@@ -28,6 +28,7 @@ function newCircularMenuItem() {
         secondaryWorkDoneLabel: undefined,
         secondaryWorkFailedLabel: undefined,
         secondaryIcon: undefined,
+        booleanProperty: undefined,
         nextAction: undefined,
         visible: false,
         iconPathOn: undefined,
@@ -121,7 +122,18 @@ function newCircularMenuItem() {
 
         containerPhysics()
 
-        thisObject.nextAction = thisObject.action
+        if(thisObject.booleanProperty !== undefined) {
+            let config = JSON.parse(thisObject.payload.node.config)
+
+            if (config[thisObject.booleanProperty] === true) {
+                thisObject.nextAction = thisObject.secondaryAction
+                setStatus(thisObject.secondaryLabel, defaultBackgroudColor, undefined, STATUS_PRIMARY_WORK_DONE)
+            } else {
+                thisObject.nextAction = thisObject.action
+            }
+        } else {
+            thisObject.nextAction = thisObject.action
+        }
     }
 
     function getContainer(point) {
@@ -265,8 +277,13 @@ function newCircularMenuItem() {
                 temporaryStatus === STATUS_SECONDARY_WORK_FAILED
             ) && thisObject.secondaryAction !== undefined
         ) {
-            thisObject.iconOn = UI.projects.foundations.spaces.designSpace.getIconByProjectAndName('Foundations', thisObject.secondaryIcon)
-            thisObject.iconOff = UI.projects.foundations.spaces.designSpace.getIconByProjectAndName('Foundations', thisObject.secondaryIcon)
+            if(thisObject.iconProject !== undefined) {
+                thisObject.iconOn = UI.projects.foundations.spaces.designSpace.getIconByProjectAndName(thisObject.iconProject, thisObject.secondaryIcon)
+                thisObject.iconOff = UI.projects.foundations.spaces.designSpace.getIconByProjectAndName(thisObject.iconProject, thisObject.secondaryIcon)
+            } else {
+                thisObject.iconOn = UI.projects.foundations.spaces.designSpace.getIconByProjectAndName('Foundations', thisObject.secondaryIcon)
+                thisObject.iconOff = UI.projects.foundations.spaces.designSpace.getIconByProjectAndName('Foundations', thisObject.secondaryIcon)
+            }
         } else {
 
             /*