diff --git a/.github/workflows/build_pages.yml b/.github/workflows/build_pages.yml
new file mode 100644
index 0000000..6304cfc
--- /dev/null
+++ b/.github/workflows/build_pages.yml
@@ -0,0 +1,25 @@
+# Based on: https://blog.elmah.io/deploying-a-mkdocs-documentation-site-with-github-actions/
+name: build
+on:
+ push:
+ branches:
+ - main
+jobs:
+ deploy:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v4
+ with:
+ fetch-depth: 0
+ - uses: actions/setup-python@v2
+ with:
+ python-version: 3.x
+ - name: Setup MkDocs
+ run: |
+ pip install mkdocs-material
+ pip install mkdocs-git-revision-date-localized-plugin
+ pip install mkdocs-include-markdown-plugin
+ pip install mike
+ pip install mkdocs-git-committers-plugin-2
+ - name: Build website
+ run: mkdocs gh-deploy --verbose
diff --git a/.gitignore b/.gitignore
index 45c1505..3195cfd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,7 @@
_site
.sass-cache
.jekyll-metadata
+.idea
+/.jekyll-cache/
+/Gemfile.lock
+/site
\ No newline at end of file
diff --git a/CNAME b/CNAME
new file mode 100644
index 0000000..c9c61f1
--- /dev/null
+++ b/CNAME
@@ -0,0 +1 @@
+www.utplsql.org
\ No newline at end of file
diff --git a/README.md b/README.md
index 18a1b16..eefe1a3 100644
--- a/README.md
+++ b/README.md
@@ -1,41 +1,45 @@
-# Maintainging the utPLSQL Website
-
-The [utPLSQL website](https://utplsql.github.io) is powered by [Jekyll](https://jekyllrb.com/). Which generated HTML when you push a commit to [utplsql.github.io](https://github.com/utPLSQL/utPLSQL.github.io).
-
-This also works in harmony with the gh-pages branches on the various other repository to create a single website. For example the [utpsql](https://github.com/utPLSQL/utPLSQL) repositories [gh-pages](https://github.com/utPLSQL/utPLSQL/tree/gh-pages) branch, is visible at [https://utplsql.github.io/utPLSQL/](https://utplsql.github.io/utPLSQL/).
-
-This allows for documentation from each sub repository to host it's own documentation without having to modify the utpsql.github.io repsitory directly.
-
+# Maintaining the utPLSQL Website
+The [utPLSQL website](https://utplsql.github.io) is generated using [MkDocs](https://www.mkdocs.org/) and [material theme](https://squidfunk.github.io/mkdocs-material)
+[Mike](https://github.com/jimporter/mike) is used for versioning of documentation see also [this page](https://squidfunk.github.io/mkdocs-material/setup/setting-up-versioning/)
## How to make an announcement post.
-Create a File in the [_posts](https://github.com/utPLSQL/utPLSQL.github.io/tree/master/_posts) directory with the file name of `YYYY-MM-DD-Blog-Post-Name.md`
+- Create a new post file in the [docs/_posts](https://github.com/utPLSQL/utPLSQL.github.io/tree/main/docs/_posts) directory with the file name of `YYYY-MM-DD-Blog-Post-Name.md` This file will be a standard [Markdown file](https://github.com/adam-p/markdown-here/wiki/Markdown-Cheatsheet) which can be editing with any text editor although there are many offline and online editors for Markdown.
+- Add new entry pointing to new announcement file to the start of `nav` section in `mkdocs.yml`
+- Add new entry to the top of `index.md`
+- Commit and push changes to develop branch
-This file will be a standard [Markdown file](https://github.com/adam-p/markdown-here/wiki/Markdown-Cheatsheet) which can be editing with any text editor although there are many offline and online editors for Markdown.
+## Local setup
-The file will also need a YAML Front Matter section at the top of the file.
+If you want to generate and preview the website locally, you will need to have [python and pip installed](https://squidfunk.github.io/mkdocs-material/getting-started/))
- ---
- layout: post
- title: "Title of Blog Post"
- date: 2016-06-20 15:00:00 -0600
- categories: moving
- ---
+To install mkdocs required components, you need to execute the below commands from command line:
+```
+pip install mkdocs-material
+pip install mkdocs-git-revision-date-localized-plugin
+pip install mike
-Look at an existing post if you want an example.
+```
-## How to preview site locally
-
-Jekyll will allow you to preview the site locally doing the following:
-
-1. [Install Jekyll 3](https://jekyllrb.com/docs/installation/)
-2. [Use Jekyll Serve](https://jekyllrb.com/docs/usage/)
+Once installed you can use following commands from command line:
+`mkdocs serve` - will stat a local server, so you can see the web page generated locally and tet real-time updates to documentation
+The pages are automatically generated on every commit to the `main` branch.
+If however you would need to generate pages manually from your local copy, use the command:
+`mkdocs gh-deploy`.
+The generated web pages are hen visible at [utplsql.org](https://utPLSQL.org).
+Individual project documentation pages are deployed separately from the main organization page.
+Each corresponding project repository needs to have its own gh-pages branch.
+
+utPLSQL-framework repository uses `mike` to deploy documentation for specific project version.
+Example commands to use are:
+- `mike deploy develop` - to deploy documentation for develop branch
+- `mike deploy -p develop` - to deploy and push documentation for develop branch
+- `mike deploy -p -u v3.1.12 latest` - to deploy and push documentation for version v3.1.12 and update the `latest` alias to point to that version
-
diff --git a/_config.yml b/_config.yml
deleted file mode 100644
index 123152f..0000000
--- a/_config.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-# Welcome to Jekyll!
-#
-# This config file is meant for settings that affect your whole blog, values
-# which you are expected to set up once and rarely need to edit after that.
-# For technical reasons, this file is *NOT* reloaded automatically when you use
-# 'jekyll serve'. If you change this file, please restart the server process.
-
-# Site settings
-title: utPLSQL
-google_analytics: UA-80445365-1
-email:
-description: > # this means to ignore newlines until "baseurl:"
- utPLSQL
- Unit Testing Framework for Oracle PL/SQL.
-baseurl: "" # the subpath of your site, e.g. /blog
-url: "https://utPLSQL.github.com" # the base hostname & protocol for your site
-twitter_username: utplsql
-github_username: utplsql
-# Build settings
-markdown: kramdown
-exclude: ["README.md","dl-files"]
\ No newline at end of file
diff --git a/_includes/analytics.html b/_includes/analytics.html
deleted file mode 100644
index d63436d..0000000
--- a/_includes/analytics.html
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
diff --git a/_includes/footer.html b/_includes/footer.html
deleted file mode 100644
index 3e45918..0000000
--- a/_includes/footer.html
+++ /dev/null
@@ -1,29 +0,0 @@
-