diff --git a/CMakeLists.txt b/CMakeLists.txt
index a99c8599..ae7ffaa1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,88 +1,88 @@
 project(lattedock)
 cmake_minimum_required(VERSION 3.0 FATAL_ERROR)
 
 set(CMAKE_CXX_STANDARD 14)
-set(VERSION 0.8.96)
+set(VERSION 0.8.97)
 set(AUTHOR "Michail Vourlakos, Smith Ar")
 set(EMAIL "mvourlakos@gmail.com, audoban@openmailbox.org")
 set(WEBSITE "https://github.com/psifidotos/Latte-Dock")
 set(BUG_ADDRESS "https://github.com/psifidotos/Latte-Dock/issues")
 set(FAQS "https://github.com/psifidotos/Latte-Dock/wiki/F.A.Q.")
 
 set(QT_MIN_VERSION "5.9.0")
 set(KF5_MIN_VERSION "5.38.0")
 
 set(KF5_LOCALE_PREFIX "")
 
 find_package(ECM ${KF5_MIN_VER} REQUIRED NO_MODULE)
 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
 
 find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED NO_MODULE COMPONENTS DBus Gui Qml Quick)
 
 find_package(KF5 REQUIRED COMPONENTS SysGuard)
 
 find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
     Activities Archive CoreAddons GuiAddons Crash DBusAddons Declarative GlobalAccel I18n 
     IconThemes NewStuff Notifications Plasma PlasmaQuick Wayland WindowSystem XmlGui)
 
 find_package(X11 REQUIRED)
 set_package_properties(X11 PROPERTIES DESCRIPTION "X11 libraries"
     URL "http://www.x.org"
     TYPE OPTIONAL
     PURPOSE "Required for building the X11 based workspace")
 
 if(X11_FOUND)
     find_package(XCB MODULE REQUIRED COMPONENTS XCB RANDR EVENT)
     set_package_properties(XCB PROPERTIES TYPE REQUIRED)
     find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS X11Extras)
 
     if(NOT X11_SM_FOUND)
         message(FATAL_ERROR "\nThe X11 Session Management (SM) development package could not be found.
                 \nPlease install libSM.\n")
     endif(NOT X11_SM_FOUND)
 
 endif()
 
 if(X11_FOUND AND XCB_XCB_FOUND)
     set(HAVE_X11 ON)
 endif()
 
 string(REGEX MATCH "\\.([^]]+)\\." KF5_VERSION_MINOR ${KF5_VERSION})
 string(REGEX REPLACE "\\." "" KF5_VERSION_MINOR ${KF5_VERSION_MINOR})
 
 message(STATUS "KF5 VERSION : ${KF5_VERSION}")
 message(STATUS "KF5 VERSION MINOR : ${KF5_VERSION_MINOR}")
 
 include(ECMQMLModules)
 ecm_find_qmlmodule(QtQuick 2.7)
 ecm_find_qmlmodule(QtQuick.Layouts 1.3)
 ecm_find_qmlmodule(QtQuick.Controls 1.4)
 ecm_find_qmlmodule(QtQuick.Controls.Styles.Plasma 2.0)
 ecm_find_qmlmodule(QtGraphicalEffects 1.0)
 ecm_find_qmlmodule(org.kde.kquickcontrolsaddons 2.0)
 ecm_find_qmlmodule(org.kde.plasma.core 2.0)
 ecm_find_qmlmodule(org.kde.plasma.components 2.0)
 
 include(CheckIncludeFiles)
 include(CMakePackageConfigHelpers)
 include(ECMOptionalAddSubdirectory)
 include(ECMQtDeclareLoggingCategory)
 include(KDECMakeSettings)
 #include(KDECompilerSettings NO_POLICY_SCOPE)
 include(KDEInstallDirs)
 include(KDEPackageAppTemplates)
 include(WriteBasicConfigVersionFile)
 
 include(Definitions.cmake)
 
 add_subdirectory(declarativeimports)
 add_subdirectory(liblatte2)
 add_subdirectory(indicators)
 add_subdirectory(app)
 add_subdirectory(containmentactions)
 add_subdirectory(containment)
 add_subdirectory(icons)
 add_subdirectory(plasmoid)
 add_subdirectory(shell)
 
 ki18n_install(po)
diff --git a/containment/package/metadata.desktop b/containment/package/metadata.desktop
index a0f310ba..21b9f1ae 100644
--- a/containment/package/metadata.desktop
+++ b/containment/package/metadata.desktop
@@ -1,68 +1,68 @@
 [Desktop Entry]
 Encoding=UTF-8
 Name=Latte
 Name[ast]=Latte
 Name[ca]=Latte
 Name[ca@valencia]=Latte
 Name[cs]=Latte
 Name[da]=Latte
 Name[de]=Latte
 Name[el]=Latte
 Name[en_GB]=Latte
 Name[es]=Latte
 Name[eu]=Latte
 Name[fi]=Latte
 Name[gl]=Latte
 Name[it]=Latte
 Name[ko]=Latte
 Name[nl]=Latte
 Name[nn]=Latte
 Name[pl]=Latte
 Name[pt]=Latte
 Name[pt_BR]=Latte
 Name[ru]=Latte
 Name[sv]=Latte
 Name[uk]=Латте
 Name[x-test]=xxLattexx
 Name[zh_CN]=Latte
 Name[zh_TW]=Latte
 Comment=Containment provided for the Latte Dock
 Comment[ca]=Intèrpret d'ordres proporcionat pel Latte Dock
 Comment[ca@valencia]=Intèrpret d'ordres proporcionat pel Latte Dock
 Comment[da]=Beholder til Latte-dokken
 Comment[de]=Containment für Latte-Dock
 Comment[el]=Περιέκτης της εφαρμογής Latte
 Comment[en_GB]=Containment provided for the Latte Dock
 Comment[es]=Contención proporcionada para Latte Dock
 Comment[eu]=Konfinamendua hornitu da Latte Dockentzako
 Comment[fi]=Latte-telakalla tarjottu sisällytys
 Comment[gl]=Contedor fornecido para a doca Latte.
 Comment[it]=Contenitore fornito per Latte Dock
 Comment[ko]=Latte 독을 위해 제공된 컨테이너
 Comment[nl]=Container geleverd voor de Latte Dock
 Comment[nn]=Behaldar for Latte-dokk
 Comment[pl]=Pojemnik dla doku Latte
 Comment[pt]=Contentor oferecido para a área acoplável do Latte
 Comment[pt_BR]=Contêiner fornecido pelo Latte Dock
 Comment[ru]=Контейнер Latte Dock
 Comment[sv]=Omgivning tillhandahållen för Latte dockningsfönster
 Comment[uk]=Контейнер панелі Латте
 Comment[x-test]=xxContainment provided for the Latte Dockxx
 Comment[zh_CN]=用于 Latte 停靠栏的容器
 Comment[zh_TW]=提供 Latte Dock 使用的容器
 
 Type=Service
 NoDisplay=true
 
 X-KDE-PluginInfo-Author=Michail Vourlakos, Smith Ar
 X-KDE-PluginInfo-Email=mvourlakos@gmail.com, audoban@openmailbox.org
 X-KDE-PluginInfo-Name=org.kde.latte.containment
-X-KDE-PluginInfo-Version=0.8.96
+X-KDE-PluginInfo-Version=0.8.97
 X-KDE-PluginInfo-Website=https://github.com/psifidotos/Latte-Dock
 X-KDE-PluginInfo-Category=X-KDE-PluginInfo-Depends=
 X-KDE-PluginInfo-License=GPL
 X-KDE-PluginInfo-EnabledByDefault=true
 X-KDE-ServiceTypes=Plasma/Applet,Plasma/Containment
 X-Plasma-API=declarativeappletscript
 X-Plasma-MainScript=ui/main.qml
 X-Plasma-ContainmentType=Panel
diff --git a/plasmoid/package/metadata.desktop b/plasmoid/package/metadata.desktop
index 0dc0d641..a0165226 100644
--- a/plasmoid/package/metadata.desktop
+++ b/plasmoid/package/metadata.desktop
@@ -1,52 +1,52 @@
 [Desktop Entry]
 Name=Latte Tasks
 Name[ca]=Tasques del Latte
 Name[ca@valencia]=Tasques del Latte
 Name[en_GB]=Latte Tasks
 Name[es]=Tareas de Latte
 Name[fi]=Latte-tehtävät
 Name[gl]=Tarefas de Latte
 Name[it]=Processi di Latte
 Name[ko]=Latte 태스크
 Name[nl]=Latte-taken
 Name[pl]=Zadania Latte
 Name[pt]=Tarefas do Latte
 Name[pt_BR]=Tarefas do Latte
 Name[ru]=Процессы Latte
 Name[sv]=Latte aktiviteter
 Name[uk]=Завдання Латте
 Name[x-test]=xxLatte Tasksxx
 Name[zh_TW]=Latte 任務
 Comment=Tasks plasmoid from Latte Dock
 Comment[ca]=Plasmoide de tasques del Latte Dock
 Comment[ca@valencia]=Plasmoide de tasques del Latte Dock
 Comment[en_GB]=Tasks plasmoid from Latte Dock
 Comment[es]=Plasmoide de tareas de Latte Dock
 Comment[fi]=Latte-telakan tehtäväsovelma
 Comment[gl]=Plasmoides de tarefas da doca Latte
 Comment[it]=Plasmoide dei processi da Latte Dock
 Comment[ko]=Latte 독의 태스크 Plasmoid
 Comment[nl]=Plasmoid voor taken uit Latte Dock
 Comment[pl]=Plazmoidy zadań dla doku Latte
 Comment[pt]=Plasmóide de tarefas da Área Acoplável do Latte
 Comment[pt_BR]=Plasmoide de tarefas do Latte Dock
 Comment[ru]=Виджет процессов из Latte Dock
 Comment[sv]=Aktivitetsplasmoid för Latte dockningsfönster
 Comment[uk]=Плазмоїд завдань з панелі Латте
 Comment[x-test]=xxTasks plasmoid from Latte Dockxx
 Comment[zh_TW]=來自 Latte Dock 的任務 Plasmoid
 
 Type=Service
 Icon=latte-dock
 X-KDE-ServiceTypes=Plasma/Applet
 X-Plasma-API=declarativeappletscript
 X-Plasma-MainScript=ui/main.qml
 X-Plasma-Provides=org.kde.plasma.multitasking
 X-KDE-PluginInfo-Author=Michail Vourlakos, Smith Ar
 X-KDE-PluginInfo-Email=mvourlakos@gmail.com, audoban@openmailbox.org
 X-KDE-PluginInfo-Name=org.kde.latte.plasmoid
-X-KDE-PluginInfo-Version=0.8.96
+X-KDE-PluginInfo-Version=0.8.97
 X-KDE-PluginInfo-Website=https://github.com/psifidotos/Latte-Dock
 X-KDE-PluginInfo-Category=Windows and Tasks
 X-KDE-PluginInfo-Depends=X-KDE-PluginInfo-License=GPL v2+
 X-KDE-PluginInfo-EnabledByDefault=true
diff --git a/shell/package/metadata.desktop b/shell/package/metadata.desktop
index 5cd2e132..20a6fbf2 100644
--- a/shell/package/metadata.desktop
+++ b/shell/package/metadata.desktop
@@ -1,87 +1,87 @@
 [Desktop Entry]
 Encoding=UTF-8
 Name=Latte Shell
 Name[ca]=Intèrpret d'ordres del Latte
 Name[ca@valencia]=Intèrpret d'ordres del Latte
 Name[cs]=Shell Latte
 Name[da]=Latte-skal
 Name[de]=Latte-Shell
 Name[el]=Κέλυφος Latte
 Name[en_GB]=Latte Shell
 Name[es]=Consola de Latte
 Name[eu]=Latte Shell-a
 Name[fi]=Latte-käyttöliittymä
 Name[gl]=Intérprete de ordes de Latte
 Name[it]=shell Latte
 Name[ko]=Latte 셸
 Name[nl]=Latte-shell
 Name[nn]=Latte-skal
 Name[pl]=Powłoka Latte
 Name[pt]=Consola do Latte
 Name[pt_BR]=Latte Shell
 Name[ru]=Оболочка Latte
 Name[sv]=Latte skal
 Name[uk]=Оболонка Латте
 Name[x-test]=xxLatte Shellxx
 Name[zh_CN]=Latte Shell
 Name[zh_TW]=Latte Shell
 Comment=Shell provided for the Latte Dock
 Comment[ca]=Intèrpret d'ordres proporcionat pel Latte Dock
 Comment[ca@valencia]=Intèrpret d'ordres proporcionat pel Latte Dock
 Comment[da]=Skal til Latte-dokken
 Comment[de]=Shell für Latte-Dock
 Comment[el]=Κέλυφος που παρέχεται από την εφαρμογή Latte
 Comment[en_GB]=Shell provided for the Latte Dock
 Comment[es]=Shell proporcionada para Latte Dock
 Comment[eu]=Shell-a Latte Dockentzat
 Comment[fi]=Latte-telakalle tarjottu käyttöliittymä
 Comment[gl]=Intérprete de ordes fornecido para a doca Latte.
 Comment[it]=Shell fornita per Latte Dock
 Comment[ko]=Latte 독을 위해 제공된 셸
 Comment[nl]=Shell geleverd voor de Latte Dock
 Comment[nn]=Skal frå Latte-dokk
 Comment[pl]=Powłoka dla doku Latte
 Comment[pt]=Consola oferecida para a área acoplável do Latte
 Comment[pt_BR]=Shell fornecido pelo Latte Dock
 Comment[ru]=Оболочка для Latte Dock
 Comment[sv]=Skal tillhandahållet för Latte dockningsfönster
 Comment[uk]=Оболонка панелі Латте
 Comment[x-test]=xxShell provided for the Latte Dockxx
 Comment[zh_CN]=用于 Latte 停靠栏的 Shell
 Comment[zh_TW]=由 Latte Dock 提供的 Shell
 
 Keywords=shell
 Keywords[ca]=intèrpret d'ordres
 Keywords[ca@valencia]=intèrpret d'ordres
 Keywords[da]=skal
 Keywords[de]=Shell
 Keywords[el]=κέλυφος
 Keywords[en_GB]=shell
 Keywords[es]=consola
 Keywords[eu]=shell
 Keywords[fi]=käyttöliittymä
 Keywords[gl]=intérprete de ordes
 Keywords[it]=shell
 Keywords[ko]=셸
 Keywords[nl]=shell
 Keywords[nn]=skal
 Keywords[pl]=powłoka
 Keywords[pt]=consola
 Keywords[pt_BR]=shell
 Keywords[ru]=оболочка
 Keywords[sk]=shell
 Keywords[sv]=skal
 Keywords[uk]=оболонка
 Keywords[x-test]=xxshellxx
 Keywords[zh_CN]=shell
 Keywords[zh_TW]=shell
 Type=Service
 
 X-KDE-ServiceTypes=Plasma/Shell
 X-KDE-ParentApp=latte-dock
 X-KDE-PluginInfo-Author=Michail Vourlakos, Smith Ar
 X-KDE-PluginInfo-Email=mvourlakos@gmail.com, audoban@openmailbox.org
 X-KDE-PluginInfo-License=GPLv3+
 X-KDE-PluginInfo-Name=org.kde.latte.shell
-X-KDE-PluginInfo-Version=0.8.96
+X-KDE-PluginInfo-Version=0.8.97
 X-KDE-PluginInfo-Website=https://github.com/psifidotos/Latte-Dock