diff --git a/apps/documenteditor/main/index.html b/apps/documenteditor/main/index.html
index ff349c9c2a..3990df8e82 100644
--- a/apps/documenteditor/main/index.html
+++ b/apps/documenteditor/main/index.html
@@ -262,6 +262,10 @@
 	<script type="text/javascript" src="../../../../sdkjs/common/Drawings/Metafile.js"></script>
 	<script type="text/javascript" src="../../../../sdkjs/common/FontsFreeType/TextMeasurer.js"></script>
 	
+	<script type="text/javascript" src="../../../../sdkjs/common/Shapes/EditorSettings.js"></script>
+	<script type="text/javascript" src="../../../../sdkjs/common/Shapes/Serialize.js"></script>
+	<script type="text/javascript" src="../../../../sdkjs/common/Shapes/SerializeWriter.js"></script>
+	
 	<script type="text/javascript" src="../../../../sdkjs/common/Drawings/Hit.js"></script>
 	<script type="text/javascript" src="../../../../sdkjs/common/Drawings/ArcTo.js"></script>
 	<script type="text/javascript" src="../../../../sdkjs/common/Drawings/ColorArray.js"></script>
@@ -299,9 +303,9 @@
 	
 	<script type="text/javascript" src="../../../../sdkjs/common/Drawings/Externals.js"></script>
 	<script type="text/javascript" src="../../../../sdkjs/common/GlobalLoaders.js"></script>
-	
-	<script type="text/javascript" src="../../../../sdkjs/common/Shapes/EditorSettings.js"></script>
-	<script type="text/javascript" src="../../../../sdkjs/common/Shapes/Serialize.js"></script>
+	<script type="text/javascript" src="../../../../sdkjs/common/CollaborativeEditingBase.js"></script>
+	<script type="text/javascript" src="../../../../sdkjs/common/Controls.js"></script>
+	<script type="text/javascript" src="../../../../sdkjs/common/Overlay.js"></script>
 	
 	<script type="text/javascript" src="../../../../sdkjs/common/scroll.js"></script>
 	<script type="text/javascript" src="../../../../sdkjs/common/Scrolls/iscroll.js"></script>
@@ -322,7 +326,6 @@
     <script type="text/javascript" src="../../../../sdkjs/word/Editor/GraphicObjects/GraphicPage.js"></script>
     <script type="text/javascript" src="../../../../sdkjs/word/Editor/GraphicObjects/WrapManager.js"></script>
     <!--Drawings -->
-    <script type="text/javascript" src="../../../../sdkjs/common/CollaborativeEditingBase.js"></script>
     <script type="text/javascript" src="../../../../sdkjs/word/Editor/CollaborativeEditing.js"></script>
     <script type="text/javascript" src="../../../../sdkjs/word/Editor/Comments.js"></script>
     <script type="text/javascript" src="../../../../sdkjs/word/Editor/History.js"></script>
@@ -355,12 +358,10 @@
 
 	<script type="text/javascript" src="../../../../sdkjs/word/Drawing/HatchPattern.js"></script>
     <script type="text/javascript" src="../../../../sdkjs/word/Drawing/Graphics.js"></script>
-    <script type="text/javascript" src="../../../../sdkjs/common/Overlay.js"></script>
     <script type="text/javascript" src="../../../../sdkjs/word/Drawing/ShapeDrawer.js"></script>
     <script type="text/javascript" src="../../../../sdkjs/word/Drawing/DrawingDocument.js"></script>
     <script type="text/javascript" src="../../../../sdkjs/word/Drawing/GraphicsEvents.js"></script>
     <script type="text/javascript" src="../../../../sdkjs/word/Drawing/WorkEvents.js"></script>
-    <script type="text/javascript" src="../../../../sdkjs/common/Controls.js"></script>
     <script type="text/javascript" src="../../../../sdkjs/word/Drawing/Rulers.js"></script>
     <script type="text/javascript" src="../../../../sdkjs/word/Drawing/HtmlPage.js"></script>
     <script type="text/javascript" src="../../../../sdkjs/word/Drawing/documentrenderer.js"></script>
@@ -373,7 +374,6 @@
 	
 	<script type="text/javascript" src="../../../../sdkjs/word/Editor/CollaborativeEditing.js"></script>
 
-    <script type="text/javascript" src="../../../../sdkjs/common/Shapes/SerializeWriter.js"></script>
     <script type="text/javascript" src="../../../../sdkjs/word/Editor/SerializeCommon.js"></script>
 
     <script type="text/javascript" src="../../../../sdkjs/word/Math/mathTypes.js"></script>
diff --git a/apps/presentationeditor/main/index.html b/apps/presentationeditor/main/index.html
index 440585e445..e0969fef95 100644
--- a/apps/presentationeditor/main/index.html
+++ b/apps/presentationeditor/main/index.html
@@ -259,6 +259,10 @@
 	<script type="text/javascript" src="../../../../sdkjs/common/Drawings/Metafile.js"></script>
 	<script type="text/javascript" src="../../../../sdkjs/common/FontsFreeType/TextMeasurer.js"></script>
 	
+	<script type="text/javascript" src="../../../../sdkjs/common/Shapes/SerializeWriter.js"></script>
+	<script type="text/javascript" src="../../../../sdkjs/common/Shapes/EditorSettings.js"></script>
+	<script type="text/javascript" src="../../../../sdkjs/common/Shapes/Serialize.js"></script>
+	
 	<script type="text/javascript" src="../../../../sdkjs/common/Drawings/Hit.js"></script>
 	<script type="text/javascript" src="../../../../sdkjs/common/Drawings/ArcTo.js"></script>
 	<script type="text/javascript" src="../../../../sdkjs/common/Drawings/ColorArray.js"></script>
@@ -296,15 +300,16 @@
 	
 	<script type="text/javascript" src="../../../../sdkjs/common/Drawings/Externals.js"></script>
 	<script type="text/javascript" src="../../../../sdkjs/common/GlobalLoaders.js"></script>
-	
-	<script type="text/javascript" src="../../../../sdkjs/common/Shapes/EditorSettings.js"></script>
-	<script type="text/javascript" src="../../../../sdkjs/common/Shapes/Serialize.js"></script>
+	<script type="text/javascript" src="../../../../sdkjs/common/CollaborativeEditingBase.js"></script>
+	<script type="text/javascript" src="../../../../sdkjs/common/Controls.js"></script>
+	<script type="text/javascript" src="../../../../sdkjs/common/Overlay.js"></script>
 	
 	<script type="text/javascript" src="../../../../sdkjs/common/scroll.js"></script>
 	
 	<script type="text/javascript" src="../../../../sdkjs/common/wordcopypaste.js"></script>
 	
 	<script type="text/javascript" src="../../../../sdkjs/slide/apiDefines.js"></script>
+	<script type="text/javascript" src="../../../../sdkjs/slide/themes/Themes.js"></script>
 
     <script type="text/javascript" src="../../../../sdkjs/slide/Drawing/ThemeLoader.js"></script>
 
@@ -312,12 +317,10 @@
 
     <script type="text/javascript" src="../../../../sdkjs/word/Editor/Styles.js"></script>
     <script type="text/javascript" src="../../../../sdkjs/word/Editor/Numbering.js"></script>
-    <script type="text/javascript" src="../../../../sdkjs/common/CollaborativeEditingBase.js"></script>
     <script type="text/javascript" src="../../../../sdkjs/slide/Editor/CollaborativeEditing.js"></script>
 
     <script type="text/javascript" src="../../../../sdkjs/word/Drawing/GraphicsEvents.js"></script>
     <script type="text/javascript" src="../../../../sdkjs/word/Drawing/WorkEvents.js"></script>
-    <script type="text/javascript" src="../../../../sdkjs/common/Controls.js"></script>
     <script type="text/javascript" src="../../../../sdkjs/word/Drawing/Rulers.js"></script>
     <script type="text/javascript" src="../../../../sdkjs/word/Editor/Table.js"></script>
     <script type="text/javascript" src="../../../../sdkjs/word/Editor/Table/TableRecalculate.js"></script>
@@ -332,14 +335,11 @@
 
     <script type="text/javascript" src="../../../../sdkjs/word/Drawing/HatchPattern.js"></script>
     <script type="text/javascript" src="../../../../sdkjs/word/Drawing/Graphics.js"></script>
-    <script type="text/javascript" src="../../../../sdkjs/common/Overlay.js"></script>
     <script type="text/javascript" src="../../../../sdkjs/word/Drawing/ShapeDrawer.js"></script>
     <script type="text/javascript" src="../../../../sdkjs/slide/Drawing/Transitions.js"></script>
     <script type="text/javascript" src="../../../../sdkjs/slide/Drawing/DrawingDocument.js"></script>
     <script type="text/javascript" src="../../../../sdkjs/slide/Drawing/HtmlPage.js"></script>
 
-    <script type="text/javascript" src="../../../../sdkjs/slide/themes/Themes.js"></script>
-    <script type="text/javascript" src="../../../../sdkjs/common/Shapes/SerializeWriter.js"></script>
     <script src="../../../../sdkjs/word/Editor/SerializeCommon.js"></script>
 
     <script type="text/javascript" src="../../../../sdkjs/slide/Editor/Format/Presentation.js"></script>
diff --git a/apps/spreadsheeteditor/main/index.html b/apps/spreadsheeteditor/main/index.html
index b0cc2f74b8..98d152f7bb 100644
--- a/apps/spreadsheeteditor/main/index.html
+++ b/apps/spreadsheeteditor/main/index.html
@@ -262,6 +262,10 @@
 	<script type="text/javascript" src="../../../../sdkjs/common/Drawings/Metafile.js"></script>
 	<script type="text/javascript" src="../../../../sdkjs/common/FontsFreeType/TextMeasurer.js"></script>
 	
+	<script type="text/javascript" src="../../../../sdkjs/common/Shapes/EditorSettings.js"></script>
+	<script type="text/javascript" src="../../../../sdkjs/common/Shapes/Serialize.js"></script>
+	<script type="text/javascript" src="../../../../sdkjs/common/Shapes/SerializeWriter.js"></script>
+	
 	<script type="text/javascript" src="../../../../sdkjs/common/Drawings/Hit.js"></script>
 	<script type="text/javascript" src="../../../../sdkjs/common/Drawings/ArcTo.js"></script>
 	<script type="text/javascript" src="../../../../sdkjs/common/Drawings/ColorArray.js"></script>
@@ -299,9 +303,9 @@
 	
 	<script type="text/javascript" src="../../../../sdkjs/common/Drawings/Externals.js"></script>
 	<script type="text/javascript" src="../../../../sdkjs/common/GlobalLoaders.js"></script>
-	
-	<script type="text/javascript" src="../../../../sdkjs/common/Shapes/EditorSettings.js"></script>
-	<script type="text/javascript" src="../../../../sdkjs/common/Shapes/Serialize.js"></script>
+	<script type="text/javascript" src="../../../../sdkjs/common/CollaborativeEditingBase.js"></script>
+	<script type="text/javascript" src="../../../../sdkjs/common/Controls.js"></script>
+	<script type="text/javascript" src="../../../../sdkjs/common/Overlay.js"></script>
 	
 	<script type="text/javascript" src="../../../../sdkjs/common/scroll.js"></script>
 	
@@ -358,21 +362,15 @@
     <script type="text/javascript" src="../../../../sdkjs/cell/api.js"></script>
     <script type="text/javascript" src="../../../../sdkjs/common/Private/license.js"></script>
     <script type="text/javascript" src="../../../../sdkjs/cell/Private/comments.js"></script>
-
-    <!--for theme-->
-    <script type="text/javascript" src="../../../../sdkjs/common/Shapes/SerializeWriter.js"></script>
     
     <!--for chart-->
     <script type="text/javascript" src="../../../../sdkjs/word/Editor/SerializeCommon.js"></script>
 	<script type="text/javascript" src="../../../../sdkjs/word/Editor/Common.js"></script>
 
     <!--for shapes-->
-	<script src="../../../../sdkjs/common/Controls.js"></script>
-    
 	<script src="../../../../sdkjs/cell/view/DrawingObjectsController.js"></script>
 
     <script src="../../../../sdkjs/cell/model/DrawingObjects/Graphics.js"></script>
-    <script src="../../../../sdkjs/common/Overlay.js"></script>
     <script src="../../../../sdkjs/cell/model/DrawingObjects/ShapeDrawer.js"></script>
 
     <script src="../../../../sdkjs/cell/model/DrawingObjects/DrawingDocument.js"></script>
@@ -410,7 +408,6 @@
     <script src="../../../../sdkjs/word/Editor/Spelling.js"></script>
 	<script src="../../../../sdkjs/word/Editor/GraphicObjects/WrapManager.js"></script>
 	
-    <script src="../../../../sdkjs/common/CollaborativeEditingBase.js"></script>
 	<script src="../../../../sdkjs/cell/model/DrawingObjects/GlobalCounters.js"></script>
 	
 	<script type="text/javascript" src="../../../../sdkjs/word/Math/mathTypes.js"></script>