diff --git a/CMakeLists.txt b/CMakeLists.txt
index a8fad88a..5459d29f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,104 +1,104 @@
 cmake_minimum_required(VERSION 3.5)
 set(KDEPIM_VERSION_NUMBER "5.11.40")
 project(kaddressbook VERSION ${KDEPIM_VERSION_NUMBER})
 
 set(KF5_MIN_VERSION "5.57.0")
 
 find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED)
 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
 include(ECMInstallIcons)
 
 
 include(ECMSetupVersion)
 include(ECMAddTests)
 
 include(GenerateExportHeader)
 include(ECMGenerateHeaders)
 
 include(FeatureSummary)
 include(CheckFunctionExists)
 include(ECMGeneratePriFile)
 
 
 include(KDEInstallDirs)
 include(KDECMakeSettings)
 include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
 include(ECMAddAppIcon)
 include(ECMQtDeclareLoggingCategory)
 
 
 # Do NOT add quote
 set(KDEPIM_DEV_VERSION alpha)
 
 # add an extra space
 if(DEFINED KDEPIM_DEV_VERSION)
     set(KDEPIM_DEV_VERSION " ${KDEPIM_DEV_VERSION}")
 endif()
 
 set(KDEPIM_VERSION "${KDEPIM_VERSION_NUMBER}${KDEPIM_DEV_VERSION}")
 
 set(KPIMTEXTEDIT_LIB_VERSION "5.11.40")
 set(AKONADI_VERSION "5.11.40")
 set(KONTACTINTERFACE_LIB_VERSION "5.11.40")
 
 set(KDEPIM_LIB_VERSION "${KDEPIM_VERSION_NUMBER}")
 set(KDEPIM_LIB_SOVERSION "5")
 
 
 set(QT_REQUIRED_VERSION "5.10.0")
 find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Test DBus PrintSupport)
 set(LIBKDEPIM_LIB_VERSION_LIB "5.11.40")
-set(KDEPIM_APPS_LIB_VERSION_LIB "5.11.41")
+set(KDEPIM_APPS_LIB_VERSION_LIB "5.11.42")
 set(LIBGRANTLEETHEME_LIB_VERSION_LIB "5.11.40")
 set(PIMCOMMON_LIB_VERSION_LIB "5.11.40")
 set(LIBKLEO_LIB_VERSION "5.11.40")
 # Find KF5 package
 find_package(KF5DBusAddons ${KF5_MIN_VERSION} CONFIG REQUIRED)
 find_package(KF5DocTools ${KF5_MIN_VERSION} REQUIRED)
 find_package(KF5KCMUtils ${KF5_MIN_VERSION} CONFIG REQUIRED)
 find_package(KF5Crash ${KF5_MIN_VERSION} REQUIRED)
 find_package(KF5IconThemes ${KF5_MIN_VERSION} REQUIRED)
 find_package(KF5Libkleo ${LIBKLEO_LIB_VERSION} CONFIG REQUIRED)
 
 option(DOMAIN_EXPERIMENTAL "Enable this feature if you want to build experimental domain library. Not Stable yet." FALSE)
 
 
 # Find KdepimLibs Package
 find_package(KF5PimTextEdit ${KPIMTEXTEDIT_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5Akonadi ${AKONADI_VERSION} CONFIG REQUIRED)
 find_package(KF5KontactInterface ${KONTACTINTERFACE_LIB_VERSION} CONFIG REQUIRED)
 find_package(KF5Libkdepim ${LIBKDEPIM_LIB_VERSION_LIB} CONFIG REQUIRED)
 find_package(KF5KdepimDBusInterfaces ${KDEPIM_APPS_LIB_VERSION_LIB} CONFIG REQUIRED)
 find_package(KF5PimCommonAkonadi ${PIMCOMMON_LIB_VERSION_LIB} CONFIG REQUIRED)
 
 find_package(KF5KaddressbookGrantlee ${KDEPIM_APPS_LIB_VERSION_LIB} CONFIG REQUIRED)
 find_package(KF5KaddressbookImportExport ${KDEPIM_APPS_LIB_VERSION_LIB} CONFIG REQUIRED)
 find_package(KF5GrantleeTheme ${LIBGRANTLEETHEME_LIB_VERSION_LIB} CONFIG REQUIRED)
 
 
 set(GPGMEPP_LIB_VERSION "1.8.0")
 find_package(Gpgmepp ${GPGMEPP_LIB_VERSION} CONFIG REQUIRED)
 
 find_package(KF5AkonadiSearch "5.11.40" CONFIG REQUIRED)
 set_package_properties(KF5AkonadiSearch PROPERTIES DESCRIPTION "The Akonadi Search libraries" URL "https://www.kde.org" TYPE REQUIRED PURPOSE "Provides search capabilities in KMail and Akonadi")
 
 include_directories(${kaddressbook_SOURCE_DIR} ${kaddressbook_BINARY_DIR})
 
 find_package(KF5Prison ${KF5_MIN_VERSION} CONFIG REQUIRED)
 
 add_definitions(-DTRANSLATION_DOMAIN=\"kaddressbook\")
 set(CMAKE_CXX_STANDARD 14)
 # workaround for https://bugreports.qt.io/browse/QTBUG-74665 (bug in qt5.13 reevaluate it)
 if (${Qt5Widgets_VERSION} STREQUAL "5.13.0")
    MESSAGE(STATUS "Qt version: ${Qt5Widgets_VERSION} DISABLE compile without deprecated methods. bug QTBUG-74665")
 else()
    add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x060000)
 endif()
 add_definitions(-DQT_NO_FOREACH)
 
 add_subdirectory(src)
 add_subdirectory(kontactplugin)
 
 install( FILES kaddressbook.renamecategories kaddressbook.categories DESTINATION ${KDE_INSTALL_CONFDIR} )
 
 feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff --git a/src/printing/grantlee/themes/default/theme.html b/src/printing/grantlee/themes/default/theme.html
index 87217fbe..ec8b5ae9 100644
--- a/src/printing/grantlee/themes/default/theme.html
+++ b/src/printing/grantlee/themes/default/theme.html
@@ -1,79 +1,79 @@
 <html>
 <head>
 <style>
  .whole_page {
    font-family: arial,sans-serif; font-size: 80%;
   }
   .data {
    vertical-align: top; font-size: 80%;
   }
   .last_data {
    vertical-align: top; padding-bottom: 6px; font-size: 80%;
   }
   .data_header {
     vertical-align: top; text-align: right; color: #a5a5a5; padding-right: 8px; font-size: 80%; white-space: nowrap;
   }
   .name {
      border-top: 1px solid #aaaaaa; font-weight: bold; background-color: #e0e0e0; margin-bottom: 4px; padding: 2px;
   }
   .extra_name {
      padding-left: 2px;
   }
   .last_extra_name {
      padding-left: 2px; margin-bottom: 6px;
   }
 </style>
 
 </head>
 <body>
 <div class=whole_page>
 {% if contacts %}
 {% for contact in contacts %}
 {% if contact.name %}
 <div class=name>{{ contact.name }}</div>
 {% else %}
 <div class=name>{{ contacti18n.nextcontacti18n }}</div>
 {% endif %}
 <div class=last_extra_name>{{ contact.realName|safe }}</div>
 
 <table cellpadding=0>
   {% if contact.emails %}
   <tr>
    <td class=data_header>{{ contacti18n.emailsi18n }}</td>
    <td class=data>
    {% for email in contact.emails %}
       {{ email.email }}{% if not forloop.last %}, {% endif %}
    {% endfor %}
    </td>
   </tr>
   {% endif %}
   {% if contact.organization %}
   <tr>
    <td class=data_header>{{ contacti18n.organizationi18n }}</td>
    <td class=last_data>{{ contact.organization }}</td>
   </tr>
   {% endif %}
-  {% if contact.webPage %}
+  {% if contact.url.url %}
   <tr>
    <td class=data_header>{{ contacti18n.websitei18n }}</td>
-   <td class=last_data>{{ contact.webPage|safe }}</td>
+   <td class=last_data>{{ contact.url.url }}</td>
   </tr>
   {% endif %}
   {% if contact.birthday %}
   <tr>
    <td class=data_header>{{ contacti18n.birthdayi18n }}</td>
    <td class=last_data>{{ contact.birthday }}</td>
   </tr>
   {% endif %}
   {% if contact.note %}
   <tr>
    <td class=data_header>{{ contacti18n.notei18n }}</td>
    <td class=last_data>{{ contact.note }}</td>
   </tr>
   {% endif %}
 </table>
 <br>
 {% endfor %}
 {% endif %}
 
 <html>
diff --git a/src/printing/grantlee/themes/full/theme.html b/src/printing/grantlee/themes/full/theme.html
index 67167fb2..5e0c752a 100644
--- a/src/printing/grantlee/themes/full/theme.html
+++ b/src/printing/grantlee/themes/full/theme.html
@@ -1,112 +1,112 @@
 <html>
 <head>
 <style>
  .whole_page {
    font-family: arial,sans-serif; font-size: 80%;
   }
   .data {
    vertical-align: top; font-size: 80%;
   }
   .last_data {
    vertical-align: top; padding-bottom: 6px; font-size: 80%;
   }
   .data_header {
     vertical-align: top; text-align: right; color: #a5a5a5; padding-right: 8px; font-size: 80%; white-space: nowrap;
   }
   .name {
      border-top: 1px solid #aaaaaa; font-weight: bold; background-color: #e0e0e0; margin-bottom: 4px; padding: 2px;
   }
   .extra_name {
      padding-left: 2px;
   }
   .last_extra_name {
      padding-left: 2px; margin-bottom: 6px;
   }
 </style>
 
 </head>
 <body>
 <div class=whole_page>
 {% if contacts %}
 {% for contact in contacts %}
 <div class=name>{{ contact.name }}</div>
 <div class=last_extra_name>{{ contact.realName|safe }}</div>
 <table cellpadding=0>
   {% if contact.photo %}
   <tr>
    <td class=data_header>{{ contact.photo|safe }}</td>
   </tr>
   {% endif %}
   {% if contact.emails %}
   <tr>
    <td class=data_header>{{ contacti18n.emailsi18n }}</td>
    <td class=data>
    {% for email in contact.emails %}
       {{ email.email }}{% if not forloop.last %}, {% endif %}
    {% endfor %}
    </td>
   </tr>
   {% endif %}
   {% if contact.organization %}
   <tr>
    <td class=data_header>{{ contacti18n.organizationi18n }}</td>
    <td class=last_data>{{ contact.organization }}</td>
   </tr>
   {% endif %}
-  {% if contact.webPage %}
+  {% for url in contact.urls %}
   <tr>
    <td class=data_header>{{ contacti18n.websitei18n }}</td>
-   <td class=last_data>{{ contact.webPage|safe }}</td>
+   <td class=last_data>{{ url.url }}</td>
   </tr>
-  {% endif %}
+  {% endfor %}
   {% if contact.birthday %}
   <tr>
    <td class=data_header>{{ contacti18n.birthdayi18n }}</td>
    <td class=last_data>{{ contact.birthday }}</td>
   </tr>
   {% endif %}
   {% if contact.note %}
   <tr>
    <td class=data_header>{{ contacti18n.notei18n }}</td>
    <td class=last_data>{{ contact.note }}</td>
   </tr>
   {% endif %}
   {% if contact.title %}
   <tr>
    <td class=data_header>{{ contacti18n.titlei18n }}</td>
    <td class=last_data>{{ contact.title }}</td>
   </tr>
   {% endif %}
 
   {% for address in contact.addresses %}
 
   {% if address.formattedAddress %}
   <tr>
    <td class=data_header>{{ address.typeLabel }}</td>
    <td class=last_data>
     {% with address.formattedAddress as fa %}
     {% for line in fa.splitlines %}{{ line }}<br/>{% endfor %}
     {% endwith %}
    </td>
   </tr>
   {% endif %}
   {% endfor %}
 
   {% for listphone in contact.phones %}
   <tr>
    <td class=data_header>{{ listphone.typeLabel }}</td>
    <td class=last_data>{{ listphone.number }}</td>
   </tr>
   {% endfor %}
   {% for im in contact.instantManging %}
   <tr>
    <td class=data_header>{{ im.type }}</td>
    <td class=last_data>{{ im.address }}</td>
   </tr>
   {% endfor %}
 </table>
 <br>
 {% endfor %}
 {% endif %}
 
 <html>
diff --git a/src/viewertemplates/contact_embedded.html b/src/viewertemplates/contact_embedded.html
index 4ba899e5..6e52b4a1 100644
--- a/src/viewertemplates/contact_embedded.html
+++ b/src/viewertemplates/contact_embedded.html
@@ -1,183 +1,193 @@
   <div align="center">
     <table cellpadding="3" cellspacing="0">
       <tr>
         <td align="right" valign="top" width="30%" rowspan="3">
           <img src="contact_photo" width="100" vspace="1">
         </td>
         <td align="left" width="70%" colspan="2"><font size="+2" ><b>{{ contact.name }}</b></font></td>
       </tr>
       <tr>
         <td align="left" colspan="2">{{ contact.job }}</td>
       </tr>
       <tr>
         <td align="left" colspan="2">{{ contact.organization }}</td>
       </tr>
       {% if contact.birthday %}
         {% with contact.birthdayi18n as title %}
         {% if contact.birthdayage %}
           {% with contact.birthdayage|safe as value %}
           {% include "contact_row.html" %}
           {% endwith %}
         {% else %}
           {% with contact.birthday|safe as value %}
           {% include "contact_row.html" %}
           {% endwith %}
         {% endif %}
         {% endwith %}
       {% endif %}
 
       {% for phoneNumber in contact.phoneNumbers %}
       <tr>
         <td align="right" valign="top" width="30%"><b><font color="grey">{{ phoneNumber.typeLabel }}</font></b></td>
         {% if phoneNumber.supportsSms %}
           <td align="left" valign="top"><a href="phone:?index={{ forloop.counter0 }}">{{ phoneNumber.number }}</a></td>
           <td align="left" valign="top"><a href="sms:?index={{ forloop.counter0 }}"><img src="sms_icon" align="top"/></a></td>
         {% else %}
           <td align="left" valign="top" colspan="2"><a href="phone:?index={{ forloop.counter0 }}">{{ phoneNumber.number }}</a></td>
         {% endif %}
       </tr>
       {% endfor %}
 
       {% for email in contact.emails %}
       <tr>
           <td align="right" valign="top" width="30%"><b><font color="grey">{{ contact.emailsi18n }}</font></b></td>
           <td align="left" valign="top" colspan="2"><a href="mailto:{{ email.email }}">{{ email.email }}</a></td>
       </tr>
       {% endfor %}
 
       {% for imAddress in contact.imAddresses %}
           {% with imAddress.type as title %}
           {% with imAddress.imAddress|safe as value %}
           {% with imAddress.imIcon|safe as value2 %}
           {% include "contact_row.html" %}
           {% endwith %}
           {% endwith %}
           {% endwith %}
       {% endfor %}
       
-      {% for website in contact.websites %}
-        {% with contact.websitei18n as title %}
-        {% with website|safe as value %}
-        {% include "contact_row.html" %}
-        {% endwith %}
-        {% endwith %}
+      {% for website in contact.urls %}
+      <tr>
+        <td align="right" valign="top" width="30%"><b><font color="grey">{{ contact.websitei18n }}</font></b></td>
+        <td align="left" valign="top" colspan="2">
+        {% if website.url.scheme %}
+            <a href="{{ website.url }}">
+        {% else %}
+            <a href="https://{{ website.url }}">
+        {% endif %}
+        {{ website.url }}</a></td>
+      </tr>
       {% endfor %}
 
-      {% if contact.blogUrl %}
-        {% with "Blog Feed" as title %}
-        {% with contact.blogUrl|safe as value %}
-        {% include "contact_row.html" %}
-        {% endwith %}
-        {% endwith %}
+      {% if contact.blogFeed %}
+      <tr>
+        <td align="right" valign="top" width="30%"><b><font color="grey">{{ contact.blogUrli18n }}</font></b></td>
+        <td align="left" valign="top" colspan="2">
+        {% if contact.blogFeed.scheme %}
+            <a href="{{ contact.blogFeed }}">
+        {% else %}
+            <a href="https://{{ contact.blogFeed }}">
+        {% endif %}
+        {{ contact.blogFeed }}</a>
+      </tr>
       {% endif %}
 
       {% for address in contact.addresses %}
       <tr>
          <td align="right" valign="top" width="30%"><b><font color="grey">{{ address.typeLabel }}</font></b></td>
          <td align="left" valign="top"><a href="address:?index={{ forloop.counter0 }}">
          {% with address.formattedAddress as fa %}
            {% for line in fa.splitlines %}
              {{ line }}
              {% if line and not forloop.last %}<br/>{% endif %}
            {% endfor %}
          {% endwith %}
          </a></td>
          <td align="left" valign="top"><a href="address:?index={{ forloop.counter0 }}">
             <img src="map_icon" align="top"/>
          </a></td>
       </tr>
       {% endfor %}
 
       {% if contact.profession %}
         {% with contact.Professioni18n as title %}
         {% with contact.profession as value %}
         {% include "contact_row.html" %}
         {% endwith %}
         {% endwith %}
       {% endif %}
 
       {% if contact.department %}
         {% with contact.departmenti18n as title %}
         {% with contact.department as value %}
         {% include "contact_row.html" %}
         {% endwith %}
         {% endwith %}
       {% endif %}
 
       {% if contact.office %}
         {% with contact.officei18n as title %}
         {% with contact.office as value %}
         {% include "contact_row.html" %}
         {% endwith %}
         {% endwith %}
       {% endif %}
 
       {% if contact.manager %}
         {% with contact.manageri18n as title %}
         {% with contact.manager as value %}
         {% include "contact_row.html" %}
         {% endwith %}
         {% endwith %}
       {% endif %}
 
       {% if contact.assistant %}
         {% with contact.assistanti18n as title %}
         {% with contact.assistant as value %}
         {% include "contact_row.html" %}
         {% endwith %}
         {% endwith %}
       {% endif %}
 
       {% if contact.spouse %}
         {% with contact.spousei18n as title %}
         {% with contact.spouse as value %}
         {% include "contact_row.html" %}
         {% endwith %}
         {% endwith %}
       {% endif %}
 
       {% if contact.anniversary %}
         {% with contact.anniversaryi18n as title %}
         {% with contact.anniversary as value %}
         {% include "contact_row.html" %}
         {% endwith %}
         {% endwith %}
       {% endif %}
 
       {% for customField in contact.customFieldsUrl %}
         {% with customField.title as title %}
         {% with customField.value|safe as value %}
         {% include "contact_row.html" %}
         {% endwith %}
         {% endwith %}
       {% endfor %}
 
       {% for customField in contact.customFields %}
         {% with customField.title as title %}
         {% with customField.value as value %}
         {% include "contact_row.html" %}
         {% endwith %}
         {% endwith %}
       {% endfor %}
 
       {% if contact.addressBookName %}
         {% with contact.addressBookNamei18n as title %}
         {% with contact.addressBookName as value %}
         {% include "contact_row.html" %}
         {% endwith %}
         {% endwith %}
       {% endif %}
       {% if contact.note %}
         {% with contact.notei18n as title %}
         {% with contact.note|safe as value %}
         {% include "contact_row.html" %}
         {% endwith %}
         {% endwith %}
       {% endif %}
     </table>
     {% if contact.hasqrcode %}
       <p align="center">
        <img src="qrcode" vspace="1">
       </p>
     {% endif %}
   </div>