diff --git a/docs/covid19python_url.gaphor b/docs/uml_gaphor/covid19python_url.gaphor
similarity index 100%
rename from docs/covid19python_url.gaphor
rename to docs/uml_gaphor/covid19python_url.gaphor
diff --git a/docs/uml_plantuml/plantuml.1.2021.1.jar b/docs/uml_plantuml/plantuml.1.2021.1.jar
new file mode 100644
index 0000000000000000000000000000000000000000..fba71c35c648d2878026a27680f8700a967ab17b
Binary files /dev/null and b/docs/uml_plantuml/plantuml.1.2021.1.jar differ
diff --git a/requirements/dev.txt b/requirements/dev.txt
index f4b5a5df37b30c0f96520440c80cdfb40e50bd4f..b51b4a545e7e11dc561befaae4225c90626b8ba4 100644
--- a/requirements/dev.txt
+++ b/requirements/dev.txt
@@ -21,9 +21,9 @@ celery[redis]>=5.0.5
 #------------------------------------------
 Flask>=1.1.2
 Flask-SQLAlchemy>=2.4.4
-SQLAlchemy==1.3.20
+SQLAlchemy>=1.3.23
 psycopg2>=2.8.6
-Flask-Authorization>=1.4
+#Flask-Authorization>=1.4
 Flask-Multipass>=0.3.3
 Flask-Cors>=3.0.10
 Flask-BS4>=4.5.3.0,<5.0.0.0
@@ -40,16 +40,18 @@ flask-pwa>=0.1.0
 Flask-Moment>=0.11.0
 Flask-CKEditor>=0.4.4.1
 flask-checkr>=0.1.2
-Flask-Babel>=2.0.0
 flask-whooshalchemy3>=0.2.0
 Flask-PluginKit>=3.6.0
 Flask-ResponseBuilder>=2.0.12
 flask-was>=0.1.0
 Flask-GraphQL>=2.0.1
 flask-hintful>=0.0.7
+Flask-Caching>=1.9.0
+flask-roles>=0.5
+Flask-Babel>=2
+Flask-Login<0.6.0,>=0.5.0
 #------------------------------------------
 manual-sitemap>=19.6.0
-permissions-system>=0.2.3
 aiocronjob>=0.2.0
 # --------------------------------------------------------------
 # Frontend, Statistics, Data Vizualisation
@@ -72,16 +74,13 @@ StatisticalDiagrams>=20.5
 PyGObject>=3.38.0
 gaphor>=2.2.1
 #
-#
 # ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-# Cadidates ...
+# docs - sphinx
 # --------------------------------------------------------------
-#JetKit-Flask
-#Flask-SeaSurf
-#Flask-ESearch
-#Flask-SSE
-#flask-templates
-#Flask-AppBuilder
-#Flask-Caching
-#flask-roles
-#Flask-Login
+sphinx==3.4.3
+sphinx-tabs==2.0.0
+sphinx-issues==1.2.0
+pallets-sphinx-themes==1.2.3
+#
+#-----------------------------------------------------------------
+#
diff --git a/requirements/docs.txt b/requirements/docs.txt
index 682af4f780057701452953309ecbe577b4d6ea7f..22401ff678c71652940c914aea8b8f6fdd715a1f 100644
--- a/requirements/docs.txt
+++ b/requirements/docs.txt
@@ -1,3 +1,9 @@
+#
+# This file is autogenerated by pip-compile
+# To update, run:
+#
+#    pip-compile requirements/docs.in
+#
 
 # --------------------------------------------------------------
 # Covid 19 Data - Requirements
@@ -16,9 +22,9 @@ celery[redis]>=5.0.5
 #------------------------------------------
 Flask>=1.1.2
 Flask-SQLAlchemy>=2.4.4
-SQLAlchemy==1.3.20
+SQLAlchemy>=1.3.23
 psycopg2>=2.8.6
-Flask-Authorization>=1.4
+#Flask-Authorization>=1.4
 Flask-Multipass>=0.3.3
 Flask-Cors>=3.0.10
 Flask-BS4>=4.5.3.0,<5.0.0.0
@@ -35,16 +41,18 @@ flask-pwa>=0.1.0
 Flask-Moment>=0.11.0
 Flask-CKEditor>=0.4.4.1
 flask-checkr>=0.1.2
-Flask-Babel>=2.0.0
 flask-whooshalchemy3>=0.2.0
 Flask-PluginKit>=3.6.0
 Flask-ResponseBuilder>=2.0.12
 flask-was>=0.1.0
 Flask-GraphQL>=2.0.1
 flask-hintful>=0.0.7
+Flask-Caching>=1.9.0
+flask-roles>=0.5
+Flask-Babel>=2
+Flask-Login<0.6.0,>=0.5.0
 #------------------------------------------
 manual-sitemap>=19.6.0
-permissions-system>=0.2.3
 aiocronjob>=0.2.0
 # --------------------------------------------------------------
 # Frontend, Statistics, Data Vizualisation
@@ -67,44 +75,13 @@ StatisticalDiagrams>=20.5
 PyGObject>=3.38.0
 gaphor>=2.2.1
 #
-#
 # ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-# Cadidates ...
+# docs - sphinx
 # --------------------------------------------------------------
-#JetKit-Flask
-#Flask-SeaSurf
-#Flask-ESearch
-#Flask-SSE
-#flask-templates
-#Flask-AppBuilder
-#Flask-Caching
-#flask-roles
-#Flask-Login
-#
-#
-alabaster==0.7.12
-babel==2.8.0
-certifi==2020.6.20
-chardet==3.0.4
-docutils==0.16
-idna==2.10
-imagesize==1.2.0
-jinja2==2.11.3
-markupsafe==1.1.1
-packaging==20.9
-pallets-sphinx-themes==1.2.3
-pygments==2.7.2
-pyparsing==2.4.7
-pytz==2020.1
-requests==2.24.0
-snowballstemmer==2.0.0
-sphinx-issues==1.2.0
-sphinx-tabs==2.0.0
 sphinx==3.4.3
-sphinxcontrib-applehelp==1.0.2
-sphinxcontrib-devhelp==1.0.2
-sphinxcontrib-htmlhelp==1.0.3
-sphinxcontrib-jsmath==1.0.1
-sphinxcontrib-log-cabinet==1.0.1
-sphinxcontrib-qthelp==1.0.3
-sphinxcontrib-serializinghtml==1.1.4
+sphinx-tabs==2.0.0
+sphinx-issues==1.2.0
+pallets-sphinx-themes==1.2.3
+#
+#-----------------------------------------------------------------
+#
\ No newline at end of file
diff --git a/requirements/tests.txt b/requirements/tests.txt
index ce71382e79f4e75621590c0d24216989aa7739ec..ba0e9c73a45428b29bb6a5c2ba1745c527b4cb02 100644
--- a/requirements/tests.txt
+++ b/requirements/tests.txt
@@ -2,9 +2,8 @@
 # This file is autogenerated by pip-compile
 # To update, run:
 #
-#    pip-compile requirements/docs.in
+#    pip-compile requirements/tests.in
 #
-
 # --------------------------------------------------------------
 # Covid 19 Data - Requirements
 # --------------------------------------------------------------
@@ -22,9 +21,9 @@ celery[redis]>=5.0.5
 #------------------------------------------
 Flask>=1.1.2
 Flask-SQLAlchemy>=2.4.4
-SQLAlchemy==1.3.20
+SQLAlchemy>=1.3.23
 psycopg2>=2.8.6
-Flask-Authorization>=1.4
+#Flask-Authorization>=1.4
 Flask-Multipass>=0.3.3
 Flask-Cors>=3.0.10
 Flask-BS4>=4.5.3.0,<5.0.0.0
@@ -41,16 +40,18 @@ flask-pwa>=0.1.0
 Flask-Moment>=0.11.0
 Flask-CKEditor>=0.4.4.1
 flask-checkr>=0.1.2
-Flask-Babel>=2.0.0
 flask-whooshalchemy3>=0.2.0
 Flask-PluginKit>=3.6.0
 Flask-ResponseBuilder>=2.0.12
 flask-was>=0.1.0
 Flask-GraphQL>=2.0.1
 flask-hintful>=0.0.7
+Flask-Caching>=1.9.0
+flask-roles>=0.5
+Flask-Babel>=2
+Flask-Login<0.6.0,>=0.5.0
 #------------------------------------------
 manual-sitemap>=19.6.0
-permissions-system>=0.2.3
 aiocronjob>=0.2.0
 # --------------------------------------------------------------
 # Frontend, Statistics, Data Vizualisation
@@ -73,40 +74,13 @@ StatisticalDiagrams>=20.5
 PyGObject>=3.38.0
 gaphor>=2.2.1
 #
-#
 # ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-# Cadidates ...
+# docs - sphinx
 # --------------------------------------------------------------
-#JetKit-Flask
-#Flask-SeaSurf
-#Flask-ESearch
-#Flask-SSE
-#flask-templates
-#Flask-AppBuilder
-#Flask-Caching
-#flask-roles
-#Flask-Login
-
-#alabaster==0.7.12
-#babel==2.8.0
-#certifi==2020.6.20
-#chardet==3.0.4
-#docutils==0.16
-#idna==2.10
-#imagesize==1.2.0
-pallets-sphinx-themes==1.2.3
-#pygments==2.7.2
-#pyparsing==2.4.7
-#pytz==2020.1
-snowballstemmer==2.0.0
-sphinx-issues==1.2.0
-sphinx-tabs==2.0.0
 sphinx==3.4.3
-sphinxcontrib-applehelp==1.0.2
-sphinxcontrib-devhelp==1.0.2
-sphinxcontrib-htmlhelp==1.0.3
-sphinxcontrib-jsmath==1.0.1
-sphinxcontrib-log-cabinet==1.0.1
-sphinxcontrib-qthelp==1.0.3
-sphinxcontrib-serializinghtml==1.1.4
-#urllib3==1.25.11
+sphinx-tabs==2.0.0
+sphinx-issues==1.2.0
+pallets-sphinx-themes==1.2.3
+#
+#-----------------------------------------------------------------
+#
\ No newline at end of file