diff --git a/.gitmodules b/.gitmodules
index 061e3b3..319b044 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,3 +7,6 @@
 [submodule "libs/3rdParty/rapidcsv"]
 	path = libs/3rdParty/rapidcsv
 	url = https://github.com/d99kris/rapidcsv.git
+[submodule "libs/3rdParty/Qt-QrCodeGenerator"]
+	path = libs/3rdParty/Qt-QrCodeGenerator
+	url = https://github.com/alex-spataru/Qt-QrCodeGenerator.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 14d2423..9cb0366 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,6 +11,10 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 add_subdirectory(libs/GenericCore)
 set (CORE_LIB_DIR ${CMAKE_CURRENT_SOURCE_DIR}/libs/GenericCore)
 
+### 3rd party libraries
+add_subdirectory(libs/3rdParty/Qt-QrCodeGenerator)
+set (QR_LIB_DIR ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdParty/Qt-QrCodeGenerator)
+
 configure_file(ApplicationConfig.h.in ApplicationConfig.h)
 
 #Frontend applications
diff --git a/UIs/GenericWidgets b/UIs/GenericWidgets
index c83ba2d..a8bf5b4 160000
--- a/UIs/GenericWidgets
+++ b/UIs/GenericWidgets
@@ -1 +1 @@
-Subproject commit c83ba2da9d43064e63e060fd9f40da17e30430e5
+Subproject commit a8bf5b403247da01a5076d96707f8d30a3810b1c
diff --git a/libs/3rdParty/Qt-QrCodeGenerator b/libs/3rdParty/Qt-QrCodeGenerator
new file mode 160000
index 0000000..f9bdfea
--- /dev/null
+++ b/libs/3rdParty/Qt-QrCodeGenerator
@@ -0,0 +1 @@
+Subproject commit f9bdfea8ef25068dba2db947acdcdbffbdd8a574
diff --git a/libs/GenericCore b/libs/GenericCore
index c15e542..caffa1c 160000
--- a/libs/GenericCore
+++ b/libs/GenericCore
@@ -1 +1 @@
-Subproject commit c15e5425a7721c144b7f108be4511ed74a3053f1
+Subproject commit caffa1c18a90f387dae43ca221dac1c9eb5a41d8