diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index c4b9122..ce6175d 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -17,7 +17,7 @@ Before submitting a bug report, check if the issue is already reported in the [I
 We welcome suggestions for new features or enhancements. Use the [Issues](https://github.com/aceinnolab/Inkycal/issues) section to submit your ideas, and provide as much detail as possible.
 
 ### Third party modules
-So you had a great idea for an inkycal-module? Awesome! In fact, there is already a repo sepcfifically created for that purpose: [inkycal-modules-template](https://github.com/aceisace/inkycal-modules-template). Just fork that repo, add your module and give me a shout via Discord, Github or Email.
+So you had a great idea for an inkycal-module? Awesome! In fact, there is already a repo sepcfifically created for that purpose: [inkycal-modules-template](https://github.com/aceinnolab/inkycal-modules-template). Just fork that repo, add your module and give me a shout via Discord, Github or Email.
 
 
 ### Pull Requests
diff --git a/.github/workflows/greetings.yml b/.github/workflows/greetings.yml
index cf94d17..4434783 100644
--- a/.github/workflows/greetings.yml
+++ b/.github/workflows/greetings.yml
@@ -12,5 +12,5 @@ jobs:
     - uses: actions/first-interaction@v1
       with:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
-        issue-message: "Hi there and welcome to Inkycal. Thanks for opening this issue. As this is your first issue in this repository, please read through the [contributing guidelines](https://github.com/aceisace/Inkycal/blob/main/.github/CONTRIBUTING.md)"
-        pr-message: "Hi there and welcome to Inkycal. Thanks for opening this issue. As this is your first Pull-Request in this repository, please read through the [contributing guidelines](https://github.com/aceisace/Inkycal/blob/main/.github/CONTRIBUTING.md). Please note that non-critical pull-request cannot be merged into the main branch to ensure stability. Please create a new branch and ask to have it merged into main. Thanks for your understanding."
+        issue-message: "Hi there and welcome to Inkycal. Thanks for opening this issue. As this is your first issue in this repository, please read through the [contributing guidelines](https://github.com/aceinnolab/Inkycal/blob/main/.github/CONTRIBUTING.md)"
+        pr-message: "Hi there and welcome to Inkycal. Thanks for opening this issue. As this is your first Pull-Request in this repository, please read through the [contributing guidelines](https://github.com/aceinnolab/Inkycal/blob/main/.github/CONTRIBUTING.md). Please note that non-critical pull-request cannot be merged into the main branch to ensure stability. Please create a new branch and ask to have it merged into main. Thanks for your understanding."
diff --git a/docs/_sources/about.md.txt b/docs/_sources/about.md.txt
index c3ceb43..dd7b97d 100644
--- a/docs/_sources/about.md.txt
+++ b/docs/_sources/about.md.txt
@@ -1,5 +1,5 @@
 # About Inkycal
-<img align="center" src="https://raw.githubusercontent.com/aceisace/Inkycal/assets/Repo/logo.png" width="800" alt="inkycal logo">
+<img align="center" src="https://raw.githubusercontent.com/aceinnolab/Inkycal/assets/Repo/logo.png" width="800" alt="inkycal logo">
 
 Inkycal is a python3 software for selected E-Paper displays.
 It's open-source (non-commercially), fully modular, user-friendly and even runs
diff --git a/docs/_sources/index.rst.txt b/docs/_sources/index.rst.txt
index 2debc9d..d8fcaed 100644
--- a/docs/_sources/index.rst.txt
+++ b/docs/_sources/index.rst.txt
@@ -5,7 +5,7 @@
 
 Inkycal documentation
 ======================
-.. image:: https://raw.githubusercontent.com/aceisace/Inkycal/assets/Repo/logo.png
+.. image:: https://raw.githubusercontent.com/aceinnolab/Inkycal/assets/Repo/logo.png
     :alt: logo
 
 .. toctree::
diff --git a/docs/_sources/inkycal.rst.txt b/docs/_sources/inkycal.rst.txt
index 4ab9037..45c6bf1 100644
--- a/docs/_sources/inkycal.rst.txt
+++ b/docs/_sources/inkycal.rst.txt
@@ -1,4 +1,4 @@
-.. image:: https://raw.githubusercontent.com/aceisace/Inkycal/assets/Repo/logo.png
+.. image:: https://raw.githubusercontent.com/aceinnolab/Inkycal/assets/Repo/logo.png
     :alt: logo
     :align: center
 
diff --git a/docs/_sources/quickstart.md.txt b/docs/_sources/quickstart.md.txt
index bc0078c..864af45 100644
--- a/docs/_sources/quickstart.md.txt
+++ b/docs/_sources/quickstart.md.txt
@@ -17,7 +17,7 @@ pip3 install -e ./
 ```
 
 ## Creating settings file
-Please navigate to the [WEB-UI](https://aceisace.eu.pythonanywhere.com/index) to create your settings file. 
+Please navigate to the [WEB-UI](https://inkycal.aceinnolab.com/ui) to create your settings file.
 
 Copy the generated settings file to the Raspberry Pi
 more coming soon..
diff --git a/docs/about.html b/docs/about.html
index 1adec59..da88ba3 100644
--- a/docs/about.html
+++ b/docs/about.html
@@ -82,7 +82,7 @@
              
   <section id="about-inkycal">
 <h1>About Inkycal<a class="headerlink" href="#about-inkycal" title="Link to this heading"></a></h1>
-<img align="center" src="https://raw.githubusercontent.com/aceisace/Inkycal/assets/Repo/logo.png" width="800" alt="inkycal logo"><p>Inkycal is a python3 software for selected E-Paper displays.
+<img align="center" src="https://raw.githubusercontent.com/aceinnolab/Inkycal/assets/Repo/logo.png" width="800" alt="inkycal logo"><p>Inkycal is a python3 software for selected E-Paper displays.
 It’s open-source (non-commercially), fully modular, user-friendly and even runs
 well even on the Raspberry Pi Zero. Inkycal even has a web-UI which takes
 care of adding your details! No more editing files, Yay :partying_face:</p>
diff --git a/docs/index.html b/docs/index.html
index 05ba2c8..a40507d 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -81,7 +81,7 @@
              
   <section id="inkycal-documentation">
 <h1>Inkycal documentation<a class="headerlink" href="#inkycal-documentation" title="Link to this heading"></a></h1>
-<img alt="logo" src="https://raw.githubusercontent.com/aceisace/Inkycal/assets/Repo/logo.png" />
+<img alt="logo" src="https://raw.githubusercontent.com/aceinnolab/Inkycal/assets/Repo/logo.png" />
 <div class="toctree-wrapper compound">
 <p class="caption" role="heading"><span class="caption-text">Contents:</span></p>
 <ul>
diff --git a/docs/inkycal.html b/docs/inkycal.html
index fb5f2d3..ae4d506 100644
--- a/docs/inkycal.html
+++ b/docs/inkycal.html
@@ -123,7 +123,7 @@
           <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
            <div itemprop="articleBody">
              
-  <img alt="logo" class="align-center" src="https://raw.githubusercontent.com/aceisace/Inkycal/assets/Repo/logo.png" />
+  <img alt="logo" class="align-center" src="https://raw.githubusercontent.com/aceinnolab/Inkycal/assets/Repo/logo.png" />
 <section id="module-inkycal.main">
 <span id="inkycal"></span><h1>Inkycal<a class="headerlink" href="#module-inkycal.main" title="Link to this heading"></a></h1>
 <p>Main class for inkycal Project
diff --git a/docs/quickstart.html b/docs/quickstart.html
index be927d0..4368c41 100644
--- a/docs/quickstart.html
+++ b/docs/quickstart.html
@@ -102,7 +102,7 @@ pip3<span class="w"> </span>install<span class="w"> </span>-e<span class="w"> </
 </section>
 <section id="creating-settings-file">
 <h2>Creating settings file<a class="headerlink" href="#creating-settings-file" title="Link to this heading"></a></h2>
-<p>Please navigate to the <a class="reference external" href="https://aceisace.eu.pythonanywhere.com/index">WEB-UI</a> to create your settings file.</p>
+<p>Please navigate to the <a class="reference external" href="https://inkycal.aceinnolab.com/ui">WEB-UI</a> to create your settings file.</p>
 <p>Copy the generated settings file to the Raspberry Pi
 more coming soon..</p>
 </section>
diff --git a/docsource/about.md b/docsource/about.md
index c3ceb43..dd7b97d 100644
--- a/docsource/about.md
+++ b/docsource/about.md
@@ -1,5 +1,5 @@
 # About Inkycal
-<img align="center" src="https://raw.githubusercontent.com/aceisace/Inkycal/assets/Repo/logo.png" width="800" alt="inkycal logo">
+<img align="center" src="https://raw.githubusercontent.com/aceinnolab/Inkycal/assets/Repo/logo.png" width="800" alt="inkycal logo">
 
 Inkycal is a python3 software for selected E-Paper displays.
 It's open-source (non-commercially), fully modular, user-friendly and even runs
diff --git a/docsource/quickstart.md b/docsource/quickstart.md
index bc0078c..36100f6 100644
--- a/docsource/quickstart.md
+++ b/docsource/quickstart.md
@@ -17,7 +17,7 @@ pip3 install -e ./
 ```
 
 ## Creating settings file
-Please navigate to the [WEB-UI](https://aceisace.eu.pythonanywhere.com/index) to create your settings file. 
+Please navigate to the [WEB-UI](https://inkycal.aceinnolab.com) to create your settings file. 
 
 Copy the generated settings file to the Raspberry Pi
 more coming soon..
diff --git a/setup.py b/setup.py
index e120a94..934af0e 100644
--- a/setup.py
+++ b/setup.py
@@ -17,7 +17,7 @@ __version__ = "2.0.4"
 __description__ = "Inkycal is a python3 software for syncing icalendar events, weather and news on selected E-Paper displays"
 __packages__ = ["inkycal"]
 __author__ = "aceinnolab"
-__author_email__ = "aceisace63@yahoo.com"
+__author_email__ = "inkycal@aceinnolab.com"
 __url__ = "https://github.com/aceinnolab/Inkycal"
 
 __install_requires__ = required