diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -48,7 +48,7 @@
 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")
diff --git a/src/printing/grantlee/themes/default/theme.html b/src/printing/grantlee/themes/default/theme.html
--- a/src/printing/grantlee/themes/default/theme.html
+++ b/src/printing/grantlee/themes/default/theme.html
@@ -53,10 +53,10 @@
    <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 %}
diff --git a/src/printing/grantlee/themes/full/theme.html b/src/printing/grantlee/themes/full/theme.html
--- a/src/printing/grantlee/themes/full/theme.html
+++ b/src/printing/grantlee/themes/full/theme.html
@@ -53,12 +53,12 @@
    <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>
diff --git a/src/viewertemplates/contact_embedded.html b/src/viewertemplates/contact_embedded.html
--- a/src/viewertemplates/contact_embedded.html
+++ b/src/viewertemplates/contact_embedded.html
@@ -55,20 +55,30 @@
           {% 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 %}