diff --git a/.gitmodules b/.gitmodules
index 968739d..b6d4cb4 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
-[submodule "libclangmm"]
-	path = libclangmm
-	url = https://github.com/cppit/libclangmm
 [submodule "tiny-process-library"]
 	path = tiny-process-library
 	url = https://gitlab.com/eidheim/tiny-process-library
+[submodule "libclangmm"]
+	path = libclangmm
+	url = https://gitlab.com/cppit/libclangmm
diff --git a/README.md b/README.md
index 4b6cea8..4601cbf 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # juCi++ [![Build Status](https://travis-ci.org/cppit/jucipp.svg?branch=master)](https://travis-ci.org/cppit/jucipp) [![Build status](https://ci.appveyor.com/api/projects/status/tj8ants9q8ouuoob/branch/master?svg=true)](https://ci.appveyor.com/project/zalox/jucipp-6hwdu/branch/master)
 
 ###### a lightweight, platform independent C++-IDE with support for C++11, C++14 and C++17 features depending on libclang version.
-<!--<img src="https://github.com/cppit/jucipp/blob/master/docs/images/screenshot3.png"/>-->
+<!--<img src="https://gitlab.com/cppit/jucipp/blob/master/docs/images/screenshot3.png"/>-->
 ## About
 Current IDEs struggle with C++ support due to the complexity of
 the programming language. juCI++, however, is designed especially 
@@ -46,16 +46,16 @@ See [language-server-protocol/specification.md](https://github.com/Microsoft/lan
 * Full UTF-8 support
 * Wayland supported with GTK+ 3.20 or newer
 
-See [enhancements](https://github.com/cppit/jucipp/labels/enhancement) for planned features.
+See [enhancements](https://gitlab.com/cppit/jucipp/labels/enhancement) for planned features.
 
 ## Screenshots
 <table border="0">
 <tr>
-<td><img src="https://github.com/cppit/jucipp/blob/master/docs/images/screenshot1c.png" width="380"/></td>
-<td><img src="https://github.com/cppit/jucipp/blob/master/docs/images/screenshot2c.png" width="380"/></td>
+<td><img src="https://gitlab.com/cppit/jucipp/blob/master/docs/images/screenshot1c.png" width="380"/></td>
+<td><img src="https://gitlab.com/cppit/jucipp/blob/master/docs/images/screenshot2c.png" width="380"/></td>
 </tr><tr>
-<td><img src="https://github.com/cppit/jucipp/blob/master/docs/images/screenshot3c.png" width="380"/></td>
-<td><img src="https://github.com/cppit/jucipp/blob/master/docs/images/screenshot4b.png" width="380"/></td>
+<td><img src="https://gitlab.com/cppit/jucipp/blob/master/docs/images/screenshot3c.png" width="380"/></td>
+<td><img src="https://gitlab.com/cppit/jucipp/blob/master/docs/images/screenshot4b.png" width="380"/></td>
 </tr>
 </table>
 
@@ -68,7 +68,7 @@ See [enhancements](https://github.com/cppit/jucipp/labels/enhancement) for plann
 * libclang
 * lldb
 * libgit2
-* [libclangmm](http://github.com/cppit/libclangmm/) (downloaded directly with git --recursive, no need to install)
+* [libclangmm](http://gitlab.com/cppit/libclangmm/) (downloaded directly with git --recursive, no need to install)
 * [tiny-process-library](http://gitlab.com/eidheim/tiny-process-library/) (downloaded directly with git --recursive, no need to install)
 
 ## Installation
diff --git a/docs/install.md b/docs/install.md
index 357ac58..334437b 100644
--- a/docs/install.md
+++ b/docs/install.md
@@ -23,7 +23,7 @@ sudo apt-get install git cmake make g++ clang-format pkg-config libboost-filesys
 
 Get juCi++ source, compile and install:
 ```sh
-git clone --recursive https://github.com/cppit/jucipp
+git clone --recursive https://gitlab.com/cppit/jucipp
 mkdir jucipp/build
 cd jucipp/build
 cmake -DCMAKE_CXX_COMPILER=g++ ..
@@ -49,7 +49,7 @@ sudo pacman -S git cmake pkg-config make clang lldb gtksourceviewmm boost aspell
 
 Get juCi++ source, compile and install:
 ```sh
-git clone --recursive https://github.com/cppit/jucipp
+git clone --recursive https://gitlab.com/cppit/jucipp
 mkdir jucipp/build
 cd jucipp/build
 cmake ..
@@ -65,7 +65,7 @@ sudo dnf install git cmake make gcc-c++ clang-devel clang lldb-devel boost-devel
 
 Get juCi++ source, compile and install:
 ```sh
-git clone --recursive https://github.com/cppit/jucipp
+git clone --recursive https://gitlab.com/cppit/jucipp
 mkdir jucipp/build
 cd jucipp/build
 cmake -DCMAKE_CXX_COMPILER=g++ ..
@@ -91,7 +91,7 @@ sudo urpmi git cmake make gcc-c++ clang lib64clang-devel lib64boost-devel lib64g
 
 Get juCi++ source, compile and install:
 ```sh
-git clone --recursive https://github.com/cppit/jucipp
+git clone --recursive https://gitlab.com/cppit/jucipp
 mkdir jucipp/build
 cd jucipp/build
 cmake -DCMAKE_CXX_COMPILER=g++ ..
@@ -107,7 +107,7 @@ sudo zypper install git-core cmake gcc-c++ boost-devel clang-devel lldb-devel ll
 
 Get juCi++ source, compile and install:
 ```sh
-git clone --recursive https://github.com/cppit/jucipp
+git clone --recursive https://gitlab.com/cppit/jucipp
 mkdir jucipp/build
 cd jucipp/build
 cmake -DCMAKE_CXX_COMPILER=g++ ..
@@ -129,7 +129,7 @@ brew install cmake pkg-config boost gtksourceviewmm3 gnome-icon-theme aspell cla
 
 Get juCi++ source, compile and install:
 ```sh
-git clone --recursive https://github.com/cppit/jucipp
+git clone --recursive https://gitlab.com/cppit/jucipp
 mkdir jucipp/build
 cd jucipp/build
 cmake ..
@@ -138,7 +138,7 @@ make install
 ```
 
 ## Windows with MSYS2 (https://msys2.github.io/)
-**See https://github.com/cppit/jucipp/issues/190 for details on adding debug support in MSYS2**
+**See https://gitlab.com/cppit/jucipp/issues/190 for details on adding debug support in MSYS2**
 
 Install dependencies (replace `x86_64` with `i686` for 32-bit MSYS2 installs):
 ```sh
@@ -149,7 +149,7 @@ Note that juCi++ must be built and run in a MinGW Shell (for instance MinGW-w64
 
 Get juCi++ source, compile and install (replace `mingw64` with `mingw32` for 32-bit MSYS2 installs):
 ```sh
-git clone --recursive https://github.com/cppit/jucipp
+git clone --recursive https://gitlab.com/cppit/jucipp
 mkdir jucipp/build
 cd jucipp/build
 cmake -G"MSYS Makefiles" -DCMAKE_INSTALL_PREFIX=/mingw64 ..
diff --git a/libclangmm b/libclangmm
index 5a0195e..a3a8515 160000
--- a/libclangmm
+++ b/libclangmm
@@ -1 +1 @@
-Subproject commit 5a0195e1dd55d9b23851c8e2082feecb6e171b0f
+Subproject commit a3a85155fd7f1771a4873c15fe0a57f30340dfbb