diff --git a/docs/README.md b/docs/README.md
index 205180f1fc..67ae7d96e1 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -243,11 +243,10 @@ for more information about installing and using the source code.
 
 ### Services
 
+- [Process filter service](process-filter.service.md)
 - [Process service](process.service.md)
-- [*Process filter service](../lib/process-services/process-list/services/process-filter.service.ts)
-- [*Process upload service](../lib/process-services/task-list/services/process-upload.service.ts)
-- [*Task filter service](../lib/process-services/task-list/services/task-filter.service.ts)
-- [*Tasklist service](../lib/process-services/task-list/services/tasklist.service.ts)
+- [Task filter service](task-filter.service.md)
+- [Tasklist service](tasklist.service.md)
 <!-- process-services end -->
 
 [(Back to Contents)](#contents)
@@ -267,12 +266,6 @@ for more information about installing and using the source code.
 - [Analytics component](analytics.component.md)
 - [Widget component](widget.component.md)
 - [Diagram component](diagram.component.md)
-- [*Analytics report heat map component](../lib/insights/analytics-process/components/analytics-report-heat-map.component.ts)
-- [*Analytics report parameters component](../lib/insights/analytics-process/components/analytics-report-parameters.component.ts)
-
-### Services
-
-- [*Analytics service](../lib/insights/analytics-process/services/analytics.service.ts)
 <!-- insights end -->
 
 [(Back to Contents)](#contents)
\ No newline at end of file
diff --git a/docs/docassets/images/activities-infodrawer.png b/docs/docassets/images/activities-infodrawer.png
index 3b04068256..3de1979aec 100644
Binary files a/docs/docassets/images/activities-infodrawer.png and b/docs/docassets/images/activities-infodrawer.png differ
diff --git a/docs/docassets/images/custom-footer.png b/docs/docassets/images/custom-footer.png
index 7a791c8fbd..0f7fcd554c 100644
Binary files a/docs/docassets/images/custom-footer.png and b/docs/docassets/images/custom-footer.png differ
diff --git a/docs/docassets/images/custom-header.png b/docs/docassets/images/custom-header.png
index 8dad6608f8..244fc8fc50 100644
Binary files a/docs/docassets/images/custom-header.png and b/docs/docassets/images/custom-header.png differ
diff --git a/docs/docassets/images/custom-login.png b/docs/docassets/images/custom-login.png
index aa1e2e62e6..82b4bd507f 100644
Binary files a/docs/docassets/images/custom-login.png and b/docs/docassets/images/custom-login.png differ
diff --git a/docs/docassets/images/infodrawerlayout.png b/docs/docassets/images/infodrawerlayout.png
index 735462a94c..e60e2fc3b7 100644
Binary files a/docs/docassets/images/infodrawerlayout.png and b/docs/docassets/images/infodrawerlayout.png differ
diff --git a/docs/docassets/images/login-extra-content.png b/docs/docassets/images/login-extra-content.png
index 09971bfd50..3e9cac585c 100644
Binary files a/docs/docassets/images/login-extra-content.png and b/docs/docassets/images/login-extra-content.png differ
diff --git a/docs/docassets/images/tag2.png b/docs/docassets/images/tag2.png
index b5906e0dbe..a215c40bbd 100644
Binary files a/docs/docassets/images/tag2.png and b/docs/docassets/images/tag2.png differ
diff --git a/docs/docassets/images/tag3.png b/docs/docassets/images/tag3.png
index 278c2b9f68..ef1cfe8bb4 100644
Binary files a/docs/docassets/images/tag3.png and b/docs/docassets/images/tag3.png differ
diff --git a/docs/form-field.component.md b/docs/form-field.component.md
index 9b994fb205..c48a4e34fd 100644
--- a/docs/form-field.component.md
+++ b/docs/form-field.component.md
@@ -25,7 +25,7 @@ is mapped to a form field component (i.e. UI widget) implementation.
 ### Field Type -> Form Field Component mappings
 Forms defined in APS have the following default mappings for the form fields:
 
-APS Form Designer Widget | Field Type | Component Type |
+| APS Form Designer Widget | Field Type | Component Type |
 | --- | --- | --- |
 | Text | text | TextWidgetComponent |
 | Multi-line text | multi-line-text | MultilineTextWidgetComponentComponent |
diff --git a/docs/info-drawer.component.md b/docs/info-drawer.component.md
index 01f50a043f..f0082c5e9a 100644
--- a/docs/info-drawer.component.md
+++ b/docs/info-drawer.component.md
@@ -1,22 +1,9 @@
-# InfoDrawerComponent
+# InfoDrawer component
 
 Displays a sidebar-style information panel with tabs.
 
 ![Info drawer screenshot](docassets/images/activities-infodrawer.png)
 
-<!-- markdown-toc start - Don't edit this section.  npm run toc to generate it-->
-
-<!-- toc -->
-
-- [Basic usage](#basic-usage)
-  * [Properties](#properties)
-- [Details](#details)
-- [See also](#see-also)
-
-<!-- tocstop -->
-
-<!-- markdown-toc end -->
-
 ## Basic usage
 
 ```html
diff --git a/docs/process-attachment-list.component.md b/docs/process-attachment-list.component.md
index c88b70ed15..f994459cc4 100644
--- a/docs/process-attachment-list.component.md
+++ b/docs/process-attachment-list.component.md
@@ -2,18 +2,6 @@
 
 Displays attached documents on a specified process instance
 
-<!-- markdown-toc start - Don't edit this section.  npm run toc to generate it-->
-
-<!-- toc -->
-
-- [Basic Usage](#basic-usage)
-  * [Properties](#properties)
-  * [Events](#events)
-
-<!-- tocstop -->
-
-<!-- markdown-toc end -->
-
 ## Basic Usage
 
 ```html
@@ -27,7 +15,7 @@ Displays attached documents on a specified process instance
 
 | Name | Type | Description |
 | --- | --- | -- |
-| processInstanceId | string | (**required**): The ID of the process instance to display |
+| processInstanceId | string |  | (**required**): The ID of the process instance to display |
 | disabled | boolean | false | Disable/Enable read only mode for attachement list |
 
 ### Events
diff --git a/docs/undocStoplist.json b/docs/undocStoplist.json
index 563f805bd6..b0f4f60b20 100644
--- a/docs/undocStoplist.json
+++ b/docs/undocStoplist.json
@@ -36,5 +36,7 @@
     "version-upload",
     "search-trigger",
     "node-actions",
-    "content-node-selector.service"
+    "content-node-selector.service",
+    "analytics",
+    "process-upload"
 ]
\ No newline at end of file