diff --git a/AppHtml/global.asa b/AppHtml/global.asa
index 9972561..0efce84 100644
--- a/AppHtml/global.asa
+++ b/AppHtml/global.asa
@@ -1,4 +1,4 @@
-<OBJECT RUNAT=Server SCOPE=Session ID=WebAppServerSession PROGID="WebAppServer.Session.23.0">
+<OBJECT RUNAT=Server SCOPE=Session ID=WebAppServerSession PROGID="WebAppServer.Session.24.0">
 </OBJECT>
 
 <SCRIPT LANGUAGE=VBScript RUNAT=Server>
diff --git a/AppSrc/config/classlist.xml b/AppSrc/config/classlist.xml
index 800d02e..d359bcc 100644
--- a/AppSrc/config/classlist.xml
+++ b/AppSrc/config/classlist.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
 <classList xmlns="http://www.dataaccess.com/VisualDataFlex/2006/classlist/">
-	<VDFLibraryTimeStamp>2024-03-11T18:26:21</VDFLibraryTimeStamp><libraries></libraries>
+	<VDFLibraryTimeStamp>2024-03-29T10:06:04</VDFLibraryTimeStamp>
+	<DFLibraryVersion>1</DFLibraryVersion><libraries></libraries>
 	<classes>
 		<class>
 			<className>cWebButton</className>
@@ -13,7 +14,7 @@
 			<className>cWebCheckbox</className>
 			<image>cWebCheckbox.ico</image>
 			<package>cWebCheckBox.pkg</package>
-			<groupName>Web Controls</groupName>
+			<groupName>Web Data Entry</groupName>
 			<libraryID>0</libraryID>
 		</class>
 		<class>
@@ -34,91 +35,91 @@
 			<className>cWebColumn</className>
 			<image>cWebColumn.ico</image>
 			<package>cWebColumn.pkg</package>
-			<groupName>Web Controls</groupName>
+			<groupName>Web Lists &amp;&amp; Grids</groupName>
 			<libraryID>0</libraryID>
 		</class>
 		<class>
 			<className>cWebColumnButton</className>
 			<image>cWebColumnButton.ico</image>
 			<package>cWebColumnButton.pkg</package>
-			<groupName>Web Controls</groupName>
+			<groupName>Web Lists &amp;&amp; Grids</groupName>
 			<libraryID>0</libraryID>
 		</class>
 		<class>
 			<className>cWebColumnCheckbox</className>
 			<image>cWebColumnCheckbox.ico</image>
 			<package>cWebColumnCheckBox.pkg</package>
-			<groupName>Web Controls</groupName>
+			<groupName>Web Lists &amp;&amp; Grids</groupName>
 			<libraryID>0</libraryID>
 		</class>
 		<class>
 			<className>cWebColumnCombo</className>
 			<image>cWebColumnCombo.ico</image>
 			<package>cWebColumnCombo.pkg</package>
-			<groupName>Web Controls</groupName>
+			<groupName>Web Lists &amp;&amp; Grids</groupName>
 			<libraryID>0</libraryID>
 		</class>
 		<class>
 			<className>cWebColumnDate</className>
 			<image>cWebColumnDate.ico</image>
 			<package>cWebColumnDate.pkg</package>
-			<groupName>Web Controls</groupName>
+			<groupName>Web Lists &amp;&amp; Grids</groupName>
 			<libraryID>0</libraryID>
 		</class>
 		<class>
 			<className>cWebColumnImage</className>
 			<image>cWebColumnImage.ico</image>
 			<package>cWebColumnImage.pkg</package>
-			<groupName>Web Controls</groupName>
+			<groupName>Web Lists &amp;&amp; Grids</groupName>
 			<libraryID>0</libraryID>
 		</class>
 		<class>
 			<className>cWebColumnLink</className>
 			<image>cWebColumnLink.ico</image>
 			<package>cWebColumnLink.pkg</package>
-			<groupName>Web Controls</groupName>
+			<groupName>Web Lists &amp;&amp; Grids</groupName>
 			<libraryID>0</libraryID>
 		</class>
 		<class>
 			<className>cWebColumnSuggestion</className>
 			<image>cWebColumnSuggestion.ico</image>
 			<package>cWebColumnSuggestion.pkg</package>
-			<groupName>Web Controls</groupName>
+			<groupName>Web Lists &amp;&amp; Grids</groupName>
 			<libraryID>0</libraryID>
 		</class>
 		<class>
 			<className>cWebCombo</className>
 			<image>cWebCombo.ico</image>
 			<package>cWebCombo.pkg</package>
-			<groupName>Web Controls</groupName>
+			<groupName>Web Data Entry</groupName>
 			<libraryID>0</libraryID>
 		</class>
 		<class>
 			<className>cWebCommandBar</className>
 			<image>cWebCommandBar.ico</image>
 			<package>cWebCommandbar.pkg</package>
-			<groupName>Web Controls</groupName>
+			<groupName>Web Menu System</groupName>
 			<libraryID>0</libraryID>
 		</class>
 		<class>
 			<className>cWebDateForm</className>
 			<image>cWebDateForm.ico</image>
 			<package>cWebDateForm.pkg</package>
-			<groupName>Web Controls</groupName>
+			<groupName>Web Data Entry</groupName>
 			<libraryID>0</libraryID>
 		</class>
 		<class>
 			<className>cWebDatePicker</className>
 			<image>cWebDatePicker.ico</image>
 			<package>cWebDatePicker.pkg</package>
-			<groupName>Web Controls</groupName>
+			<groupName>Web Data Entry</groupName>
 			<libraryID>0</libraryID>
 		</class>
 		<class>
 			<className>cWebEdit</className>
 			<image>cWebEdit.ico</image>
 			<package>cWebEdit.pkg</package>
-			<groupName>Web Controls</groupName>
+			<groupName>Web Data Entry</groupName>
 			<libraryID>0</libraryID>
 		</class>
 		<class>
@@ -139,21 +140,21 @@
 			<className>cWebForm</className>
 			<image>cWebForm.ico</image>
 			<package>cWebForm.pkg</package>
-			<groupName>Web Controls</groupName>
+			<groupName>Web Data Entry</groupName>
 			<libraryID>0</libraryID>
 		</class>
 		<class>
 			<className>cWebGeoLocation</className>
 			<image>cWebGeoLocation.ico</image>
 			<package>cWebGeoLocation.pkg</package>
-			<groupName>Web Controls</groupName>
+			<groupName>Others</groupName>
 			<libraryID>0</libraryID>
 		</class>
 		<class>
 			<className>cWebGrid</className>
 			<image>cWebGrid.ico</image>
 			<package>cWebGrid.pkg</package>
-			<groupName>Web Controls</groupName>
+			<groupName>Web Lists &amp;&amp; Grids</groupName>
 			<libraryID>0</libraryID>
 		</class>
 		<class>
@@ -167,7 +168,7 @@
 			<className>cWebHtmlList</className>
 			<image>cWebHtmlList.ico</image>
 			<package>cWebHtmlList.pkg</package>
-			<groupName>Web Controls</groupName>
+			<groupName>Web Lists &amp;&amp; Grids</groupName>
 			<libraryID>0</libraryID>
 		</class>
 		<class>
@@ -202,63 +203,63 @@
 			<className>cWebList</className>
 			<image>cWebList.ico</image>
 			<package>cWebList.pkg</package>
-			<groupName>Web Controls</groupName>
+			<groupName>Web Lists &amp;&amp; Grids</groupName>
 			<libraryID>0</libraryID>
 		</class>
 		<class>
 			<className>cWebListSwipeButton</className>
 			<image>cWebListSwipeButton.ico</image>
 			<package>cWebListSwipeButton.pkg</package>
-			<groupName>Web Controls</groupName>
+			<groupName>Web Lists &amp;&amp; Grids</groupName>
 			<libraryID>0</libraryID>
 		</class>
 		<class>
 			<className>cWebMenuBar</className>
 			<image>cWebMenuBar.ico</image>
 			<package>cWebMenuBar.pkg</package>
-			<groupName>Web Controls</groupName>
+			<groupName>Web Menu System</groupName>
 			<libraryID>0</libraryID>
 		</class>
 		<class>
 			<className>cWebMenuButton</className>
 			<image>cWebMenuButton.ico</image>
 			<package>cWebMenuButton.pkg</package>
-			<groupName>Web Controls</groupName>
+			<groupName>Web Menu System</groupName>
 			<libraryID>0</libraryID>
 		</class>
 		<class>
 			<className>cWebMenuItem</className>
 			<image>cWebMenuItem.ico</image>
 			<package>cWebMenuItem.pkg</package>
-			<groupName>Web Controls</groupName>
+			<groupName>Web Menu System</groupName>
 			<libraryID>0</libraryID>
 		</class>
 		<class>
 			<className>cWebMenuItemLoadView</className>
 			<image>cWebMenuItem.ico</image>
 			<package>cWebMenuItemLoadView.pkg</package>
-			<groupName>Web Controls</groupName>
+			<groupName>Web Menu System</groupName>
 			<libraryID>0</libraryID>
 		</class>
 		<class>
 			<className>cWebMenuList</className>
 			<image>cWebMenuList.ico</image>
 			<package>cWebMenuList.pkg</package>
-			<groupName>Web Controls</groupName>
+			<groupName>Web Menu System</groupName>
 			<libraryID>0</libraryID>
 		</class>
 		<class>
 			<className>cWebObject</className>
 			<image>cWebObject.ico</image>
 			<package>cWebObject.pkg</package>
-			<groupName>Web Controls</groupName>
+			<groupName>Others</groupName>
 			<libraryID>0</libraryID>
 		</class>
 		<class>
 			<className>cWebParentCombo</className>
 			<image>cWebParentCombo.ico</image>
 			<package>cWebParentCombo.pkg</package>
-			<groupName>Web Controls</groupName>
+			<groupName>Web Data Entry</groupName>
 			<libraryID>0</libraryID>
 		</class>
 		<class>
@@ -272,21 +273,21 @@
 			<className>cWebPromptList</className>
 			<image>cWebList.ico</image>
 			<package>cWebPromptList.pkg</package>
-			<groupName>Web Controls</groupName>
+			<groupName>Web Lists &amp;&amp; Grids</groupName>
 			<libraryID>0</libraryID>
 		</class>
 		<class>
 			<className>cWebRadio</className>
 			<image>cWebRadio.ico</image>
 			<package>cWebRadio.pkg</package>
-			<groupName>Web Controls</groupName>
+			<groupName>Web Data Entry</groupName>
 			<libraryID>0</libraryID>
 		</class>
 		<class>
 			<className>cWebSlider</className>
 			<image>cWebSlider.ico</image>
 			<package>cWebSlider.pkg</package>
-			<groupName>Web Controls</groupName>
+			<groupName>Web Data Entry</groupName>
 			<libraryID>0</libraryID>
 		</class>
 		<class>
@@ -300,28 +301,28 @@
 			<className>cWebSuggestionForm</className>
 			<image>cWebSuggestionForm.ico</image>
 			<package>cWebSuggestionForm.pkg</package>
-			<groupName>Web Controls</groupName>
+			<groupName>Web Data Entry</groupName>
 			<libraryID>0</libraryID>
 		</class>
 		<class>
 			<className>cWebTagsForm</className>
 			<image>cWebTagsForm.ico</image>
 			<package>cWebTagsForm.pkg</package>
-			<groupName>Web Controls</groupName>
+			<groupName>Web Data Entry</groupName>
 			<libraryID>0</libraryID>
 		</class>
 		<class>
 			<className>cWebTimer</className>
 			<image>cWebTimer.ico</image>
 			<package>cWebTimer.pkg</package>
-			<groupName>Web Controls</groupName>
+			<groupName>Others</groupName>
 			<libraryID>0</libraryID>
 		</class>
 		<class>
 			<className>cWebToolbar</className>
 			<image>cWebToolbar.ico</image>
 			<package>cWebToolbar.pkg</package>
-			<groupName>Web Controls</groupName>
+			<groupName>Web Menu System</groupName>
 			<libraryID>0</libraryID>
 		</class>
 		<class>
@@ -1021,28 +1022,28 @@
 			<className>cWebContextMenu</className>
 			<image>cWebContextMenu.ico</image>
 			<package>cWebContextMenu.pkg</package>
-			<groupName>Web Controls</groupName>
+			<groupName>Web Menu System</groupName>
 			<libraryID>0</libraryID>
 		</class>
 		<class>
 			<className>cWebDragDropHelper</className>
 			<image>cWebDragDropHelper.ico</image>
 			<package>cWebDragDropHelper.pkg</package>
-			<groupName>Web Controls</groupName>
+			<groupName>Others</groupName>
 			<libraryID>0</libraryID>
 		</class>
 		<class>
 			<className>cWebDragDropFileHelper</className>
 			<image>cWebDragDropFileHelper.ico</image>
 			<package>cWebDragDropFileHelper.pkg</package>
-			<groupName>Web Controls</groupName>
+			<groupName>Others</groupName>
 			<libraryID>0</libraryID>
 		</class>
 		<class>
 			<className>cWebMenuItemCheckbox</className>
 			<image>cWebMenuItemCheckbox.ico</image>
 			<package>cWebMenuItemCheckbox.pkg</package>
-			<groupName>Web Controls</groupName>
+			<groupName>Web Menu System</groupName>
 			<libraryID>0</libraryID>
 		</class>
 		<class>
@@ -1070,21 +1071,21 @@
 			<className>cWebColumnTags</className>
 			<image>cWebColumnTags.ico</image>
 			<package>cWebColumnTags.pkg</package>
-			<groupName>Web Controls</groupName>
+			<groupName>Web Lists &amp;&amp; Grids</groupName>
 			<libraryID>0</libraryID>
 		</class>
 		<class>
 			<className>cWebColumnSelectionIndicator</className>
 			<image>cWebColumnSelectionIndicator.ico</image>
 			<package>cWebColumnSelectionIndicator.pkg</package>
-			<groupName>Web Controls</groupName>
+			<groupName>Web Lists &amp;&amp; Grids</groupName>
 			<libraryID>0</libraryID>
 		</class>
 		<class>
 			<className>cWebMultiSelectList</className>
 			<image>cWebMultiSelectList.ico</image>
 			<package>cWebMultiSelectList.pkg</package>
-			<groupName>Web Controls</groupName>
+			<groupName>Web Lists &amp;&amp; Grids</groupName>
 			<libraryID>0</libraryID>
 		</class>
 		<class>
@@ -1108,5 +1109,12 @@
 			<groupName>Data Containers</groupName>
 			<libraryID>0</libraryID>
 		</class>
+		<class>
+			<className>cWebDrawing</className>
+			<image>cWebDrawing.ico</image>
+			<package>cWebDrawing.pkg</package>
+			<groupName>Web Controls</groupName>
+			<libraryID>0</libraryID>
+		</class>
 	</classes>
 </classList>
diff --git a/Web APIs.sws b/Web APIs.sws
index 57829ff..19e6255 100644
--- a/Web APIs.sws	
+++ b/Web APIs.sws	
@@ -1,5 +1,5 @@
 [Properties]
-Version=23.0
+Version=24.0
 [WorkspacePaths]
 ConfigFile=.\Programs\Config.ws
 [Preferences]
diff --git a/package.json b/package.json
index a0938f6..4faac55 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dataflex-webapis",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "description": "DataFlex Custom Components for Web APIs",
   "keywords": [
     "dataflex",
@@ -15,7 +15,7 @@
   "scripts": {
     "watch": "webpack --watch --config webpack.dev.js",
     "build": "webpack --config webpack.prod.js",
-    "dist": "rimraf dist && copyfiles -f \"%ProgramFiles%/DataFlex 23.0/Lib/WebAppMaster/Data/[Ww]eb[Aa]pp[Ss]erver[Pp]rops.*\" Data && npm run build && 7z a dist/WebAPIsDemo.zip * -r -x!.git -x!.github -x!.vscode -x!CssThemes -x!DfEngine -x!*.dep -x!*.prn -x!IdeSrc/* -x!node_modules -x!*.dbg -x!*.exe -x!*.log && 7z a dist/WebAPIsComponents.zip AppHtml/Custom/* AppSrc/*API.pkg LICENSE.txt"
+    "dist": "rimraf dist && copyfiles -f \"%ProgramFiles%/DataFlex 24.0/Lib/WebAppMaster/Data/[Ww]eb[Aa]pp[Ss]erver[Pp]rops.*\" Data && npm run build && 7z a dist/WebAPIsDemo.zip * -r -x!.git -x!.github -x!.vscode -x!CssThemes -x!DfEngine -x!*.dep -x!*.prn -x!IdeSrc/* -x!node_modules -x!*.dbg -x!*.exe -x!*.log && 7z a dist/WebAPIsComponents.zip AppHtml/Custom/* AppSrc/*API.pkg LICENSE.txt"
   },
   "devDependencies": {
     "@babel/core": "^7.23.0",