diff --git a/addressbook/setup/setup.inc.php b/addressbook/setup/setup.inc.php
index fcf1e6c1cc..a6d66bdfc9 100755
--- a/addressbook/setup/setup.inc.php
+++ b/addressbook/setup/setup.inc.php
@@ -9,7 +9,7 @@
 /* Basic information about this app */
 $setup_info['addressbook']['name']      = 'addressbook';
 $setup_info['addressbook']['title']     = 'Addressbook';
-$setup_info['addressbook']['version']   = '20.1';
+$setup_info['addressbook']['version']   = '21.1';
 $setup_info['addressbook']['app_order'] = 4;
 $setup_info['addressbook']['enable']    = 1;
 $setup_info['addressbook']['index']    = 'addressbook.addressbook_ui.index&ajax=true';
@@ -52,7 +52,7 @@ $setup_info['addressbook']['hooks']['status-get_actions'] = 'addressbook_hooks::
 /* Dependencies for this app to work */
 $setup_info['addressbook']['depends'][] = array(
 	'appname' => 'api',
-	'versions' => Array('20.1')
+	'versions' => Array('21.1')
 );
 
 // installation checks for addresbook
diff --git a/admin/setup/setup.inc.php b/admin/setup/setup.inc.php
index 9ee7050dce..f2fe587256 100644
--- a/admin/setup/setup.inc.php
+++ b/admin/setup/setup.inc.php
@@ -9,7 +9,7 @@
  */
 
 $setup_info['admin']['name']      = 'admin';
-$setup_info['admin']['version']   = '20.1';
+$setup_info['admin']['version']   = '21.1';
 $setup_info['admin']['app_order'] = 1;
 $setup_info['admin']['tables']    = array('egw_admin_queue','egw_admin_remote');
 $setup_info['admin']['enable']    = 1;
@@ -40,5 +40,5 @@ $setup_info['admin']['hooks']['addressbook_edit'] = 'admin.admin_account.address
 // Dependencies for this app to work
 $setup_info['admin']['depends'][] = array(
 	'appname' => 'api',
-	'versions' => Array('20.1')
+	'versions' => Array('21.1')
 );
diff --git a/admin/setup/tables_update.inc.php b/admin/setup/tables_update.inc.php
index 857f857f9b..a2fa96d995 100644
--- a/admin/setup/tables_update.inc.php
+++ b/admin/setup/tables_update.inc.php
@@ -288,3 +288,13 @@ function admin_upgrade19_1()
 {
 	return $GLOBALS['setup_info']['admin']['currentver'] = '20.1';
 }
+
+/**
+ * Bump version to 21.1
+ *
+ * @return string
+ */
+function admin_upgrade20_1()
+{
+	return $GLOBALS['setup_info']['admin']['currentver'] = '21.1';
+}
diff --git a/api/setup/setup.inc.php b/api/setup/setup.inc.php
index 38662ff8b4..380553f004 100644
--- a/api/setup/setup.inc.php
+++ b/api/setup/setup.inc.php
@@ -11,7 +11,7 @@
 /* Basic information about this app */
 $setup_info['api']['name']      = 'api';
 $setup_info['api']['title']     = 'EGroupware API';
-$setup_info['api']['version']   = '20.1.003';
+$setup_info['api']['version']   = '21.1';
 $setup_info['api']['versions']['current_header'] = '1.29';
 // maintenance release in sync with changelog in doc/rpm-build/debian.changes
 $setup_info['api']['versions']['maintenance_release'] = '21.1.20210420';
@@ -128,7 +128,7 @@ $setup_info['api']['check_install'] = array(
 
 // CalDAV / CardDAV Sync
 $setup_info['groupdav']['name']      = 'groupdav';
-$setup_info['groupdav']['version']   = '20.1';
+$setup_info['groupdav']['version']   = '21.1';
 $setup_info['groupdav']['enable']    = 2;
 $setup_info['groupdav']['app_order'] = 1;
 $setup_info['groupdav']['icon']      = 'groupdav';
diff --git a/api/setup/tables_update.inc.php b/api/setup/tables_update.inc.php
index 0b7e49a5e0..33af6b1778 100644
--- a/api/setup/tables_update.inc.php
+++ b/api/setup/tables_update.inc.php
@@ -782,3 +782,12 @@ function api_upgrade20_1_002()
 	return $GLOBALS['setup_info']['api']['currentver'] = '20.1.003';
 }
 
+/**
+ * Bump version to 21.1
+ *
+ * @return string
+ */
+function api_upgrade20_1_003()
+{
+	return $GLOBALS['setup_info']['activesync']['currentver'] = '21.1';
+}
diff --git a/calendar/setup/setup.inc.php b/calendar/setup/setup.inc.php
index 6f297a34b0..8924c4861e 100644
--- a/calendar/setup/setup.inc.php
+++ b/calendar/setup/setup.inc.php
@@ -9,7 +9,7 @@
  */
 
 $setup_info['calendar']['name']    = 'calendar';
-$setup_info['calendar']['version'] = '20.1';
+$setup_info['calendar']['version'] = '21.1';
 $setup_info['calendar']['app_order'] = 3;
 $setup_info['calendar']['enable']  = 1;
 $setup_info['calendar']['index']   = 'calendar.calendar_uiviews.index&ajax=true';
@@ -50,6 +50,6 @@ $setup_info['calendar']['hooks']['notifications_actions'] = 'calendar_hooks::not
 /* Dependencies for this app to work */
 $setup_info['calendar']['depends'][] = array(
 	 'appname' => 'api',
-	 'versions' => Array('20.1')
+	 'versions' => Array('21.1')
 );
 
diff --git a/calendar/setup/tables_update.inc.php b/calendar/setup/tables_update.inc.php
index ee9301c92a..d2e46ae4f5 100644
--- a/calendar/setup/tables_update.inc.php
+++ b/calendar/setup/tables_update.inc.php
@@ -2810,3 +2810,13 @@ function calendar_upgrade19_1()
 {
 	return $GLOBALS['setup_info']['calendar']['currentver'] = '20.1';
 }
+
+/**
+ * Bump version to 21.1
+ *
+ * @return string
+ */
+function calendar_upgrade20_1()
+{
+	return $GLOBALS['setup_info']['calendar']['currentver'] = '21.1';
+}
diff --git a/calendar/templates/mobile/app.css b/calendar/templates/mobile/app.css
index e7398264d6..396678f40a 100644
--- a/calendar/templates/mobile/app.css
+++ b/calendar/templates/mobile/app.css
@@ -111,10 +111,6 @@
   border: none;
   box-shadow: none;
 }
-#calendar-et2_target hr {
-  display: block;
-  border-top: 1px solid #696969;
-}
 #calendar-sidebox_buttons tbody {
   width: 100%;
 }
@@ -423,13 +419,13 @@ Hide subsequent headers in week view with non-consolidated owners
   top: 2em;
 }
 #calendar-view_view.hideDayColHeader tr:first-of-type .calendar_calGridHeader .calendar_calDayColHeader_spacer {
-  height: calc(1.5em + 32px);
+  height: calc(33.5em);
 }
 #calendar-view_view.hideDayColHeader tr .calendar_calGridHeader > span.et2_label {
   white-space: nowrap;
   display: block;
   position: static;
-  width: calc(100% - 58px);
+  width: calc(42%);
   margin-left: 58px;
   color: white;
   background-color: #2D6393;
@@ -2944,7 +2940,7 @@ div#calendar-container div.calendar table tbody tr.rowhilite td {
     width: 50px;
   }
   #calendar-toolbar .nm-mob-header #calendar-toolbar_toolbar {
-    width: calc(100% - 100px);
+    width: calc(0%);
     display: inline-block;
     padding: 0px !important;
   }
diff --git a/filemanager/setup/setup.inc.php b/filemanager/setup/setup.inc.php
index a5624bc00c..0913aa94e5 100755
--- a/filemanager/setup/setup.inc.php
+++ b/filemanager/setup/setup.inc.php
@@ -9,7 +9,7 @@
 
 $setup_info['filemanager']['name']    = 'filemanager';
 $setup_info['filemanager']['title']   = 'Filemanager';
-$setup_info['filemanager']['version'] = '20.1';
+$setup_info['filemanager']['version'] = '21.1';
 $setup_info['filemanager']['app_order'] = 6;
 $setup_info['filemanager']['enable']  = 1;
 $setup_info['filemanager']['index']   = 'filemanager.filemanager_ui.index&ajax=true';
@@ -32,5 +32,5 @@ $setup_info['filemanager']['hooks']['search_link'] = 'filemanager_hooks::search_
 /* Dependencies for this app to work */
 $setup_info['filemanager']['depends'][] = array(
 	'appname' => 'api',
-	'versions' => array('20.1')
+	'versions' => array('21.1')
 );
\ No newline at end of file
diff --git a/home/setup/setup.inc.php b/home/setup/setup.inc.php
index c6e6688a11..7f0888db43 100755
--- a/home/setup/setup.inc.php
+++ b/home/setup/setup.inc.php
@@ -10,7 +10,7 @@
 /* Basic information about this app */
 $setup_info['home']['name']      = 'home';
 $setup_info['home']['title']     = 'Home';
-$setup_info['home']['version']   = '20.1';
+$setup_info['home']['version']   = '21.1';
 $setup_info['home']['app_order'] = 1;
 $setup_info['home']['enable']    = 1;
 $setup_info['home']['index']    = 'home.home_ui.index&ajax=true';
@@ -26,5 +26,5 @@ $setup_info['home']['maintainer'] = array(
 /* Dependencies for this app to work */
 $setup_info['home']['depends'][] = array(
 	'appname' => 'api',
-	'versions' => Array('20.1')
+	'versions' => Array('21.1')
 );
diff --git a/home/setup/tables_update.inc.php b/home/setup/tables_update.inc.php
index 2a39b6a450..67840d1209 100644
--- a/home/setup/tables_update.inc.php
+++ b/home/setup/tables_update.inc.php
@@ -134,3 +134,13 @@ function home_upgrade19_1()
 {
 	return $GLOBALS['setup_info']['home']['currentver'] = '20.1';
 }
+
+/**
+ * Bump version to 21.1
+ *
+ * @return string
+ */
+function home_upgrade20_1()
+{
+	return $GLOBALS['setup_info']['home']['currentver'] = '21.1';
+}
diff --git a/importexport/setup/setup.inc.php b/importexport/setup/setup.inc.php
index d611d27fcf..00437f3022 100644
--- a/importexport/setup/setup.inc.php
+++ b/importexport/setup/setup.inc.php
@@ -9,7 +9,7 @@
  */
 
 $setup_info['importexport']['name']      = 'importexport';
-$setup_info['importexport']['version']   = '20.1';
+$setup_info['importexport']['version']   = '21.1';
 $setup_info['importexport']['app_order'] = 2;
 $setup_info['importexport']['enable']    = 2;
 $setup_info['importexport']['tables']    = array('egw_importexport_definitions');
@@ -39,7 +39,7 @@ $setup_info['importexport']['hooks']['deleteaccount'] = 'importexport.importexpo
 /* Dependencies for this app to work */
 $setup_info['importexport']['depends'][] = array(
 	 'appname' => 'api',
-	 'versions' => Array('20.1')
+	 'versions' => Array('21.1')
 );
 
 // installation checks for importexport
diff --git a/importexport/setup/tables_update.inc.php b/importexport/setup/tables_update.inc.php
index fc67e88ddd..db94ae1adf 100755
--- a/importexport/setup/tables_update.inc.php
+++ b/importexport/setup/tables_update.inc.php
@@ -155,3 +155,13 @@ function importexport_upgrade19_1()
 {
 	return $GLOBALS['setup_info']['importexport']['currentver'] = '20.1';
 }
+
+/**
+ * Bump version to 21.1
+ *
+ * @return string
+ */
+function importexport_upgrade20_1()
+{
+	return $GLOBALS['setup_info']['importexport']['currentver'] = '21.1';
+}
diff --git a/infolog/setup/setup.inc.php b/infolog/setup/setup.inc.php
index 202245ca39..af6c071139 100644
--- a/infolog/setup/setup.inc.php
+++ b/infolog/setup/setup.inc.php
@@ -11,7 +11,7 @@
  */
 
 $setup_info['infolog']['name']      = 'infolog';
-$setup_info['infolog']['version']   = '20.1';
+$setup_info['infolog']['version']   = '21.1';
 $setup_info['infolog']['app_order'] = 5;
 $setup_info['infolog']['tables']    = array('egw_infolog','egw_infolog_extra','egw_infolog_users');
 $setup_info['infolog']['enable']    = 1;
@@ -34,7 +34,7 @@ $setup_info['infolog']['description'] =
 	The entries may be viewed or added from InfoLog direct or from within
 	the contact/address, project or calendar view.</p>
 	<p>Other documents / files can be linked to InfoLog entries and are store in the VFS
-	(eGroupWare\'s virtual file system).</p>';
+	(EGroupware\'s virtual file system).</p>';
 $setup_info['infolog']['note'] = '';
 
 /* The hooks this app includes, needed for hooks registration */
@@ -62,6 +62,6 @@ $setup_info['infolog']['hooks']['change_account_ids'] = 'infolog_customfields::c
 // Dependencies for this app to work
 $setup_info['infolog']['depends'][] = array(
 	'appname' => 'api',
-	'versions' => Array('20.1')
+	'versions' => Array('21.1')
 );
 
diff --git a/infolog/setup/tables_update.inc.php b/infolog/setup/tables_update.inc.php
index cc49cb9b44..a960ced708 100644
--- a/infolog/setup/tables_update.inc.php
+++ b/infolog/setup/tables_update.inc.php
@@ -1131,3 +1131,13 @@ function infolog_upgrade19_1_001()
 {
 	return $GLOBALS['setup_info']['infolog']['currentver'] = '20.1';
 }
+
+/**
+ * Bump version to 21.1
+ *
+ * @return string
+ */
+function infolog_upgrade20_1()
+{
+	return $GLOBALS['setup_info']['infolog']['currentver'] = '21.1';
+}
diff --git a/mail/setup/setup.inc.php b/mail/setup/setup.inc.php
index 183f1a97cf..d45abdf45a 100644
--- a/mail/setup/setup.inc.php
+++ b/mail/setup/setup.inc.php
@@ -12,7 +12,7 @@
 
 $setup_info['mail']['name']      	= 'mail';
 $setup_info['mail']['title']     	= 'mail';
-$setup_info['mail']['version']     	= '20.1';
+$setup_info['mail']['version']     	= '21.1';
 $setup_info['mail']['app_order'] 	= 2;
 $setup_info['mail']['enable']    	= 1;
 $setup_info['mail']['index']    	= 'mail.mail_ui.index&ajax=true';
@@ -42,7 +42,7 @@ $setup_info['mail']['hooks']['config'] = 'mail_hooks::config';
 /* Dependencies for this app to work */
 $setup_info['mail']['depends'][] = array(
 	'appname'  => 'api',
-	'versions' => Array('20.1')
+	'versions' => Array('21.1')
 );
 // installation checks for mail
 $setup_info['mail']['check_install'] = array(
diff --git a/notifications/setup/setup.inc.php b/notifications/setup/setup.inc.php
index 71ea1d536c..3d68322385 100644
--- a/notifications/setup/setup.inc.php
+++ b/notifications/setup/setup.inc.php
@@ -14,7 +14,7 @@ if (!defined('NOTIFICATION_APP'))
 }
 
 $setup_info[NOTIFICATION_APP]['name']      = NOTIFICATION_APP;
-$setup_info[NOTIFICATION_APP]['version']   = '20.1';
+$setup_info[NOTIFICATION_APP]['version']   = '21.1';
 $setup_info[NOTIFICATION_APP]['app_order'] = 1;
 $setup_info[NOTIFICATION_APP]['tables']    = array('egw_notificationpopup');
 $setup_info[NOTIFICATION_APP]['enable']    = 2;
@@ -37,5 +37,5 @@ $setup_info[NOTIFICATION_APP]['hooks']['deleteaccount'] = 'notifications.notific
 /* Dependencies for this app to work */
 $setup_info[NOTIFICATION_APP]['depends'][] = array(
 	 'appname' => 'api',
-	 'versions' => Array('20.1')
+	 'versions' => Array('21.1')
 );
diff --git a/notifications/setup/tables_update.inc.php b/notifications/setup/tables_update.inc.php
index 0e1b88f750..71d80ff7f2 100644
--- a/notifications/setup/tables_update.inc.php
+++ b/notifications/setup/tables_update.inc.php
@@ -182,3 +182,13 @@ function notifications_upgrade19_1()
 {
 	return $GLOBALS['setup_info']['notifications']['currentver'] = '20.1';
 }
+
+/**
+ * Bump version to 21.1
+ *
+ * @return string
+ */
+function notifications_upgrade20_1()
+{
+	return $GLOBALS['setup_info']['notifications']['currentver'] = '21.1';
+}
diff --git a/pixelegg/setup/setup.inc.php b/pixelegg/setup/setup.inc.php
index 69b573e8ff..ba4c944b05 100755
--- a/pixelegg/setup/setup.inc.php
+++ b/pixelegg/setup/setup.inc.php
@@ -10,7 +10,7 @@
 
 $GLOBALS['egw_info']['template']['pixelegg']['name']      = 'pixelegg';
 $GLOBALS['egw_info']['template']['pixelegg']['title']     = 'Standard ';
-$GLOBALS['egw_info']['template']['pixelegg']['version']   = '20.1';
+$GLOBALS['egw_info']['template']['pixelegg']['version']   = '21.1';
 
 $GLOBALS['egw_info']['template']['pixelegg']['author'] = array(
    array('name' => 'EGroupware GmbH', 'url' => 'http://www.egroupware.org/'),
@@ -34,5 +34,5 @@ $GLOBALS['egw_info']['template']['pixelegg']['themes'] = array(
 // Dependencies for this template to work
 $GLOBALS['egw_info']['template']['pixelegg']['depends'][] = array(
 	'appname' => 'api',
-	'versions' => Array('20.1')
+	'versions' => Array('21.1')
 );
diff --git a/preferences/setup/setup.inc.php b/preferences/setup/setup.inc.php
index 1548d8fb02..f9105fb73b 100755
--- a/preferences/setup/setup.inc.php
+++ b/preferences/setup/setup.inc.php
@@ -10,7 +10,7 @@
 
 $setup_info['preferences']['name']      = 'preferences';
 $setup_info['preferences']['title']     = 'Preferences';
-$setup_info['preferences']['version']   = '20.1';
+$setup_info['preferences']['version']   = '21.1';
 $setup_info['preferences']['app_order'] = 1;
 $setup_info['preferences']['tables']    = '';
 $setup_info['preferences']['enable']    = 2;
@@ -33,5 +33,5 @@ $setup_info['preferences']['hooks']['deny_cats']     = 'preferences_hooks::deny_
 /* Dependencies for this app to work */
 $setup_info['preferences']['depends'][] = array(
 	'appname' => 'api',
-	'versions' => Array('20.1')
+	'versions' => Array('21.1')
 );
diff --git a/resources/setup/setup.inc.php b/resources/setup/setup.inc.php
index 21b840e37d..ce736621f3 100644
--- a/resources/setup/setup.inc.php
+++ b/resources/setup/setup.inc.php
@@ -12,7 +12,7 @@
 
 $setup_info['resources']['name']	= 'resources';
 $setup_info['resources']['title']	= 'Resources';
-$setup_info['resources']['version']	= '20.1';
+$setup_info['resources']['version']	= '21.1';
 $setup_info['resources']['app_order']	= 5;
 $setup_info['resources']['tables']	= array('egw_resources','egw_resources_extra');
 $setup_info['resources']['enable']	= 1;
@@ -36,6 +36,6 @@ $setup_info['resources']['hooks']['delete_category']	= 'resources.resources_hook
 
 $setup_info['resources']['depends'][]	= array(
 	 'appname' => 'api',
-	 'versions' => Array('20.1')
+	 'versions' => Array('21.1')
 );
 
diff --git a/resources/setup/tables_update.inc.php b/resources/setup/tables_update.inc.php
index c27d79c6a0..88ba030388 100644
--- a/resources/setup/tables_update.inc.php
+++ b/resources/setup/tables_update.inc.php
@@ -428,3 +428,13 @@ function resources_upgrade19_1_001()
 {
 	return $GLOBALS['setup_info']['resources']['currentver'] = '20.1';
 }
+
+/**
+ * Bump version to 21.1
+ *
+ * @return string
+ */
+function resources_upgrade20_1()
+{
+	return $GLOBALS['setup_info']['resources']['currentver'] = '21.1';
+}
diff --git a/timesheet/setup/setup.inc.php b/timesheet/setup/setup.inc.php
index cee77d28b6..74765f4b53 100644
--- a/timesheet/setup/setup.inc.php
+++ b/timesheet/setup/setup.inc.php
@@ -16,7 +16,7 @@ if (!defined('TIMESHEET_APP'))
 }
 
 $setup_info[TIMESHEET_APP]['name']      = TIMESHEET_APP;
-$setup_info[TIMESHEET_APP]['version']   = '20.1';
+$setup_info[TIMESHEET_APP]['version']   = '21.1';
 $setup_info[TIMESHEET_APP]['app_order'] = 5;
 $setup_info[TIMESHEET_APP]['tables']    = array('egw_timesheet','egw_timesheet_extra');
 $setup_info[TIMESHEET_APP]['enable']    = 1;
@@ -49,5 +49,5 @@ $setup_info[TIMESHEET_APP]['hooks']['acl_rights'] = 'timesheet_hooks::acl_rights
 /* Dependencies for this app to work */
 $setup_info[TIMESHEET_APP]['depends'][] = array(
 	 'appname' => 'api',
-	 'versions' => Array('20.1')
+	 'versions' => Array('21.1')
 );
diff --git a/timesheet/setup/tables_update.inc.php b/timesheet/setup/tables_update.inc.php
index 9f540e4446..88c1e64a3e 100644
--- a/timesheet/setup/tables_update.inc.php
+++ b/timesheet/setup/tables_update.inc.php
@@ -190,3 +190,13 @@ function timesheet_upgrade19_1()
 {
 	return $GLOBALS['setup_info']['timesheet']['currentver'] = '20.1';
 }
+
+/**
+ * Bump version to 21.1
+ *
+ * @return string
+ */
+function timesheet_upgrade20_1()
+{
+	return $GLOBALS['setup_info']['timesheet']['currentver'] = '21.1';
+}