diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6a7705e9..7d5bc9b4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,38 +5,63 @@ This project adheres to [Semantic Versioning](https://semver.org/).
 
 ❤️ **Donate:** Enjoying MagicMirror²? [Please consider a donation!](https://magicmirror.builders/donate) With your help we can continue to improve the MagicMirror²
 
-## [2.12.0] - Unreleased (Develop Branch)
+## [2.13.0] - Unreleased (Develop Branch - Please add your contributions to this release.)
 
-_This release is scheduled to be released on 2020-07-01._
+_This release is scheduled to be released on 2020-10-01._
 
 ### Added
 
-- Compliments Module - Add Advice API (https://api.adviceslip.com/) Option
-
-- Added prettier for an even cleaner codebase
-
-- Hide Sunrise/Sunset in Weather module
-
 ### Updated
 
-- Cleaned up alert module code
-- Cleaned up check_config code
-- Replaced grunt-based linters with their non-grunt equivalents
-- Switch to most of the eslint:recommended rules and fix warnings
-- Replaced insecure links with https ones
-- Cleaned up all "no-undef" warnings from eslint
-- Added location title wrapping for calendar module
+- Change incorrect weather.js default properties.
 
 ### Deleted
 
-- Removed truetype (ttf) fonts
+### Fixed
+
+- Fix the use of "maxNumberOfDays" in the module "weatherforecast depending on the endpoint (forecast/daily or forecast)". [#2018](https://github.com/MichMich/MagicMirror/issues/2018)
+- Fix calendar display. Account for current timezone. [#2068](https://github.com/MichMich/MagicMirror/issues/2068)
+- Fix logLevel being set before loading config.
+- Fix incorrect namespace links in svg clockfaces. [#2072](https://github.com/MichMich/MagicMirror/issues/2072)
+
+## [2.12.0] - 2020-07-01
+
+Special thanks to the following contributors: @AndreKoepke, @andrezibaia, @bryanzzhu, @chamakura, @DarthBrento, @Ekristoffe, @khassel, @Legion2, @ndom91, @radokristof, @rejas, @XBCreepinJesus & @ZoneMR.
+
+ℹ️ **Note:** This update uses new dependencies. Please update using the following command: `git pull && npm install`.
+
+### Added
+
+- Added option to config the level of logging.
+- Added prettier for an even cleaner codebase.
+- Hide Sunrise/Sunset in Weather module.
+- Hide Sunrise/Sunset in Current Weather module.
+- Added Met Office DataHub (UK) provider.
+
+### Updated
+
+- Cleaned up alert module code.
+- Cleaned up check_config code.
+- Replaced grunt-based linters with their non-grunt equivalents.
+- Switch to most of the eslint:recommended rules and fix warnings.
+- Replaced insecure links with https ones.
+- Cleaned up all "no-undef" warnings from eslint.
+- Added location title wrapping for calendar module.
+- Updated the BG translation.
+
+### Deleted
+
+- Removed truetype (ttf) fonts.
 
 ### Fixed
 
-- The broken modules due to Socket.io change from last release [#1973](https://github.com/MichMich/MagicMirror/issues/1973)
-- Add backward compatibility for old module code in socketclient.js [#1973](https://github.com/MichMich/MagicMirror/issues/1973)
-- Support multiple instances of calendar module with different config [#1109](https://github.com/MichMich/MagicMirror/issues/1109)
-- Fix the use of "maxNumberOfDays" in the module "weatherforecast" [#2018](https://github.com/MichMich/MagicMirror/issues/2018)
+- The broken modules due to Socket.io change from last release. [#1973](https://github.com/MichMich/MagicMirror/issues/1973)
+- Add backward compatibility for old module code in socketclient.js. [#1973](https://github.com/MichMich/MagicMirror/issues/1973)
+- Support multiple instances of calendar module with different config. [#1109](https://github.com/MichMich/MagicMirror/issues/1109)
+- Fix the use of "maxNumberOfDays" in the module "weatherforecast". [#2018](https://github.com/MichMich/MagicMirror/issues/2018)
+- Throw error when check_config fails. [#1928](https://github.com/MichMich/MagicMirror/issues/1928)
+- Bug fix related to 'maxEntries' not displaying Calendar events. [#2050](https://github.com/MichMich/MagicMirror/issues/2050)
+- Updated ical library to latest version. [#1926](https://github.com/MichMich/MagicMirror/issues/1926)
 
 ## [2.11.0] - 2020-04-01
 
diff --git a/config/config.js.sample b/config/config.js.sample
index 40737039..a0164198 100644
--- a/config/config.js.sample
+++ b/config/config.js.sample
@@ -28,6 +28,7 @@ var config = {
 	httpsCertificate: "", 	// HTTPS Certificate path, only require when useHttps is true
 
 	language: "en",
+	logLevel: ["INFO", "LOG", "WARN", "ERROR"],
 	timeFormat: 24,
 	units: "metric",
 	// serverOnly:  true/false/"local" ,
diff --git a/js/app.js b/js/app.js
index fe811a95..b1fcc9bb 100644
--- a/js/app.js
+++ b/js/app.js
@@ -5,20 +5,18 @@
  * MIT Licensed.
  */
 var fs = require("fs");
+var path = require("path");
+var Log = require(__dirname + "/logger.js");
 var Server = require(__dirname + "/server.js");
 var Utils = require(__dirname + "/utils.js");
 var defaultModules = require(__dirname + "/../modules/default/defaultmodules.js");
-var path = require("path");
 
 // Alias modules mentioned in package.js under _moduleAliases.
 require("module-alias/register");
 
-// add timestamps in front of log messages
-require("console-stamp")(console, "yyyy-mm-dd HH:MM:ss.l");
-
 // Get version number.
 global.version = JSON.parse(fs.readFileSync("package.json", "utf8")).version;
-console.log("Starting MagicMirror: v" + global.version);
+Log.log("Starting MagicMirror: v" + global.version);
 
 // global absolute root path
 global.root_path = path.resolve(__dirname + "/../");
@@ -36,10 +34,10 @@ if (process.env.MM_PORT) {
 // The next part is here to prevent a major exception when there
 // is no internet connection. This could probable be solved better.
 process.on("uncaughtException", function (err) {
-	console.log("Whoops! There was an uncaught exception...");
-	console.error(err);
-	console.log("MagicMirror will not quit, but it might be a good idea to check why this happened. Maybe no internet connection?");
-	console.log("If you think this really is an issue, please open an issue on GitHub: https://github.com/MichMich/MagicMirror/issues");
+	Log.error("Whoops! There was an uncaught exception...");
+	Log.error(err);
+	Log.error("MagicMirror will not quit, but it might be a good idea to check why this happened. Maybe no internet connection?");
+	Log.error("If you think this really is an issue, please open an issue on GitHub: https://github.com/MichMich/MagicMirror/issues");
 });
 
 /* App - The core app.
@@ -54,7 +52,7 @@ var App = function () {
 	 * argument callback function - The callback function.
 	 */
 	var loadConfig = function (callback) {
-		console.log("Loading config ...");
+		Log.log("Loading config ...");
 		var defaults = require(__dirname + "/defaults.js");
 
 		// For this check proposed to TestSuite
@@ -72,11 +70,11 @@ var App = function () {
 			callback(config);
 		} catch (e) {
 			if (e.code === "ENOENT") {
-				console.error(Utils.colors.error("WARNING! Could not find config file. Please create one. Starting with default configuration."));
+				Log.error(Utils.colors.error("WARNING! Could not find config file. Please create one. Starting with default configuration."));
 			} else if (e instanceof ReferenceError || e instanceof SyntaxError) {
-				console.error(Utils.colors.error("WARNING! Could not validate config file. Starting with default configuration. Please correct syntax errors at or above this line: " + e.stack));
+				Log.error(Utils.colors.error("WARNING! Could not validate config file. Starting with default configuration. Please correct syntax errors at or above this line: " + e.stack));
 			} else {
-				console.error(Utils.colors.error("WARNING! Could not load config file. Starting with default configuration. Error found: " + e));
+				Log.error(Utils.colors.error("WARNING! Could not load config file. Starting with default configuration. Error found: " + e));
 			}
 			callback(defaults);
 		}
@@ -94,7 +92,7 @@ var App = function () {
 			}
 		});
 		if (usedDeprecated.length > 0) {
-			console.warn(Utils.colors.warn("WARNING! Your config is using deprecated options: " + usedDeprecated.join(", ") + ". Check README and CHANGELOG for more up-to-date ways of getting the same functionality."));
+			Log.warn(Utils.colors.warn("WARNING! Your config is using deprecated options: " + usedDeprecated.join(", ") + ". Check README and CHANGELOG for more up-to-date ways of getting the same functionality."));
 		}
 	};
 
@@ -119,7 +117,7 @@ var App = function () {
 			fs.accessSync(helperPath, fs.R_OK);
 		} catch (e) {
 			loadModule = false;
-			console.log("No helper found for module: " + moduleName + ".");
+			Log.log("No helper found for module: " + moduleName + ".");
 		}
 
 		if (loadModule) {
@@ -127,11 +125,11 @@ var App = function () {
 			var m = new Module();
 
 			if (m.requiresVersion) {
-				console.log("Check MagicMirror version for node helper '" + moduleName + "' - Minimum version:  " + m.requiresVersion + " - Current version: " + global.version);
+				Log.log("Check MagicMirror version for node helper '" + moduleName + "' - Minimum version:  " + m.requiresVersion + " - Current version: " + global.version);
 				if (cmpVersions(global.version, m.requiresVersion) >= 0) {
-					console.log("Version is ok!");
+					Log.log("Version is ok!");
 				} else {
-					console.log("Version is incorrect. Skip module: '" + moduleName + "'");
+					Log.log("Version is incorrect. Skip module: '" + moduleName + "'");
 					return;
 				}
 			}
@@ -152,7 +150,7 @@ var App = function () {
 	 * argument module string - The name of the module (including subpath).
 	 */
 	var loadModules = function (modules, callback) {
-		console.log("Loading module helpers ...");
+		Log.log("Loading module helpers ...");
 
 		var loadNextModule = function () {
 			if (modules.length > 0) {
@@ -163,7 +161,7 @@ var App = function () {
 				});
 			} else {
 				// All modules are loaded
-				console.log("All module helpers loaded.");
+				Log.log("All module helpers loaded.");
 				callback();
 			}
 		};
@@ -204,6 +202,8 @@ var App = function () {
 		loadConfig(function (c) {
 			config = c;
 
+			Log.setLogLevel(config.logLevel);
+
 			var modules = [];
 
 			for (var m in config.modules) {
@@ -215,7 +215,7 @@ var App = function () {
 
 			loadModules(modules, function () {
 				var server = new Server(config, function (app, io) {
-					console.log("Server started ...");
+					Log.log("Server started ...");
 
 					for (var h in nodeHelpers) {
 						var nodeHelper = nodeHelpers[h];
@@ -224,7 +224,7 @@ var App = function () {
 						nodeHelper.start();
 					}
 
-					console.log("Sockets connected & modules started ...");
+					Log.log("Sockets connected & modules started ...");
 
 					if (typeof callback === "function") {
 						callback(config);
@@ -255,7 +255,7 @@ var App = function () {
 	 * this.stop() is called by app.on("before-quit"... in `electron.js`
 	 */
 	process.on("SIGINT", () => {
-		console.log("[SIGINT] Received. Shutting down server...");
+		Log.log("[SIGINT] Received. Shutting down server...");
 		setTimeout(() => {
 			process.exit(0);
 		}, 3000); // Force quit after 3 seconds
@@ -266,7 +266,7 @@ var App = function () {
 	/* We also need to listen to SIGTERM signals so we stop everything when we are asked to stop by the OS.
 	 */
 	process.on("SIGTERM", () => {
-		console.log("[SIGTERM] Received. Shutting down server...");
+		Log.log("[SIGTERM] Received. Shutting down server...");
 		setTimeout(() => {
 			process.exit(0);
 		}, 3000); // Force quit after 3 seconds
diff --git a/js/check_config.js b/js/check_config.js
index f713657b..cfd56824 100644
--- a/js/check_config.js
+++ b/js/check_config.js
@@ -1,14 +1,10 @@
 /* Magic Mirror
  *
- * Checker configuration file
- *
- * By Rodrigo Ramírez Norambuena
- *    https://rodrigoramirez.com
+ * Check the configuration file for errors
  *
+ * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com
  * MIT Licensed.
- *
  */
-
 const Linter = require("eslint").Linter;
 const linter = new Linter();
 
@@ -17,6 +13,7 @@ const fs = require("fs");
 
 const rootPath = path.resolve(__dirname + "/../");
 const config = require(rootPath + "/.eslintrc.json");
+const Log = require(rootPath + "/js/logger.js");
 const Utils = require(rootPath + "/js/utils.js");
 
 /* getConfigFile()
@@ -34,23 +31,24 @@ function getConfigFile() {
 
 function checkConfigFile() {
 	const configFileName = getConfigFile();
+
 	// Check if file is present
 	if (fs.existsSync(configFileName) === false) {
-		console.error(Utils.colors.error("File not found: "), configFileName);
-		return;
+		Log.error(Utils.colors.error("File not found: "), configFileName);
+		throw new Error("No config file present!");
 	}
+
 	// check permission
 	try {
 		fs.accessSync(configFileName, fs.F_OK);
 	} catch (e) {
-		console.log(Utils.colors.error(e));
-		return;
+		Log.log(Utils.colors.error(e));
+		throw new Error("No permission to access config file!");
 	}
 
 	// Validate syntax of the configuration file.
-	// In case the there errors show messages and
-	// return
-	console.info(Utils.colors.info("Checking file... "), configFileName);
+	Log.info(Utils.colors.info("Checking file... "), configFileName);
+
 	// I'm not sure if all ever is utf-8
 	fs.readFile(configFileName, "utf-8", function (err, data) {
 		if (err) {
@@ -58,12 +56,14 @@ function checkConfigFile() {
 		}
 		const messages = linter.verify(data, config);
 		if (messages.length === 0) {
-			console.log("Your configuration file doesn't contain syntax errors :)");
+			Log.log("Your configuration file doesn't contain syntax errors :)");
 			return true;
 		} else {
+			// In case the there errors show messages and return
 			messages.forEach((error) => {
-				console.log("Line", error.line, "col", error.column, error.message);
+				Log.log("Line", error.line, "col", error.column, error.message);
 			});
+			throw new Error("Wrong syntax in config file!");
 		}
 	});
 }
diff --git a/js/electron.js b/js/electron.js
index 71eed9b8..0978cd0d 100644
--- a/js/electron.js
+++ b/js/electron.js
@@ -1,7 +1,8 @@
 "use strict";
 
 const electron = require("electron");
-const core = require(__dirname + "/app.js");
+const core = require("./app.js");
+const Log = require("./logger.js");
 
 // Config
 var config = process.env.config ? JSON.parse(process.env.config) : {};
@@ -86,7 +87,7 @@ function createWindow() {
 // This method will be called when Electron has finished
 // initialization and is ready to create browser windows.
 app.on("ready", function () {
-	console.log("Launching application.");
+	Log.log("Launching application.");
 	createWindow();
 });
 
@@ -110,7 +111,7 @@ app.on("activate", function () {
  * core.stop() is called by process.on("SIGINT"... in `app.js`
  */
 app.on("before-quit", (event) => {
-	console.log("Shutting down server...");
+	Log.log("Shutting down server...");
 	event.preventDefault();
 	setTimeout(() => {
 		process.exit(0);
diff --git a/js/loader.js b/js/loader.js
index 50e7176d..bc376bd9 100644
--- a/js/loader.js
+++ b/js/loader.js
@@ -182,7 +182,7 @@ var Loader = (function () {
 					}
 				};
 				script.onerror = function () {
-					console.error("Error on loading script:", fileName);
+					Log.error("Error on loading script:", fileName);
 					if (typeof callback === "function") {
 						callback();
 					}
@@ -202,7 +202,7 @@ var Loader = (function () {
 					}
 				};
 				stylesheet.onerror = function () {
-					console.error("Error on loading stylesheet:", fileName);
+					Log.error("Error on loading stylesheet:", fileName);
 					if (typeof callback === "function") {
 						callback();
 					}
diff --git a/js/logger.js b/js/logger.js
index 632cf117..122ba81a 100644
--- a/js/logger.js
+++ b/js/logger.js
@@ -1,13 +1,25 @@
 /* Magic Mirror
- * Logger
+ * Log
+ *
  * This logger is very simple, but needs to be extended.
  * This system can eventually be used to push the log messages to an external target.
  *
  * By Michael Teeuw https://michaelteeuw.nl
  * MIT Licensed.
  */
-const Log = (function () {
-	return {
+(function (root, factory) {
+	if (typeof exports === "object") {
+		// add timestamps in front of log messages
+		require("console-stamp")(console, "yyyy-mm-dd HH:MM:ss.l");
+
+		// Node, CommonJS-like
+		module.exports = factory(root.config);
+	} else {
+		// Browser globals (root is window)
+		root.Log = factory(root.config);
+	}
+})(this, function (config) {
+	let logLevel = {
 		info: Function.prototype.bind.call(console.info, console),
 		log: Function.prototype.bind.call(console.log, console),
 		error: Function.prototype.bind.call(console.error, console),
@@ -19,4 +31,16 @@ const Log = (function () {
 		timeEnd: Function.prototype.bind.call(console.timeEnd, console),
 		timeStamp: Function.prototype.bind.call(console.timeStamp, console)
 	};
-})();
+
+	logLevel.setLogLevel = function (newLevel) {
+		if (newLevel) {
+			Object.keys(logLevel).forEach(function (key, index) {
+				if (!newLevel.includes(key.toLocaleUpperCase())) {
+					logLevel[key] = function () {};
+				}
+			});
+		}
+	};
+
+	return logLevel;
+});
diff --git a/js/main.js b/js/main.js
index 07459f0f..dc1667af 100644
--- a/js/main.js
+++ b/js/main.js
@@ -477,6 +477,9 @@ var MM = (function () {
 		init: function () {
 			Log.info("Initializing MagicMirror.");
 			loadConfig();
+
+			Log.setLogLevel(config.logLevel);
+
 			Translator.loadCoreTranslations(config.language);
 			Loader.loadModules();
 		},
diff --git a/js/node_helper.js b/js/node_helper.js
index 866d34c9..4a31fdee 100644
--- a/js/node_helper.js
+++ b/js/node_helper.js
@@ -5,20 +5,21 @@
  * MIT Licensed.
  */
 const Class = require("./class.js");
+const Log = require("./logger.js");
 const express = require("express");
 
 var NodeHelper = Class.extend({
 	init: function () {
-		console.log("Initializing new module helper ...");
+		Log.log("Initializing new module helper ...");
 	},
 
 	loaded: function (callback) {
-		console.log("Module helper loaded: " + this.name);
+		Log.log("Module helper loaded: " + this.name);
 		callback();
 	},
 
 	start: function () {
-		console.log("Starting module helper: " + this.name);
+		Log.log("Starting module helper: " + this.name);
 	},
 
 	/* stop()
@@ -28,7 +29,7 @@ var NodeHelper = Class.extend({
 	 *
 	 */
 	stop: function () {
-		console.log("Stopping module helper: " + this.name);
+		Log.log("Stopping module helper: " + this.name);
 	},
 
 	/* socketNotificationReceived(notification, payload)
@@ -38,7 +39,7 @@ var NodeHelper = Class.extend({
 	 * argument payload mixed - The payload of the notification.
 	 */
 	socketNotificationReceived: function (notification, payload) {
-		console.log(this.name + " received a socket notification: " + notification + " - Payload: " + payload);
+		Log.log(this.name + " received a socket notification: " + notification + " - Payload: " + payload);
 	},
 
 	/* setName(name)
@@ -92,7 +93,7 @@ var NodeHelper = Class.extend({
 		var self = this;
 		self.io = io;
 
-		console.log("Connecting socket for: " + this.name);
+		Log.log("Connecting socket for: " + this.name);
 		var namespace = this.name;
 		io.of(namespace).on("connection", function (socket) {
 			// add a catch all event.
@@ -107,7 +108,7 @@ var NodeHelper = Class.extend({
 			// register catch all.
 			socket.on("*", function (notification, payload) {
 				if (notification !== "*") {
-					//console.log('received message in namespace: ' + namespace);
+					//Log.log('received message in namespace: ' + namespace);
 					self.socketNotificationReceived(notification, payload);
 				}
 			});
diff --git a/js/server.js b/js/server.js
index 7f0c36d0..5116de53 100644
--- a/js/server.js
+++ b/js/server.js
@@ -4,14 +4,15 @@
  * By Michael Teeuw https://michaelteeuw.nl
  * MIT Licensed.
  */
-
 var express = require("express");
 var app = require("express")();
 var path = require("path");
 var ipfilter = require("express-ipfilter").IpFilter;
 var fs = require("fs");
 var helmet = require("helmet");
-var Utils = require(__dirname + "/utils.js");
+
+var Log = require("./logger.js");
+var Utils = require("./utils.js");
 
 var Server = function (config, callback) {
 	var port = config.port;
@@ -31,12 +32,12 @@ var Server = function (config, callback) {
 	}
 	var io = require("socket.io")(server);
 
-	console.log("Starting server on port " + port + " ... ");
+	Log.log("Starting server on port " + port + " ... ");
 
 	server.listen(port, config.address ? config.address : "localhost");
 
 	if (config.ipWhitelist instanceof Array && config.ipWhitelist.length === 0) {
-		console.info(Utils.colors.warn("You're using a full whitelist configuration to allow for all IPs"));
+		Log.info(Utils.colors.warn("You're using a full whitelist configuration to allow for all IPs"));
 	}
 
 	app.use(function (req, res, next) {
@@ -44,7 +45,7 @@ var Server = function (config, callback) {
 			if (err === undefined) {
 				return next();
 			}
-			console.log(err.message);
+			Log.log(err.message);
 			res.status(403).send("This device is not allowed to access your mirror. <br> Please check your config.js or config.js.sample to change this.");
 		});
 	});
diff --git a/modules/default/calendar/calendar.js b/modules/default/calendar/calendar.js
index 3658e1e6..5c6ce453 100755
--- a/modules/default/calendar/calendar.js
+++ b/modules/default/calendar/calendar.js
@@ -282,7 +282,6 @@ Module.register("calendar", {
 				timeWrapper = document.createElement("td");
 
 				eventWrapper.appendChild(titleWrapper);
-				//console.log(event.today);
 				var now = new Date();
 				// Define second, minute, hour, and day variables
 				var oneSecond = 1000; // 1,000 milliseconds
@@ -373,7 +372,6 @@ Module.register("calendar", {
 					}
 				}
 				//timeWrapper.innerHTML += ' - '+ moment(event.startDate,'x').format('lll');
-				//console.log(event);
 				timeWrapper.className = "time light " + this.timeClassForUrl(event.url);
 				eventWrapper.appendChild(timeWrapper);
 			}
@@ -469,6 +467,7 @@ Module.register("calendar", {
 			var calendar = this.calendarData[c];
 			for (var e in calendar) {
 				var event = JSON.parse(JSON.stringify(calendar[e])); // clone object
+
 				if (event.endDate < now) {
 					continue;
 				}
diff --git a/modules/default/calendar/calendarfetcher.js b/modules/default/calendar/calendarfetcher.js
index 3ab44e47..acae13dc 100644
--- a/modules/default/calendar/calendarfetcher.js
+++ b/modules/default/calendar/calendarfetcher.js
@@ -4,28 +4,29 @@
  * By Michael Teeuw https://michaelteeuw.nl
  * MIT Licensed.
  */
-
-const ical = require("./vendor/ical.js");
+const Log = require("../../../js/logger.js");
+const ical = require("ical");
 const moment = require("moment");
+const request = require("request");
 
-var CalendarFetcher = function (url, reloadInterval, excludedEvents, maximumEntries, maximumNumberOfDays, auth, includePastEvents) {
-	var self = this;
+const CalendarFetcher = function (url, reloadInterval, excludedEvents, maximumNumberOfDays, auth, includePastEvents) {
+	const self = this;
 
-	var reloadTimer = null;
-	var events = [];
+	let reloadTimer = null;
+	let events = [];
 
-	var fetchFailedCallback = function () {};
-	var eventsReceivedCallback = function () {};
+	let fetchFailedCallback = function () {};
+	let eventsReceivedCallback = function () {};
 
 	/* fetchCalendar()
 	 * Initiates calendar fetch.
 	 */
-	var fetchCalendar = function () {
+	const fetchCalendar = function () {
 		clearTimeout(reloadTimer);
 		reloadTimer = null;
 
-		var nodeVersion = Number(process.version.match(/^v(\d+\.\d+)/)[1]);
-		var opts = {
+		const nodeVersion = Number(process.version.match(/^v(\d+\.\d+)/)[1]);
+		const opts = {
 			headers: {
 				"User-Agent": "Mozilla/5.0 (Node.js " + nodeVersion + ") MagicMirror/" + global.version + " (https://github.com/MichMich/MagicMirror/)"
 			},
@@ -40,42 +41,40 @@ var CalendarFetcher = function (url, reloadInterval, excludedEvents, maximumEntr
 			} else {
 				opts.auth = {
 					user: auth.user,
-					pass: auth.pass
+					pass: auth.pass,
+					sendImmediately: auth.method !== "digest"
 				};
-
-				if (auth.method === "digest") {
-					opts.auth.sendImmediately = false;
-				} else {
-					opts.auth.sendImmediately = true;
-				}
 			}
 		}
 
-		ical.fromURL(url, opts, function (err, data) {
+		request(url, opts, function (err, r, requestData) {
 			if (err) {
 				fetchFailedCallback(self, err);
 				scheduleTimer();
 				return;
+			} else if (r.statusCode !== 200) {
+				fetchFailedCallback(self, r.statusCode + ": " + r.statusMessage);
+				scheduleTimer();
+				return;
 			}
 
-			// console.log(data);
-			var newEvents = [];
+			const data = ical.parseICS(requestData);
+			const newEvents = [];
 
 			// limitFunction doesn't do much limiting, see comment re: the dates array in rrule section below as to why we need to do the filtering ourselves
-			var limitFunction = function (date, i) {
+			const limitFunction = function (date, i) {
 				return true;
 			};
 
-			var eventDate = function (event, time) {
+			const eventDate = function (event, time) {
 				return event[time].length === 8 ? moment(event[time], "YYYYMMDD") : moment(new Date(event[time]));
 			};
 
-			for (var e in data) {
-				var event = data[e];
-				var now = new Date();
-				var today = moment().startOf("day").toDate();
-				var future = moment().startOf("day").add(maximumNumberOfDays, "days").subtract(1, "seconds").toDate(); // Subtract 1 second so that events that start on the middle of the night will not repeat.
-				var past = today;
+			Object.entries(data).forEach(([key, event]) => {
+				const now = new Date();
+				const today = moment().startOf("day").toDate();
+				const future = moment().startOf("day").add(maximumNumberOfDays, "days").subtract(1, "seconds").toDate(); // Subtract 1 second so that events that start on the middle of the night will not repeat.
+				let past = today;
 
 				if (includePastEvents) {
 					past = moment().startOf("day").subtract(maximumNumberOfDays, "days").toDate();
@@ -83,7 +82,7 @@ var CalendarFetcher = function (url, reloadInterval, excludedEvents, maximumEntr
 
 				// FIXME: Ugly fix to solve the facebook birthday issue.
 				// Otherwise, the recurring events only show the birthday for next year.
-				var isFacebookBirthday = false;
+				let isFacebookBirthday = false;
 				if (typeof event.uid !== "undefined") {
 					if (event.uid.indexOf("@facebook.com") !== -1) {
 						isFacebookBirthday = true;
@@ -91,13 +90,13 @@ var CalendarFetcher = function (url, reloadInterval, excludedEvents, maximumEntr
 				}
 
 				if (event.type === "VEVENT") {
-					var startDate = eventDate(event, "start");
-					var endDate;
+					let startDate = eventDate(event, "start");
+					let endDate;
+
 					if (typeof event.end !== "undefined") {
 						endDate = eventDate(event, "end");
 					} else if (typeof event.duration !== "undefined") {
-						var dur = moment.duration(event.duration);
-						endDate = startDate.clone().add(dur);
+						endDate = startDate.clone().add(moment.duration(event.duration));
 					} else {
 						if (!isFacebookBirthday) {
 							endDate = startDate;
@@ -106,20 +105,20 @@ var CalendarFetcher = function (url, reloadInterval, excludedEvents, maximumEntr
 						}
 					}
 
-					// calculate the duration f the event for use with recurring events.
-					var duration = parseInt(endDate.format("x")) - parseInt(startDate.format("x"));
+					// calculate the duration of the event for use with recurring events.
+					let duration = parseInt(endDate.format("x")) - parseInt(startDate.format("x"));
 
 					if (event.start.length === 8) {
 						startDate = startDate.startOf("day");
 					}
 
-					var title = getTitleFromEvent(event);
+					const title = getTitleFromEvent(event);
 
-					var excluded = false,
+					let excluded = false,
 						dateFilter = null;
 
-					for (var f in excludedEvents) {
-						var filter = excludedEvents[f],
+					for (let f in excludedEvents) {
+						let filter = excludedEvents[f],
 							testTitle = title.toLowerCase(),
 							until = null,
 							useRegex = false,
@@ -162,16 +161,19 @@ var CalendarFetcher = function (url, reloadInterval, excludedEvents, maximumEntr
 					}
 
 					if (excluded) {
-						continue;
+						return;
 					}
 
-					var location = event.location || false;
-					var geo = event.geo || false;
-					var description = event.description || false;
+					const location = event.location || false;
+					const geo = event.geo || false;
+					const description = event.description || false;
 
 					if (typeof event.rrule !== "undefined" && event.rrule !== null && !isFacebookBirthday) {
-						var rule = event.rrule;
-						var addedEvents = 0;
+						const rule = event.rrule;
+						let addedEvents = 0;
+
+						const pastMoment = moment(past);
+						const futureMoment = moment(future);
 
 						// can cause problems with e.g. birthdays before 1900
 						if ((rule.options && rule.origOptions && rule.origOptions.dtstart && rule.origOptions.dtstart.getFullYear() < 1900) || (rule.options && rule.options.dtstart && rule.options.dtstart.getFullYear() < 1900)) {
@@ -180,28 +182,21 @@ var CalendarFetcher = function (url, reloadInterval, excludedEvents, maximumEntr
 						}
 
 						// For recurring events, get the set of start dates that fall within the range
-						// of dates we"re looking for.
+						// of dates we're looking for.
 						// kblankenship1989 - to fix issue #1798, converting all dates to locale time first, then converting back to UTC time
-						var pastLocal = moment(past).subtract(past.getTimezoneOffset(), "minutes").toDate();
-						var futureLocal = moment(future).subtract(future.getTimezoneOffset(), "minutes").toDate();
-						var datesLocal = rule.between(pastLocal, futureLocal, true, limitFunction);
-						var dates = datesLocal.map(function (dateLocal) {
-							var date = moment(dateLocal).add(dateLocal.getTimezoneOffset(), "minutes").toDate();
-							return date;
-						});
+						const pastLocal = pastMoment.subtract(past.getTimezoneOffset(), "minutes").toDate();
+						const futureLocal = futureMoment.subtract(future.getTimezoneOffset(), "minutes").toDate();
+						const dates = rule.between(pastLocal, futureLocal, true, limitFunction);
 
 						// The "dates" array contains the set of dates within our desired date range range that are valid
-						// for the recurrence rule.  *However*, it"s possible for us to have a specific recurrence that
+						// for the recurrence rule. *However*, it's possible for us to have a specific recurrence that
 						// had its date changed from outside the range to inside the range.  For the time being,
-						// we"ll handle this by adding *all* recurrence entries into the set of dates that we check,
-						// because the logic below will filter out any recurrences that don"t actually belong within
+						// we'll handle this by adding *all* recurrence entries into the set of dates that we check,
+						// because the logic below will filter out any recurrences that don't actually belong within
 						// our display range.
 						// Would be great if there was a better way to handle this.
 						if (event.recurrences !== undefined) {
-							var pastMoment = moment(past);
-							var futureMoment = moment(future);
-
-							for (var r in event.recurrences) {
+							for (let r in event.recurrences) {
 								// Only add dates that weren't already in the range we added from the rrule so that
 								// we don"t double-add those events.
 								if (moment(new Date(r)).isBetween(pastMoment, futureMoment) !== true) {
@@ -211,31 +206,25 @@ var CalendarFetcher = function (url, reloadInterval, excludedEvents, maximumEntr
 						}
 
 						// Loop through the set of date entries to see which recurrences should be added to our event list.
-						for (var d in dates) {
-							var date = dates[d];
+						for (let d in dates) {
+							const date = dates[d];
 							// ical.js started returning recurrences and exdates as ISOStrings without time information.
 							// .toISOString().substring(0,10) is the method they use to calculate keys, so we'll do the same
 							// (see https://github.com/peterbraden/ical.js/pull/84 )
-							var dateKey = date.toISOString().substring(0, 10);
-							var curEvent = event;
-							var showRecurrence = true;
-
-							// Stop parsing this event's recurrences if we've already found maximumEntries worth of recurrences.
-							// (The logic below would still filter the extras, but the check is simple since we're already tracking the count)
-							if (addedEvents >= maximumEntries) {
-								break;
-							}
+							const dateKey = date.toISOString().substring(0, 10);
+							let curEvent = event;
+							let showRecurrence = true;
 
 							startDate = moment(date);
 
-							// For each date that we"re checking, it"s possible that there is a recurrence override for that one day.
+							// For each date that we're checking, it's possible that there is a recurrence override for that one day.
 							if (curEvent.recurrences !== undefined && curEvent.recurrences[dateKey] !== undefined) {
 								// We found an override, so for this recurrence, use a potentially different title, start date, and duration.
 								curEvent = curEvent.recurrences[dateKey];
 								startDate = moment(curEvent.start);
 								duration = parseInt(moment(curEvent.end).format("x")) - parseInt(startDate.format("x"));
 							}
-							// If there"s no recurrence override, check for an exception date.  Exception dates represent exceptions to the rule.
+							// If there's no recurrence override, check for an exception date.  Exception dates represent exceptions to the rule.
 							else if (curEvent.exdate !== undefined && curEvent.exdate[dateKey] !== undefined) {
 								// This date is an exception date, which means we should skip it in the recurrence pattern.
 								showRecurrence = false;
@@ -246,7 +235,7 @@ var CalendarFetcher = function (url, reloadInterval, excludedEvents, maximumEntr
 								endDate = endDate.endOf("day");
 							}
 
-							var recurrenceTitle = getTitleFromEvent(curEvent);
+							const recurrenceTitle = getTitleFromEvent(curEvent);
 
 							// If this recurrence ends before the start of the date range, or starts after the end of the date range, don"t add
 							// it to the event list.
@@ -258,7 +247,7 @@ var CalendarFetcher = function (url, reloadInterval, excludedEvents, maximumEntr
 								showRecurrence = false;
 							}
 
-							if (showRecurrence === true && addedEvents < maximumEntries) {
+							if (showRecurrence === true) {
 								addedEvents++;
 								newEvents.push({
 									title: recurrenceTitle,
@@ -275,43 +264,41 @@ var CalendarFetcher = function (url, reloadInterval, excludedEvents, maximumEntr
 						}
 						// end recurring event parsing
 					} else {
-						// console.log("Single event ...");
 						// Single event.
-						var fullDayEvent = isFacebookBirthday ? true : isFullDayEvent(event);
+						const fullDayEvent = isFacebookBirthday ? true : isFullDayEvent(event);
 
 						if (includePastEvents) {
+							// Past event is too far in the past, so skip.
 							if (endDate < past) {
-								//console.log("Past event is too far in the past.  So skip: " + title);
-								continue;
+								return;
 							}
 						} else {
+							// It's not a fullday event, and it is in the past, so skip.
 							if (!fullDayEvent && endDate < new Date()) {
-								//console.log("It's not a fullday event, and it is in the past. So skip: " + title);
-								continue;
+								return;
 							}
 
+							// It's a fullday event, and it is before today, So skip.
 							if (fullDayEvent && endDate <= today) {
-								//console.log("It's a fullday event, and it is before today. So skip: " + title);
-								continue;
+								return;
 							}
 						}
 
+						// It exceeds the maximumNumberOfDays limit, so skip.
 						if (startDate > future) {
-							//console.log("It exceeds the maximumNumberOfDays limit. So skip: " + title);
-							continue;
+							return;
 						}
 
 						if (timeFilterApplies(now, endDate, dateFilter)) {
-							continue;
+							return;
 						}
 
-						// adjust start date so multiple day events will be displayed as happening today even though they started some days ago already
+						// Adjust start date so multiple day events will be displayed as happening today even though they started some days ago already
 						if (fullDayEvent && startDate <= today) {
 							startDate = moment(today);
 						}
 
 						// Every thing is good. Add it to the list.
-
 						newEvents.push({
 							title: title,
 							startDate: startDate.format("x"),
@@ -324,15 +311,13 @@ var CalendarFetcher = function (url, reloadInterval, excludedEvents, maximumEntr
 						});
 					}
 				}
-			}
+			});
 
 			newEvents.sort(function (a, b) {
 				return a.startDate - b.startDate;
 			});
 
-			//console.log(newEvents);
-
-			events = newEvents.slice(0, maximumEntries);
+			events = newEvents;
 
 			self.broadcastEvents();
 			scheduleTimer();
@@ -342,8 +327,7 @@ var CalendarFetcher = function (url, reloadInterval, excludedEvents, maximumEntr
 	/* scheduleTimer()
 	 * Schedule the timer for the next update.
 	 */
-	var scheduleTimer = function () {
-		//console.log('Schedule update timer.');
+	const scheduleTimer = function () {
 		clearTimeout(reloadTimer);
 		reloadTimer = setTimeout(function () {
 			fetchCalendar();
@@ -357,14 +341,14 @@ var CalendarFetcher = function (url, reloadInterval, excludedEvents, maximumEntr
 	 *
 	 * return bool - The event is a fullday event.
 	 */
-	var isFullDayEvent = function (event) {
+	const isFullDayEvent = function (event) {
 		if (event.start.length === 8 || event.start.dateOnly) {
 			return true;
 		}
 
-		var start = event.start || 0;
-		var startDate = new Date(start);
-		var end = event.end || 0;
+		const start = event.start || 0;
+		const startDate = new Date(start);
+		const end = event.end || 0;
 		if ((end - start) % (24 * 60 * 60 * 1000) === 0 && startDate.getHours() === 0 && startDate.getMinutes() === 0) {
 			// Is 24 hours, and starts on the middle of the night.
 			return true;
@@ -382,11 +366,11 @@ var CalendarFetcher = function (url, reloadInterval, excludedEvents, maximumEntr
 	 *
 	 * return bool - The event should be filtered out
 	 */
-	var timeFilterApplies = function (now, endDate, filter) {
+	const timeFilterApplies = function (now, endDate, filter) {
 		if (filter) {
-			var until = filter.split(" "),
+			const until = filter.split(" "),
 				value = parseInt(until[0]),
-				increment = until[1].slice("-1") === "s" ? until[1] : until[1] + "s", // Massage the data for moment js
+				increment = until[1].slice(-1) === "s" ? until[1] : until[1] + "s", // Massage the data for moment js
 				filterUntil = moment(endDate.format()).subtract(value, increment);
 
 			return now < filterUntil.format("x");
@@ -402,8 +386,8 @@ var CalendarFetcher = function (url, reloadInterval, excludedEvents, maximumEntr
 	 *
 	 * return string - The title of the event, or "Event" if no title is found.
 	 */
-	var getTitleFromEvent = function (event) {
-		var title = "Event";
+	const getTitleFromEvent = function (event) {
+		let title = "Event";
 		if (event.summary) {
 			title = typeof event.summary.val !== "undefined" ? event.summary.val : event.summary;
 		} else if (event.description) {
@@ -413,7 +397,7 @@ var CalendarFetcher = function (url, reloadInterval, excludedEvents, maximumEntr
 		return title;
 	};
 
-	var testTitleByFilter = function (title, filter, useRegex, regexFlags) {
+	const testTitleByFilter = function (title, filter, useRegex, regexFlags) {
 		if (useRegex) {
 			// Assume if leading slash, there is also trailing slash
 			if (filter[0] === "/") {
@@ -442,7 +426,7 @@ var CalendarFetcher = function (url, reloadInterval, excludedEvents, maximumEntr
 	 * Broadcast the existing events.
 	 */
 	this.broadcastEvents = function () {
-		//console.log('Broadcasting ' + events.length + ' events.');
+		Log.info("Calendar-Fetcher: Broadcasting " + events.length + " events.");
 		eventsReceivedCallback(self);
 	};
 
diff --git a/modules/default/calendar/debug.js b/modules/default/calendar/debug.js
index cdcbb024..f01bcc0d 100644
--- a/modules/default/calendar/debug.js
+++ b/modules/default/calendar/debug.js
@@ -5,24 +5,23 @@
  * By Michael Teeuw https://michaelteeuw.nl
  * MIT Licensed.
  */
+const CalendarFetcher = require("./calendarfetcher.js");
 
-var CalendarFetcher = require("./calendarfetcher.js");
-
-var url = "https://calendar.google.com/calendar/ical/pkm1t2uedjbp0uvq1o7oj1jouo%40group.calendar.google.com/private-08ba559f89eec70dd74bbd887d0a3598/basic.ics"; // Standard test URL
-// var url = "https://www.googleapis.com/calendar/v3/calendars/primary/events/"; // URL for Bearer auth (must be configured  in Google OAuth2 first)
-var fetchInterval = 60 * 60 * 1000;
-var maximumEntries = 10;
-var maximumNumberOfDays = 365;
-var user = "magicmirror";
-var pass = "MyStrongPass";
-var auth = {
+const url = "https://calendar.google.com/calendar/ical/pkm1t2uedjbp0uvq1o7oj1jouo%40group.calendar.google.com/private-08ba559f89eec70dd74bbd887d0a3598/basic.ics"; // Standard test URL
+//const url = "https://www.googleapis.com/calendar/v3/calendars/primary/events/"; // URL for Bearer auth (must be configured  in Google OAuth2 first)
+const fetchInterval = 60 * 60 * 1000;
+const maximumEntries = 10;
+const maximumNumberOfDays = 365;
+const user = "magicmirror";
+const pass = "MyStrongPass";
+const auth = {
 	user: user,
 	pass: pass
 };
 
 console.log("Create fetcher ...");
 
-var fetcher = new CalendarFetcher(url, fetchInterval, [], maximumEntries, maximumNumberOfDays, auth);
+const fetcher = new CalendarFetcher(url, fetchInterval, [], maximumEntries, maximumNumberOfDays, auth);
 
 fetcher.onReceive(function (fetcher) {
 	console.log(fetcher.events());
diff --git a/modules/default/calendar/node_helper.js b/modules/default/calendar/node_helper.js
index 6af4b72a..5248919b 100644
--- a/modules/default/calendar/node_helper.js
+++ b/modules/default/calendar/node_helper.js
@@ -5,25 +5,22 @@
  * MIT Licensed.
  */
 
-var NodeHelper = require("node_helper");
-var validUrl = require("valid-url");
-var CalendarFetcher = require("./calendarfetcher.js");
+const NodeHelper = require("node_helper");
+const validUrl = require("valid-url");
+const CalendarFetcher = require("./calendarfetcher.js");
+const Log = require("../../../js/logger");
 
 module.exports = NodeHelper.create({
 	// Override start method.
 	start: function () {
-		var events = [];
-
+		Log.log("Starting node helper for: " + this.name);
 		this.fetchers = [];
-
-		console.log("Starting node helper for: " + this.name);
 	},
 
 	// Override socketNotificationReceived method.
 	socketNotificationReceived: function (notification, payload) {
 		if (notification === "ADD_CALENDAR") {
-			//console.log('ADD_CALENDAR: ');
-			this.createFetcher(payload.url, payload.fetchInterval, payload.excludedEvents, payload.maximumEntries, payload.maximumNumberOfDays, payload.auth, payload.broadcastPastEvents, payload.id);
+			this.createFetcher(payload.url, payload.fetchInterval, payload.excludedEvents, payload.maximumNumberOfDays, payload.auth, payload.broadcastPastEvents, payload.id);
 		}
 	},
 
@@ -34,8 +31,7 @@ module.exports = NodeHelper.create({
 	 * attribute url string - URL of the news feed.
 	 * attribute reloadInterval number - Reload interval in milliseconds.
 	 */
-
-	createFetcher: function (url, fetchInterval, excludedEvents, maximumEntries, maximumNumberOfDays, auth, broadcastPastEvents, identifier) {
+	createFetcher: function (url, fetchInterval, excludedEvents, maximumNumberOfDays, auth, broadcastPastEvents, identifier) {
 		var self = this;
 
 		if (!validUrl.isUri(url)) {
@@ -45,13 +41,10 @@ module.exports = NodeHelper.create({
 
 		var fetcher;
 		if (typeof self.fetchers[identifier + url] === "undefined") {
-			console.log("Create new calendar fetcher for url: " + url + " - Interval: " + fetchInterval);
-			fetcher = new CalendarFetcher(url, fetchInterval, excludedEvents, maximumEntries, maximumNumberOfDays, auth, broadcastPastEvents);
+			Log.log("Create new calendar fetcher for url: " + url + " - Interval: " + fetchInterval);
+			fetcher = new CalendarFetcher(url, fetchInterval, excludedEvents, maximumNumberOfDays, auth, broadcastPastEvents);
 
 			fetcher.onReceive(function (fetcher) {
-				//console.log('Broadcast events.');
-				//console.log(fetcher.events());
-
 				self.sendSocketNotification("CALENDAR_EVENTS", {
 					id: identifier,
 					url: fetcher.url(),
@@ -60,7 +53,7 @@ module.exports = NodeHelper.create({
 			});
 
 			fetcher.onError(function (fetcher, error) {
-				console.error("Calendar Error. Could not fetch calendar: ", fetcher.url(), error);
+				Log.error("Calendar Error. Could not fetch calendar: ", fetcher.url(), error);
 				self.sendSocketNotification("FETCH_ERROR", {
 					id: identifier,
 					url: fetcher.url(),
@@ -70,7 +63,7 @@ module.exports = NodeHelper.create({
 
 			self.fetchers[identifier + url] = fetcher;
 		} else {
-			//console.log('Use existing news fetcher for url: ' + url);
+			Log.log("Use existing calendar fetcher for url: " + url);
 			fetcher = self.fetchers[identifier + url];
 			fetcher.broadcastEvents();
 		}
diff --git a/modules/default/calendar/vendor/ical.js/.travis.yml b/modules/default/calendar/vendor/ical.js/.travis.yml
deleted file mode 100644
index d5d4c1e3..00000000
--- a/modules/default/calendar/vendor/ical.js/.travis.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-language: node_js
-node_js:
-    - "8.9"
-install: npm install 
diff --git a/modules/default/calendar/vendor/ical.js/LICENSE b/modules/default/calendar/vendor/ical.js/LICENSE
deleted file mode 100644
index e454a525..00000000
--- a/modules/default/calendar/vendor/ical.js/LICENSE
+++ /dev/null
@@ -1,178 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
diff --git a/modules/default/calendar/vendor/ical.js/NOTICE b/modules/default/calendar/vendor/ical.js/NOTICE
deleted file mode 100644
index d5f926db..00000000
--- a/modules/default/calendar/vendor/ical.js/NOTICE
+++ /dev/null
@@ -1,13 +0,0 @@
-Copyright 2012 Peter Braden
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
diff --git a/modules/default/calendar/vendor/ical.js/example.js b/modules/default/calendar/vendor/ical.js/example.js
deleted file mode 100644
index 7b41f1ad..00000000
--- a/modules/default/calendar/vendor/ical.js/example.js
+++ /dev/null
@@ -1,16 +0,0 @@
-'use strict';
-
-const ical = require('ical');
-const months = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];
-
-ical.fromURL('http://lanyrd.com/topics/nodejs/nodejs.ics', {}, function (err, data) {
-	for (let k in data) {
-		if (data.hasOwnProperty(k)) {
-			var ev = data[k];
-			if (data[k].type == 'VEVENT') {
-				console.log(`${ev.summary} is in ${ev.location} on the ${ev.start.getDate()} of ${months[ev.start.getMonth()]} at ${ev.start.toLocaleTimeString('en-GB')}`);
-
-			}
-		}
-	}
-});
diff --git a/modules/default/calendar/vendor/ical.js/example_rrule.js b/modules/default/calendar/vendor/ical.js/example_rrule.js
deleted file mode 100644
index 6233c4b2..00000000
--- a/modules/default/calendar/vendor/ical.js/example_rrule.js
+++ /dev/null
@@ -1,118 +0,0 @@
-var ical = require('./node-ical')
-var moment = require('moment')
-
-var data = ical.parseFile('./examples/example_rrule.ics');
-
-// Complicated example demonstrating how to handle recurrence rules and exceptions.
-
-for (var k in data) {
-
-	// When dealing with calendar recurrences, you need a range of dates to query against,
-	// because otherwise you can get an infinite number of calendar events.
-	var rangeStart = moment("2017-01-01");
-	var rangeEnd = moment("2017-12-31");
-
-
-	var event = data[k]
-	if (event.type === 'VEVENT') {
-
-		var title = event.summary;
-		var startDate = moment(event.start);
-		var endDate = moment(event.end);
-
-		// Calculate the duration of the event for use with recurring events.
-		var duration = parseInt(endDate.format("x")) - parseInt(startDate.format("x"));
-
-		// Simple case - no recurrences, just print out the calendar event.
-		if (typeof event.rrule === 'undefined')
-		{
-			console.log('title:' + title);
-			console.log('startDate:' + startDate.format('MMMM Do YYYY, h:mm:ss a'));
-			console.log('endDate:' + endDate.format('MMMM Do YYYY, h:mm:ss a'));
-			console.log('duration:' + moment.duration(duration).humanize());
-			console.log();
-		}
-
-		// Complicated case - if an RRULE exists, handle multiple recurrences of the event.
-		else if (typeof event.rrule !== 'undefined')
-		{
-			// For recurring events, get the set of event start dates that fall within the range
-			// of dates we're looking for.
-			var dates = event.rrule.between(
-			  rangeStart.toDate(),
-			  rangeEnd.toDate(),
-			  true,
-			  function(date, i) {return true;}
-			)
-
-			// The "dates" array contains the set of dates within our desired date range range that are valid
-			// for the recurrence rule.  *However*, it's possible for us to have a specific recurrence that
-			// had its date changed from outside the range to inside the range.  One way to handle this is
-			// to add *all* recurrence override entries into the set of dates that we check, and then later
-			// filter out any recurrences that don't actually belong within our range.
-			if (event.recurrences != undefined)
-			{
-				for (var r in event.recurrences)
-				{
-					// Only add dates that weren't already in the range we added from the rrule so that 
-					// we don't double-add those events.
-					if (moment(new Date(r)).isBetween(rangeStart, rangeEnd) != true)
-					{
-						dates.push(new Date(r));
-					}
-				}
-			}
-
-			// Loop through the set of date entries to see which recurrences should be printed.
-			for(var i in dates) {
-
-				var date = dates[i];
-				var curEvent = event;
-				var showRecurrence = true;
-				var curDuration = duration;
-
-				startDate = moment(date);
-
-				// Use just the date of the recurrence to look up overrides and exceptions (i.e. chop off time information)
-				var dateLookupKey = date.toISOString().substring(0, 10);
-
-				// For each date that we're checking, it's possible that there is a recurrence override for that one day.
-				if ((curEvent.recurrences != undefined) && (curEvent.recurrences[dateLookupKey] != undefined))
-				{
-					// We found an override, so for this recurrence, use a potentially different title, start date, and duration.
-					curEvent = curEvent.recurrences[dateLookupKey];
-					startDate = moment(curEvent.start);
-					curDuration = parseInt(moment(curEvent.end).format("x")) - parseInt(startDate.format("x"));
-				}
-				// If there's no recurrence override, check for an exception date.  Exception dates represent exceptions to the rule.
-				else if ((curEvent.exdate != undefined) && (curEvent.exdate[dateLookupKey] != undefined))
-				{
-					// This date is an exception date, which means we should skip it in the recurrence pattern.
-					showRecurrence = false;
-				}
-
-				// Set the the title and the end date from either the regular event or the recurrence override.
-				var recurrenceTitle = curEvent.summary;
-				endDate = moment(parseInt(startDate.format("x")) + curDuration, 'x');
-
-				// If this recurrence ends before the start of the date range, or starts after the end of the date range, 
-				// don't process it.
-				if (endDate.isBefore(rangeStart) || startDate.isAfter(rangeEnd)) {
-					showRecurrence = false;
-				}
-
-				if (showRecurrence === true) {
-
-					console.log('title:' + recurrenceTitle);
-					console.log('startDate:' + startDate.format('MMMM Do YYYY, h:mm:ss a'));
-					console.log('endDate:' + endDate.format('MMMM Do YYYY, h:mm:ss a'));
-					console.log('duration:' + moment.duration(curDuration).humanize());
-					console.log();
-				}
-
-			}
-		} 
-	}
-}
-
-
diff --git a/modules/default/calendar/vendor/ical.js/examples/example_rrule.ics b/modules/default/calendar/vendor/ical.js/examples/example_rrule.ics
deleted file mode 100644
index 4f72c0ec..00000000
--- a/modules/default/calendar/vendor/ical.js/examples/example_rrule.ics
+++ /dev/null
@@ -1,40 +0,0 @@
-BEGIN:VCALENDAR
-PRODID:-//Google Inc//Google Calendar 70.9054//EN
-VERSION:2.0
-CALSCALE:GREGORIAN
-METHOD:PUBLISH
-X-WR-CALNAME:ical
-X-WR-TIMEZONE:US/Central
-X-WR-CALDESC:
-BEGIN:VEVENT
-UID:98765432-ABCD-DCBB-999A-987765432123
-DTSTART;TZID=US/Central:20170601T090000
-DTEND;TZID=US/Central:20170601T170000
-DTSTAMP:20170727T044436Z
-EXDATE;TZID=US/Central:20170706T090000,20170713T090000,20170720T090000,20
- 170803T090000
-LAST-MODIFIED:20170727T044435Z
-RRULE:FREQ=WEEKLY;WKST=SU;UNTIL=20170814T045959Z;BYDAY=TH
-SEQUENCE:0
-SUMMARY:Recurring weekly meeting from June 1 - Aug 14 (except July 6, July 13, July 20, Aug 3)
-END:VEVENT
-BEGIN:VEVENT
-UID:98765432-ABCD-DCBB-999A-987765432123
-RECURRENCE-ID;TZID=US/Central:20170629T090000
-DTSTART;TZID=US/Central:20170703T090000
-DTEND;TZID=US/Central:20170703T120000
-DTSTAMP:20170727T044436Z
-LAST-MODIFIED:20170216T143445Z
-SEQUENCE:0
-SUMMARY:Last meeting in June moved to Monday July 3 and shortened to half day
-END:VEVENT
-BEGIN:VEVENT
-UID:12354454-ABCD-DCBB-999A-2349872354897
-DTSTART;TZID=US/Central:20171201T130000
-DTEND;TZID=US/Central:20171201T150000
-DTSTAMP:20170727T044436Z
-LAST-MODIFIED:20170727T044435Z
-SEQUENCE:0
-SUMMARY:Single event on Dec 1
-END:VEVENT
-END:VCALENDAR
\ No newline at end of file
diff --git a/modules/default/calendar/vendor/ical.js/ical.js b/modules/default/calendar/vendor/ical.js/ical.js
deleted file mode 100644
index 024625b7..00000000
--- a/modules/default/calendar/vendor/ical.js/ical.js
+++ /dev/null
@@ -1,452 +0,0 @@
-(function(name, definition) {
-
-/****************
- *  A tolerant, minimal icalendar parser
- *  (http://tools.ietf.org/html/rfc5545)
- *
- *  <peterbraden@peterbraden.co.uk>
- * **************/
-
-  if (typeof module !== 'undefined') {
-    module.exports = definition();
-  } else if (typeof define === 'function' && typeof define.amd === 'object'){
-    define(definition);
-  } else {
-    this[name] = definition();
-  }
-
-}('ical', function(){
-
-   // Unescape Text re RFC 4.3.11
-  var text = function(t){
-    t = t || "";
-    return (t
-      .replace(/\\\,/g, ',')
-      .replace(/\\\;/g, ';')
-      .replace(/\\[nN]/g, '\n')
-      .replace(/\\\\/g, '\\')
-    )
-  }
-
-  var parseParams = function(p){
-    var out = {}
-    for (var i = 0; i<p.length; i++){
-      if (p[i].indexOf('=') > -1){
-        var segs = p[i].split('=');
-
-        out[segs[0]] = parseValue(segs.slice(1).join('='));
-
-      }
-    }
-    return out || sp
-  }
-
-  var parseValue = function(val){
-    if ('TRUE' === val)
-      return true;
-
-    if ('FALSE' === val)
-      return false;
-
-    var number = Number(val);
-    if (!isNaN(number))
-      return number;
-
-    return val;
-  }
-
-  var storeValParam = function (name) {
-      return function (val, curr) {
-          var current = curr[name];
-          if (Array.isArray(current)) {
-              current.push(val);
-              return curr;
-          }
-
-          if (current != null) {
-              curr[name] = [current, val];
-              return curr;
-          }
-
-          curr[name] = val;
-          return curr
-      }
-  }
-
-  var storeParam = function (name) {
-      return function (val, params, curr) {
-          var data;
-          if (params && params.length && !(params.length == 1 && params[0] === 'CHARSET=utf-8')) {
-              data = { params: parseParams(params), val: text(val) }
-          }
-          else
-              data = text(val)
-
-          return storeValParam(name)(data, curr);
-      }
-  }
-
-  var addTZ = function (dt, params) {
-    var p = parseParams(params);
-
-    if (params && p){
-      dt.tz = p.TZID
-    }
-
-    return dt
-  }
-
-  var dateParam = function(name){
-      return function (val, params, curr) {
-
-      var newDate = text(val);
-
-
-      if (params && params[0] === "VALUE=DATE") {
-        // Just Date
-
-        var comps = /^(\d{4})(\d{2})(\d{2})$/.exec(val);
-        if (comps !== null) {
-          // No TZ info - assume same timezone as this computer
-          newDate = new Date(
-            comps[1],
-            parseInt(comps[2], 10)-1,
-            comps[3]
-          );
-
-          newDate = addTZ(newDate, params);
-          newDate.dateOnly = true;
-
-          // Store as string - worst case scenario
-          return storeValParam(name)(newDate, curr)
-        }
-      }
-
-
-      //typical RFC date-time format
-      var comps = /^(\d{4})(\d{2})(\d{2})T(\d{2})(\d{2})(\d{2})(Z)?$/.exec(val);
-      if (comps !== null) {
-        if (comps[7] == 'Z'){ // GMT
-          newDate = new Date(Date.UTC(
-            parseInt(comps[1], 10),
-            parseInt(comps[2], 10)-1,
-            parseInt(comps[3], 10),
-            parseInt(comps[4], 10),
-            parseInt(comps[5], 10),
-            parseInt(comps[6], 10 )
-          ));
-          // TODO add tz
-        } else {
-          newDate = new Date(
-            parseInt(comps[1], 10),
-            parseInt(comps[2], 10)-1,
-            parseInt(comps[3], 10),
-            parseInt(comps[4], 10),
-            parseInt(comps[5], 10),
-            parseInt(comps[6], 10)
-          );
-        }
-
-        newDate = addTZ(newDate, params);
-    }
-
-
-          // Store as string - worst case scenario
-      return storeValParam(name)(newDate, curr)
-      }
-  }
-
-
-  var geoParam = function(name){
-    return function(val, params, curr){
-      storeParam(val, params, curr)
-      var parts = val.split(';');
-      curr[name] = {lat:Number(parts[0]), lon:Number(parts[1])};
-      return curr
-    }
-  }
-
-  var categoriesParam = function (name) {
-    var separatorPattern = /\s*,\s*/g;
-    return function (val, params, curr) {
-      storeParam(val, params, curr)
-      if (curr[name] === undefined)
-        curr[name] = val ? val.split(separatorPattern) : []
-      else
-        if (val)
-          curr[name] = curr[name].concat(val.split(separatorPattern))
-      return curr
-    }
-  }
-
-  // EXDATE is an entry that represents exceptions to a recurrence rule (ex: "repeat every day except on 7/4").
-  // The EXDATE entry itself can also contain a comma-separated list, so we make sure to parse each date out separately.
-  // There can also be more than one EXDATE entries in a calendar record.
-  // Since there can be multiple dates, we create an array of them.  The index into the array is the ISO string of the date itself, for ease of use.
-  // i.e. You can check if ((curr.exdate != undefined) && (curr.exdate[date iso string] != undefined)) to see if a date is an exception.
-  // NOTE: This specifically uses date only, and not time.  This is to avoid a few problems:
-  //    1. The ISO string with time wouldn't work for "floating dates" (dates without timezones).
-  //       ex: "20171225T060000" - this is supposed to mean 6 AM in whatever timezone you're currently in
-  //    2. Daylight savings time potentially affects the time you would need to look up
-  //    3. Some EXDATE entries in the wild seem to have times different from the recurrence rule, but are still excluded by calendar programs.  Not sure how or why.
-  //       These would fail any sort of sane time lookup, because the time literally doesn't match the event.  So we'll ignore time and just use date.
-  //       ex: DTSTART:20170814T140000Z
-  //             RRULE:FREQ=WEEKLY;WKST=SU;INTERVAL=2;BYDAY=MO,TU
-  //             EXDATE:20171219T060000
-  //       Even though "T060000" doesn't match or overlap "T1400000Z", it's still supposed to be excluded?  Odd. :(
-  // TODO: See if this causes any problems with events that recur multiple times a day.
-  var exdateParam = function (name) {
-    return function (val, params, curr) {
-      var separatorPattern = /\s*,\s*/g;
-      curr[name] = curr[name] || [];
-      var dates = val ? val.split(separatorPattern) : [];
-      dates.forEach(function (entry) {
-          var exdate = new Array();
-          dateParam(name)(entry, params, exdate);
-
-          if (exdate[name])
-          {
-            if (typeof exdate[name].toISOString === 'function') {
-              curr[name][exdate[name].toISOString().substring(0, 10)] = exdate[name];
-            } else {
-              console.error("No toISOString function in exdate[name]", exdate[name]);
-            }
-          }
-        }
-      )
-      return curr;
-    }
-  }
-
-  // RECURRENCE-ID is the ID of a specific recurrence within a recurrence rule.
-  // TODO:  It's also possible for it to have a range, like "THISANDPRIOR", "THISANDFUTURE".  This isn't currently handled.
-  var recurrenceParam = function (name) {
-      return dateParam(name);
-  }
-
-  var addFBType = function (fb, params) {
-    var p = parseParams(params);
-
-    if (params && p){
-      fb.type = p.FBTYPE || "BUSY"
-    }
-
-    return fb;
-  }
-
-  var freebusyParam = function (name) {
-    return function(val, params, curr){
-      var fb = addFBType({}, params);
-      curr[name] = curr[name] || []
-      curr[name].push(fb);
-
-      storeParam(val, params, fb);
-
-      var parts = val.split('/');
-
-      ['start', 'end'].forEach(function (name, index) {
-        dateParam(name)(parts[index], params, fb);
-      });
-
-      return curr;
-    }
-  }
-
-  return {
-
-
-    objectHandlers : {
-      'BEGIN' : function(component, params, curr, stack){
-          stack.push(curr)
-
-          return {type:component, params:params}
-        }
-
-      , 'END' : function(component, params, curr, stack){
-        // prevents the need to search the root of the tree for the VCALENDAR object
-        if (component === "VCALENDAR") {
-            //scan all high level object in curr and drop all strings
-            var key,
-                obj;
-
-            for (key in curr) {
-                if(curr.hasOwnProperty(key)) {
-                   obj = curr[key];
-                   if (typeof obj === 'string') {
-                       delete curr[key];
-                   }
-                }
-            }
-
-            return curr
-        }
-
-        var par = stack.pop()
-
-        if (curr.uid)
-        {
-        	// If this is the first time we run into this UID, just save it.
-        	if (par[curr.uid] === undefined)
-            {
-            	par[curr.uid] = curr;
-            }
-            else
-            {
-                // If we have multiple ical entries with the same UID, it's either going to be a
-                // modification to a recurrence (RECURRENCE-ID), and/or a significant modification
-                // to the entry (SEQUENCE).
-
-                // TODO: Look into proper sequence logic.
-
-                if (curr.recurrenceid === undefined)
-                {
-                    // If we have the same UID as an existing record, and it *isn't* a specific recurrence ID,
-                    // not quite sure what the correct behaviour should be.  For now, just take the new information
-                    // and merge it with the old record by overwriting only the fields that appear in the new record.
-                    var key;
-                    for (key in curr) {
-                    	par[curr.uid][key] = curr[key];
-                    }
-
-                }
-            }
-
-        	// If we have recurrence-id entries, list them as an array of recurrences keyed off of recurrence-id.
-        	// To use - as you're running through the dates of an rrule, you can try looking it up in the recurrences
-        	// array.  If it exists, then use the data from the calendar object in the recurrence instead of the parent
-        	// for that day.
-
-        	// NOTE:  Sometimes the RECURRENCE-ID record will show up *before* the record with the RRULE entry.  In that
-        	// case, what happens is that the RECURRENCE-ID record ends up becoming both the parent record and an entry
-        	// in the recurrences array, and then when we process the RRULE entry later it overwrites the appropriate
-			// fields in the parent record.
-
-        	if (curr.recurrenceid != null)
-        	{
-
-        		// TODO:  Is there ever a case where we have to worry about overwriting an existing entry here?
-
-        		// Create a copy of the current object to save in our recurrences array.  (We *could* just do par = curr,
-        		// except for the case that we get the RECURRENCE-ID record before the RRULE record.  In that case, we
-        		// would end up with a shared reference that would cause us to overwrite *both* records at the point
-				// that we try and fix up the parent record.)
-        		var recurrenceObj = new Object();
-        		var key;
-        		for (key in curr) {
-        			recurrenceObj[key] = curr[key];
-        		}
-
-        		if (recurrenceObj.recurrences != undefined) {
-        			delete recurrenceObj.recurrences;
-        		}
-
-
-				// If we don't have an array to store recurrences in yet, create it.
-        		if (par[curr.uid].recurrences === undefined) {
-        			par[curr.uid].recurrences = new Array();
-            	}
-
-        		// Save off our cloned recurrence object into the array, keyed by date but not time.
-        		// We key by date only to avoid timezone and "floating time" problems (where the time isn't associated with a timezone).
-				// TODO: See if this causes a problem with events that have multiple recurrences per day.
-                if (typeof curr.recurrenceid.toISOString === 'function') {
-                  par[curr.uid].recurrences[curr.recurrenceid.toISOString().substring(0,10)] = recurrenceObj;
-                } else {
-                  console.error("No toISOString function in curr.recurrenceid", curr.recurrenceid);
-                }
-            }
-
-        	// One more specific fix - in the case that an RRULE entry shows up after a RECURRENCE-ID entry,
-        	// let's make sure to clear the recurrenceid off the parent field.
-        	if ((par[curr.uid].rrule != undefined) && (par[curr.uid].recurrenceid != undefined))
-            {
-        		delete par[curr.uid].recurrenceid;
-            }
-
-        }
-        else
-          par[Math.random()*100000] = curr  // Randomly assign ID : TODO - use true GUID
-
-        return par
-      }
-
-      , 'SUMMARY' : storeParam('summary')
-      , 'DESCRIPTION' : storeParam('description')
-      , 'URL' : storeParam('url')
-      , 'UID' : storeParam('uid')
-      , 'LOCATION' : storeParam('location')
-      , 'DTSTART' : dateParam('start')
-      , 'DTEND' : dateParam('end')
-      , 'EXDATE' : exdateParam('exdate')
-      ,' CLASS' : storeParam('class')
-      , 'TRANSP' : storeParam('transparency')
-      , 'GEO' : geoParam('geo')
-      , 'PERCENT-COMPLETE': storeParam('completion')
-      , 'COMPLETED': dateParam('completed')
-      , 'CATEGORIES': categoriesParam('categories')
-      , 'FREEBUSY': freebusyParam('freebusy')
-      , 'DTSTAMP': dateParam('dtstamp')
-      , 'CREATED': dateParam('created')
-      , 'LAST-MODIFIED': dateParam('lastmodified')
-      , 'RECURRENCE-ID': recurrenceParam('recurrenceid')
-
-    },
-
-
-    handleObject : function(name, val, params, ctx, stack, line){
-      var self = this
-
-      if(self.objectHandlers[name])
-        return self.objectHandlers[name](val, params, ctx, stack, line)
-
-      //handling custom properties
-      if(name.match(/X\-[\w\-]+/) && stack.length > 0) {
-          //trimming the leading and perform storeParam
-          name = name.substring(2);
-          return (storeParam(name))(val, params, ctx, stack, line);
-      }
-
-      return storeParam(name.toLowerCase())(val, params, ctx);
-    },
-
-
-    parseICS : function(str){
-      var self = this
-      var lines = str.split(/\r?\n/)
-      var ctx = {}
-      var stack = []
-
-      for (var i = 0, ii = lines.length, l = lines[0]; i<ii; i++, l=lines[i]){
-        //Unfold : RFC#3.1
-        while (lines[i+1] && /[ \t]/.test(lines[i+1][0])) {
-          l += lines[i+1].slice(1)
-          i += 1
-        }
-
-        var kv = l.split(":")
-
-        if (kv.length < 2){
-          // Invalid line - must have k&v
-          continue;
-        }
-
-        // Although the spec says that vals with colons should be quote wrapped
-        // in practise nobody does, so we assume further colons are part of the
-        // val
-        var value = kv.slice(1).join(":")
-          , kp = kv[0].split(";")
-          , name = kp[0]
-          , params = kp.slice(1)
-
-        ctx = self.handleObject(name, value, params, ctx, stack, l) || {}
-      }
-
-       // type and params are added to the list of items, get rid of them.
-       delete ctx.type
-       delete ctx.params
-
-       return ctx
-    }
-
-  }
-}))
diff --git a/modules/default/calendar/vendor/ical.js/index.js b/modules/default/calendar/vendor/ical.js/index.js
deleted file mode 100644
index 401dbcdd..00000000
--- a/modules/default/calendar/vendor/ical.js/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-module.exports = require('./ical')
-
-var node = require('./node-ical')
-
-// Copy node functions across to exports
-for (var i in node){
-  module.exports[i] = node[i]
-}  
\ No newline at end of file
diff --git a/modules/default/calendar/vendor/ical.js/node-ical.js b/modules/default/calendar/vendor/ical.js/node-ical.js
deleted file mode 100644
index 424fd2e6..00000000
--- a/modules/default/calendar/vendor/ical.js/node-ical.js
+++ /dev/null
@@ -1,77 +0,0 @@
-var ical = require('./ical')
-  , request = require('request')
-  , fs = require('fs')
-
-exports.fromURL = function(url, opts, cb){
-  if (!cb)
-    return;
-  request(url, opts, function(err, r, data){
-  	if (err)
-  	{
-  	  return cb(err, null);
-  	}
-  	else if (r.statusCode != 200)
-  	{
-       return cb(r.statusCode + ": " + r.statusMessage, null);
-  	}
-
-  	cb(undefined, ical.parseICS(data));
-  })
-}
-
-exports.parseFile = function(filename){
-  return ical.parseICS(fs.readFileSync(filename, 'utf8'))
-}
-
-
-var rrule = require('rrule').RRule
-
-function getLocaleISOString(date) {
-	var year = date.getFullYear().toString(10).padStart(4,'0');
-	var month = (date.getMonth() + 1).toString(10).padStart(2,'0');
-	var day = date.getDate().toString(10).padStart(2,'0');
-	var hour = date.getHours().toString(10).padStart(2,'0');
-	var minute = date.getMinutes().toString(10).padStart(2,'0');
-	var second = date.getSeconds().toString(10).padStart(2,'0');
-
-	return `${year}${month}${day}T${hour}${minute}${second}Z`;
-}
-
-ical.objectHandlers['RRULE'] = function(val, params, curr, stack, line){
-  curr.rrule = line;
-  return curr
-}
-var originalEnd = ical.objectHandlers['END'];
-ical.objectHandlers['END'] = function (val, params, curr, stack) {
-	// Recurrence rules are only valid for VEVENT, VTODO, and VJOURNAL.
-	// More specifically, we need to filter the VCALENDAR type because we might end up with a defined rrule
-	// due to the subtypes.
-	if ((val === "VEVENT") || (val === "VTODO") || (val === "VJOURNAL")) {
-		if (curr.rrule) {
-			var rule = curr.rrule.replace('RRULE:', '');
-			if (rule.indexOf('DTSTART') === -1) {
-
-				if (curr.start.length === 8) {
-					var comps = /^(\d{4})(\d{2})(\d{2})$/.exec(curr.start);
-					if (comps) {
-						curr.start = new Date(comps[1], comps[2] - 1, comps[3]);
-					}
-				}
-
-
-				if (typeof curr.start.toISOString === 'function') {
-					try {
-						// kblankenship1989 - to fix issue #1798, converting all dates to locale time first, then converting back to UTC time
-						rule += ';DTSTART=' + getLocaleISOString(curr.start);
-					} catch (error) {
-						console.error("ERROR when trying to convert to ISOString", error);
-					}
-                } else {
-                    console.error("No toISOString function in curr.start", curr.start);
-				}
-			}
-			curr.rrule = rrule.fromString(rule);
-		}
-	}
-  return originalEnd.call(this, val, params, curr, stack);
-}
diff --git a/modules/default/calendar/vendor/ical.js/package.json b/modules/default/calendar/vendor/ical.js/package.json
deleted file mode 100644
index 0b226f6b..00000000
--- a/modules/default/calendar/vendor/ical.js/package.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  "name": "ical",
-  "version": "0.5.0",
-  "main": "index.js",
-  "description": "A tolerant, minimal icalendar parser",
-  "keywords": [
-    "ical",
-    "ics",
-    "calendar"
-  ],
-  "homepage": "https://github.com/peterbraden/ical.js",
-  "author": "Peter Braden <peterbraden@peterbraden.co.uk> (peterbraden.co.uk)",
-  "license": "Apache-2.0",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/peterbraden/ical.js.git"
-  },
-  "dependencies": {
-    "request": "^2.88.0",
-    "rrule": "2.4.1"
-  },
-  "devDependencies": {
-    "vows": "0.8.2",
-    "underscore": "1.9.1"
-  },
-  "scripts": {
-    "test": "./node_modules/vows/bin/vows ./test/test.js"
-  }
-}
diff --git a/modules/default/calendar/vendor/ical.js/readme.md b/modules/default/calendar/vendor/ical.js/readme.md
deleted file mode 100644
index 5f056436..00000000
--- a/modules/default/calendar/vendor/ical.js/readme.md
+++ /dev/null
@@ -1,62 +0,0 @@
-# ical.js #
-(Formerly node-ical)
-
-[![Build Status](https://travis-ci.org/peterbraden/ical.js.png)](https://travis-ci.org/peterbraden/ical.js)
-
-A tolerant, minimal icalendar parser for javascript/node
-(http://tools.ietf.org/html/rfc5545)
-
-
-
-## Install - Node.js ##
-
-ical.js is availble on npm:
-
-    npm install ical
-
-
-
-## API ##
-
-    ical.parseICS(str)
-
-Parses a string with an ICS File
-
-    var data = ical.parseFile(filename)
-    
-Reads in the specified iCal file, parses it and returns the parsed data
-
-    ical.fromURL(url, options, function(err, data) {} )
-
-Use the request library to fetch the specified URL (```opts``` gets passed on to the ```request()``` call), and call the function with the result (either an error or the data).
-
-
-
-## Example 1 - Print list of upcoming node conferences (see example.js)
-```javascript
-'use strict';
-
-const ical = require('ical');
-const months = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];
-
-ical.fromURL('http://lanyrd.com/topics/nodejs/nodejs.ics', {}, function (err, data) {
-	for (let k in data) {
-		if (data.hasOwnProperty(k)) {
-			var ev = data[k];
-			if (data[k].type == 'VEVENT') {
-				console.log(`${ev.summary} is in ${ev.location} on the ${ev.start.getDate()} of ${months[ev.start.getMonth()]} at ${ev.start.toLocaleTimeString('en-GB')}`);
-
-			}
-		}
-	}
-});
-```
-
-## Recurrences and Exceptions ##
-Calendar events with recurrence rules can be significantly more complicated to handle correctly.  There are three parts to handling them:
-
- 1. rrule - the recurrence rule specifying the pattern of recurring dates and times for the event.
- 2. recurrences - an optional array of event data that can override specific occurrences of the event.
- 3. exdate - an optional array of dates that should be excluded from the recurrence pattern.
-
-See example_rrule.js for an example of handling recurring calendar events.
diff --git a/modules/default/calendar/vendor/ical.js/test/test.js b/modules/default/calendar/vendor/ical.js/test/test.js
deleted file mode 100644
index c20587a4..00000000
--- a/modules/default/calendar/vendor/ical.js/test/test.js
+++ /dev/null
@@ -1,500 +0,0 @@
-/****
- * Tests
- *
- *
- ***/
-process.env.TZ = 'America/San_Francisco';
-var ical = require('../index')
-
-var vows = require('vows')
-  , assert = require('assert')
-  , _ = require('underscore')
-
-vows.describe('node-ical').addBatch({
-  'when parsing test1.ics (node conferences schedule from lanyrd.com, modified)': {
-        topic: function () {
-      return ical.parseFile('./test/test1.ics')
-    }
-
-    ,'we get 9 events': function (topic) {
-      var events = _.select(_.values(topic), function(x){ return x.type==='VEVENT'})
-            assert.equal (events.length, 9);
-        }
-
-    ,'event 47f6e' : {
-      topic: function(events){
-        return _.select(_.values(events),
-          function(x){
-            return x.uid ==='47f6ea3f28af2986a2192fa39a91fa7d60d26b76'})[0]
-      }
-      ,'is in fort lauderdale' : function(topic){
-        assert.equal(topic.location, "Fort Lauderdale, United States")
-      }
-      ,'starts Tue, 29 Nov 2011' : function(topic){
-        assert.equal(topic.start.toDateString(), new Date(2011,10,29).toDateString())
-      }
-    }
-    , 'event 480a' : {
-      topic: function(events){
-        return _.select(_.values(events),
-          function(x){
-            return x.uid ==='480a3ad48af5ed8965241f14920f90524f533c18'})[0]
-      }
-      , 'has a summary (invalid colon handling tolerance)' : function(topic){
-        assert.equal(topic.summary, '[Async]: Everything Express')
-      }
-      , 'has a date only start datetime' : function(topic){
-        assert.equal(topic.start.dateOnly, true)
-      }
-      , 'has a date only end datetime' : function(topic){
-        assert.equal(topic.end.dateOnly, true)
-      }
-    }
-    , 'event d4c8' :{
-      topic : function(events){
-        return _.select(_.values(events),
-            function(x){
-              return x.uid === 'd4c826dfb701f611416d69b4df81caf9ff80b03a'})[0]
-      }
-      , 'has a start datetime' : function(topic){
-        assert.equal(topic.start.toDateString(), new Date(Date.UTC(2011, 2, 12, 20, 0, 0)).toDateString())
-      }
-    }
-
-    , 'event sdfkf09fsd0 (Invalid Date)' :{
-      topic : function(events){
-        return _.select(_.values(events),
-            function(x){
-              return x.uid === 'sdfkf09fsd0'})[0]
-      }
-       , 'has a start datetime' : function(topic){
-          assert.equal(topic.start, "Next Year")
-        }
-    }
-  }
-  , 'with test2.ics (testing ical features)' : {
-    topic: function () {
-      return ical.parseFile('./test/test2.ics')
-    }
-    , 'todo item uid4@host1.com' : {
-      topic : function(items){
-        return items['uid4@host1.com']
-      }
-      , 'is a VTODO' : function(topic){
-        assert.equal(topic.type, 'VTODO')
-      }
-    }
-    , 'vfreebusy' : {
-      topic: function(events) {
-        return _.select(_.values(events), function(x) {
-          return x.type === 'VFREEBUSY';
-        })[0];
-      }
-      , 'has a URL' : function(topic) {
-        assert.equal(topic.url, 'http://www.host.com/calendar/busytime/jsmith.ifb');
-      }
-    }
-    , 'vfreebusy first freebusy' : {
-      topic: function(events) {
-        return _.select(_.values(events), function(x) {
-          return x.type === 'VFREEBUSY';
-        })[0].freebusy[0];
-      }
-      , 'has undefined type defaulting to busy' : function(topic) {
-        assert.equal(topic.type, "BUSY");
-      }
-      , 'has an start datetime' : function(topic) {
-        assert.equal(topic.start.getFullYear(), 1998);
-        assert.equal(topic.start.getUTCMonth(), 2);
-        assert.equal(topic.start.getUTCDate(), 14);
-        assert.equal(topic.start.getUTCHours(), 23);
-        assert.equal(topic.start.getUTCMinutes(), 30);
-      }
-      , 'has an end datetime' : function(topic) {
-        assert.equal(topic.end.getFullYear(), 1998);
-        assert.equal(topic.end.getUTCMonth(), 2);
-        assert.equal(topic.end.getUTCDate(), 15);
-        assert.equal(topic.end.getUTCHours(), 00);
-        assert.equal(topic.end.getUTCMinutes(), 30);
-      }
-    }
-  }
-  , 'with test3.ics (testing tvcountdown.com)' : {
-    topic: function() {
-      return ical.parseFile('./test/test3.ics');
-    }
-    , 'event -83' : {
-      topic: function(events) {
-        return _.select(_.values(events), function(x) {
-          return x.uid === '20110505T220000Z-83@tvcountdown.com';
-        })[0];
-      }
-      , 'has a start datetime' : function(topic) {
-        assert.equal(topic.start.getFullYear(), 2011);
-        assert.equal(topic.start.getMonth(), 4);
-      }
-      , 'has an end datetime' : function(topic) {
-        assert.equal(topic.end.getFullYear(), 2011);
-        assert.equal(topic.end.getMonth(), 4);
-      }
-    }
-  }
-
-  , 'with test4.ics (testing tripit.com)' : {
-    topic: function() {
-      return ical.parseFile('./test/test4.ics');
-    }
-    , 'event c32a5...' : {
-      topic: function(events) {
-        return _.select(_.values(events), function(x) {
-          return x.uid === 'c32a5eaba2354bb29e012ec18da827db90550a3b@tripit.com';
-        })[0];
-      }
-      , 'has a start datetime' : function(topic) {
-        assert.equal(topic.start.getFullYear(), 2011);
-        assert.equal(topic.start.getMonth(), 09);
-        assert.equal(topic.start.getDate(), 11);
-      }
-
-      , 'has a summary' : function(topic){
-        // escaped commas and semicolons should be replaced
-        assert.equal(topic.summary, 'South San Francisco, CA, October 2011;')
-
-      }
-
-      , 'has a description' : function(topic){
-        var desired = 'John Doe is in South San Francisco, CA from Oct 11 ' +
-         'to Oct 13, 2011\nView and/or edit details in TripIt : http://www.tripit.c' +
-         'om/trip/show/id/23710889\nTripIt - organize your travel at http://www.trip' +
-         'it.com\n'
-        assert.equal(topic.description, desired)
-
-      }
-
-      , 'has a geolocation' : function(topic){
-        assert.ok(topic.geo, 'no geo param')
-        assert.equal(topic.geo.lat, 37.654656)
-        assert.equal(topic.geo.lon, -122.40775)
-      }
-
-      , 'has transparency' : function(topic){
-        assert.equal(topic.transparency, 'TRANSPARENT')
-      }
-
-    }
-  }
-
-
-
-  , 'with test5.ics (testing meetup.com)' : {
-     topic: function () {
-        return ical.parseFile('./test/test5.ics')
-      }
-    , 'event nsmxnyppbfc@meetup.com' : {
-      topic: function(events) {
-        return _.select(_.values(events), function(x) {
-          return x.uid === 'event_nsmxnyppbfc@meetup.com';
-        })[0];
-      }
-      , 'has a start' : function(topic){
-        assert.equal(topic.start.tz, 'America/Phoenix')
-        assert.equal(topic.start.toISOString(), new Date(2011, 10, 09, 19, 0,0).toISOString())
-      }
-    }
-  }
-
-  , 'with test6.ics (testing assembly.org)': {
-     topic: function () {
-        return ical.parseFile('./test/test6.ics')
-      }
-    , 'event with no ID' : {
-      topic: function(events) {
-        return _.select(_.values(events), function(x) {
-          return x.summary === 'foobar Summer 2011 starts!';
-        })[0];
-      }
-      , 'has a start' : function(topic){
-        assert.equal(topic.start.toISOString(), new Date(2011, 07, 04, 12, 0,0).toISOString())
-      }
-    }
-  , 'event with rrule' :{
-      topic: function(events){
-        return _.select(_.values(events), function(x){
-          return x.summary === "foobarTV broadcast starts"
-        })[0];
-      }
-      , "Has an RRULE": function(topic){
-        assert.notEqual(topic.rrule, undefined);
-      }
-      , "RRule text": function(topic){
-        assert.equal(topic.rrule.toText(), "every 5 weeks on Monday, Friday until January 30, 2013")
-      }
-    }
-  }
-   , 'with test7.ics (testing dtstart of rrule)' :{
-    topic: function() {
-        return ical.parseFile('./test/test7.ics');
-    },
-    'recurring yearly event (14 july)': {
-        topic: function(events){
-            var ev = _.values(events)[0];
-            return ev.rrule.between(new Date(2013, 0, 1), new Date(2014, 0, 1));
-        },
-        'dt start well set': function(topic) {
-            assert.equal(topic[0].toDateString(), new Date(2013, 6, 14).toDateString());
-        }
-    }
-  }
-  , "with test 8.ics (VTODO completion)": {
-    topic: function() {
-        return ical.parseFile('./test/test8.ics');
-    },
-    'grabbing VTODO task': {
-        topic: function(topic) {
-            return _.values(topic)[0];
-        },
-        'task completed': function(task){
-            assert.equal(task.completion, 100);
-            assert.equal(task.completed.toISOString(), new Date(2013, 06, 16, 10, 57, 45).toISOString());
-        }
-    }
-  }
-  , "with test 9.ics (VEVENT with VALARM)": {
-    topic: function() {
-        return ical.parseFile('./test/test9.ics');
-    },
-    'grabbing VEVENT task': {
-        topic: function(topic) {
-            return _.values(topic)[0];
-        },
-        'task completed': function(task){
-            assert.equal(task.summary, "Event with an alarm");
-        }
-    }
-  }
-  , 'with test 11.ics (VEVENT with custom properties)': {
-      topic: function() {
-          return ical.parseFile('./test10.ics');
-      },
-      'grabbing custom properties': {
-          topic: function(topic) {
-
-          }
-      }
-  },
-
-  'with test10.ics': {
-    topic: function () {
-      return ical.parseFile('./test/test10.ics');
-    },
-
-    'when categories present': {
-      topic: function (t) {return _.values(t)[0]},
-
-      'should be a list': function (e) {
-        assert(e.categories instanceof [].constructor);
-      },
-
-      'should contain individual category values': function (e) {
-        assert.deepEqual(e.categories, ['cat1', 'cat2', 'cat3']);
-      }
-    },
-
-    'when categories present with trailing whitespace': {
-      topic: function (t) {return _.values(t)[1]},
-
-      'should contain individual category values without whitespace': function (e) {
-        assert.deepEqual(e.categories, ['cat1', 'cat2', 'cat3']);
-      }
-    },
-
-    'when categories present but empty': {
-      topic: function (t) {return _.values(t)[2]},
-
-      'should be an empty list': function (e) {
-        assert.deepEqual(e.categories, []);
-      }
-    },
-
-    'when categories present but singular': {
-      topic: function (t) {return _.values(t)[3]},
-
-      'should be a list of single item': function (e) {
-        assert.deepEqual(e.categories, ['lonely-cat']);
-      }
-    },
-
-    'when categories present on multiple lines': {
-      topic: function (t) {return _.values(t)[4]},
-
-      'should contain the category values in an array': function (e) {
-        assert.deepEqual(e.categories, ['cat1', 'cat2', 'cat3']);
-      }
-    }
-  },
-
-  'with test11.ics (testing zimbra freebusy)': {
-    topic: function () {
-      return ical.parseFile('./test/test11.ics');
-    },
-
-    'freebusy params' : {
-      topic: function(events) {
-        return _.values(events)[0];
-      }
-      , 'has a URL' : function(topic) {
-        assert.equal(topic.url, 'http://mail.example.com/yvr-2a@example.com/20140416');
-      }
-      , 'has an ORGANIZER' : function(topic) {
-        assert.equal(topic.organizer, 'mailto:yvr-2a@example.com');
-      }
-      , 'has an start datetime' : function(topic) {
-        assert.equal(topic.start.getFullYear(), 2014);
-        assert.equal(topic.start.getMonth(), 3);
-      }
-      , 'has an end datetime' : function(topic) {
-        assert.equal(topic.end.getFullYear(), 2014);
-        assert.equal(topic.end.getMonth(), 6);
-      }
-    }
-    , 'freebusy busy events' : {
-      topic: function(events) {
-        return _.select(_.values(events)[0].freebusy, function(x) {
-          return x.type === 'BUSY';
-        })[0];
-      }
-      , 'has an start datetime' : function(topic) {
-        assert.equal(topic.start.getFullYear(), 2014);
-        assert.equal(topic.start.getMonth(), 3);
-        assert.equal(topic.start.getUTCHours(), 15);
-        assert.equal(topic.start.getUTCMinutes(), 15);
-      }
-      , 'has an end datetime' : function(topic) {
-        assert.equal(topic.end.getFullYear(), 2014);
-        assert.equal(topic.end.getMonth(), 3);
-        assert.equal(topic.end.getUTCHours(), 19);
-        assert.equal(topic.end.getUTCMinutes(), 00);
-      }
-    }
-  }
-
-  , 'with test12.ics (testing recurrences and exdates)': {
-	topic: function () {
-		return ical.parseFile('./test/test12.ics')
-	}
-    , 'event with rrule': {
-  			topic: function (events) {
-  				return _.select(_.values(events), function (x) {
-  					return x.uid === '0000001';
-  				})[0];
-  			}
-      , "Has an RRULE": function (topic) {
-      	assert.notEqual(topic.rrule, undefined);
-      }
-      , "Has summary Treasure Hunting": function (topic) {
-      	assert.equal(topic.summary, 'Treasure Hunting');
-      }
-      , "Has two EXDATES": function (topic) {
-      	assert.notEqual(topic.exdate, undefined);
-      	assert.notEqual(topic.exdate[new Date(2015, 06, 08, 12, 0, 0).toISOString().substring(0, 10)], undefined);
-      	assert.notEqual(topic.exdate[new Date(2015, 06, 10, 12, 0, 0).toISOString().substring(0, 10)], undefined);
-      }
-      , "Has a RECURRENCE-ID override": function (topic) {
-      	assert.notEqual(topic.recurrences, undefined);
-      	assert.notEqual(topic.recurrences[new Date(2015, 06, 07, 12, 0, 0).toISOString().substring(0, 10)], undefined);
-      	assert.equal(topic.recurrences[new Date(2015, 06, 07, 12, 0, 0).toISOString().substring(0, 10)].summary, 'More Treasure Hunting');
-      }
-    }
-  }
-
-  , 'with test13.ics (testing recurrence-id before rrule)': {
-  	topic: function () {
-  		return ical.parseFile('./test/test13.ics')
-  	}
-    , 'event with rrule': {
-    	topic: function (events) {
-    		return _.select(_.values(events), function (x) {
-    			return x.uid === '6m2q7kb2l02798oagemrcgm6pk@google.com';
-    		})[0];
-    	}
-      , "Has an RRULE": function (topic) {
-      	assert.notEqual(topic.rrule, undefined);
-      }
-      , "Has summary 'repeated'": function (topic) {
-      	assert.equal(topic.summary, 'repeated');
-      }
-      , "Has a RECURRENCE-ID override": function (topic) {
-      	assert.notEqual(topic.recurrences, undefined);
-      	assert.notEqual(topic.recurrences[new Date(2016, 7, 26, 14, 0, 0).toISOString().substring(0, 10)], undefined);
-      	assert.equal(topic.recurrences[new Date(2016, 7, 26, 14, 0, 0).toISOString().substring(0, 10)].summary, 'bla bla');
-      }
-    }
-  }
-
-  , 'with test14.ics (testing comma-separated exdates)': {
-  	topic: function () {
-  		return ical.parseFile('./test/test14.ics')
-  	}
-    , 'event with comma-separated exdate': {
-    	topic: function (events) {
-    		return _.select(_.values(events), function (x) {
-    			return x.uid === '98765432-ABCD-DCBB-999A-987765432123';
-    		})[0];
-    	}
-      , "Has summary 'Example of comma-separated exdates'": function (topic) {
-      	assert.equal(topic.summary, 'Example of comma-separated exdates');
-      }
-      , "Has four comma-separated EXDATES": function (topic) {
-      	assert.notEqual(topic.exdate, undefined);
-		// Verify the four comma-separated EXDATES are there
-      	assert.notEqual(topic.exdate[new Date(2017, 6, 6, 12, 0, 0).toISOString().substring(0, 10)], undefined);
-      	assert.notEqual(topic.exdate[new Date(2017, 6, 17, 12, 0, 0).toISOString().substring(0, 10)], undefined);
-      	assert.notEqual(topic.exdate[new Date(2017, 6, 20, 12, 0, 0).toISOString().substring(0, 10)], undefined);
-      	assert.notEqual(topic.exdate[new Date(2017, 7, 3, 12, 0, 0).toISOString().substring(0, 10)], undefined);
-		// Verify an arbitrary date isn't there
-      	assert.equal(topic.exdate[new Date(2017, 4, 5, 12, 0, 0).toISOString().substring(0, 10)], undefined);
-      }
-    }
-  }
-
-  , 'with test14.ics (testing exdates with bad times)': {
-  	topic: function () {
-  		return ical.parseFile('./test/test14.ics')
-  	}
-    , 'event with exdates with bad times': {
-    	topic: function (events) {
-    		return _.select(_.values(events), function (x) {
-    			return x.uid === '1234567-ABCD-ABCD-ABCD-123456789012';
-    		})[0];
-    	}
-      , "Has summary 'Example of exdate with bad times'": function (topic) {
-      	assert.equal(topic.summary, 'Example of exdate with bad times');
-      }
-      , "Has two EXDATES even though they have bad times": function (topic) {
-      	assert.notEqual(topic.exdate, undefined);
-      	// Verify the two EXDATES are there, even though they have bad times
-      	assert.notEqual(topic.exdate[new Date(2017, 11, 18, 12, 0, 0).toISOString().substring(0, 10)], undefined);
-      	assert.notEqual(topic.exdate[new Date(2017, 11, 19, 12, 0, 0).toISOString().substring(0, 10)], undefined);
-      }
-    }
-  }
-
- , 'url request errors': {
-    topic : function () {
-      ical.fromURL('http://255.255.255.255/', {}, this.callback);
-    }
-    , 'are passed back to the callback' : function (err, result) {
-      assert.instanceOf(err, Error);
-      if (!err){
-        console.log(">E:", err, result)
-      }
-    }
-  }
-}).export(module)
-
-
-//ical.fromURL('http://lanyrd.com/topics/nodejs/nodejs.ics',
-//  {},
-//  function(err, data){
-//    console.log("OUT:", data)
-//  })
diff --git a/modules/default/calendar/vendor/ical.js/test/test1.ics b/modules/default/calendar/vendor/ical.js/test/test1.ics
deleted file mode 100644
index ff8cc076..00000000
--- a/modules/default/calendar/vendor/ical.js/test/test1.ics
+++ /dev/null
@@ -1,78 +0,0 @@
-BEGIN:VCALENDAR
-PRODID:-//lanyrd.com//Lanyrd//EN
-X-ORIGINAL-URL:http://lanyrd.com/topics/nodejs/nodejs.ics
-X-WR-CALNAME;CHARSET=utf-8:Node.js conferences
-VERSION:2.0
-METHOD:PUBLISH
-BEGIN:VEVENT
-SUMMARY;CHARSET=utf-8:Dyncon 2011
-LOCATION;CHARSET=utf-8:Stockholm, Sweden
-URL:http://lanyrd.com/2011/dyncon/
-UID:d4c826dfb701f611416d69b4df81caf9ff80b03a
-DTSTART:20110312T200000Z
-DTEND;VALUE=DATE:20110314
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY;CHARSET=utf-8:[Async]: Everything Express
-LOCATION;CHARSET=utf-8:Brighton, United Kingdom
-URL:http://lanyrd.com/2011/asyncjs-express/
-UID:480a3ad48af5ed8965241f14920f90524f533c18
-DTSTART;VALUE=DATE:20110324
-DTEND;VALUE=DATE:20110325
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY;CHARSET=utf-8:JSConf US 2011
-LOCATION;CHARSET=utf-8:Portland, United States
-URL:http://lanyrd.com/2011/jsconf/
-UID:ed334cc85db5ebdff5ff5a630a7a48631a677dbe
-DTSTART;VALUE=DATE:20110502
-DTEND;VALUE=DATE:20110504
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY;CHARSET=utf-8:NodeConf 2011
-LOCATION;CHARSET=utf-8:Portland, United States
-URL:http://lanyrd.com/2011/nodeconf/
-UID:25169a7b1ba5c248278f47120a40878055dc8c15
-DTSTART;VALUE=DATE:20110505
-DTEND;VALUE=DATE:20110506
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY;CHARSET=utf-8:BrazilJS
-LOCATION;CHARSET=utf-8:Fortaleza, Brazil
-URL:http://lanyrd.com/2011/braziljs/
-UID:dafee3be83624f3388c5635662229ff11766bb9c
-DTSTART;VALUE=DATE:20110513
-DTEND;VALUE=DATE:20110515
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY;CHARSET=utf-8:Falsy Values
-LOCATION;CHARSET=utf-8:Warsaw, Poland
-URL:http://lanyrd.com/2011/falsy-values/
-UID:73cad6a09ac4e7310979c6130f871d17d990b5ad
-DTSTART;VALUE=DATE:20110518
-DTEND;VALUE=DATE:20110521
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY;CHARSET=utf-8:nodecamp.eu
-LOCATION;CHARSET=utf-8:Cologne, Germany
-URL:http://lanyrd.com/2011/nodecampde/
-UID:b728a5fdb5f292b6293e4a2fd97a1ccfc69e9d6f
-DTSTART;VALUE=DATE:20110611
-DTEND;VALUE=DATE:20110613
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY;CHARSET=utf-8:Rich Web Experience 2011
-LOCATION;CHARSET=utf-8:Fort Lauderdale, United States
-URL:http://lanyrd.com/2011/rich-web-experience/
-UID:47f6ea3f28af2986a2192fa39a91fa7d60d26b76
-DTSTART;VALUE=DATE:20111129
-DTEND;VALUE=DATE:20111203
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY;CHARSET=utf-8:Foobar
-UID:sdfkf09fsd0
-DTSTART;VALUE=DATE:Next Year
-DTEND;VALUE=DATE:20111203
-END:VEVENT
-
-END:VCALENDAR
diff --git a/modules/default/calendar/vendor/ical.js/test/test10.ics b/modules/default/calendar/vendor/ical.js/test/test10.ics
deleted file mode 100644
index 40763b3b..00000000
--- a/modules/default/calendar/vendor/ical.js/test/test10.ics
+++ /dev/null
@@ -1,34 +0,0 @@
-BEGIN:VCALENDAR
-BEGIN:VEVENT
-UID:1
-SUMMARY:Event with a category
-DESCRIPTION:Details for an event with a category
-CATEGORIES:cat1,cat2,cat3
-END:VEVENT
-BEGIN:VEVENT
-UID:2
-SUMMARY:Event with a category
-DESCRIPTION:Details for an event with a category
-CATEGORIES:cat1  ,  cat2,   cat3
-END:VEVENT
-BEGIN:VEVENT
-UID:3
-SUMMARY:Event with a category
-DESCRIPTION:Details for an event with a category
-CATEGORIES:
-END:VEVENT
-BEGIN:VEVENT
-UID:4
-SUMMARY:Event with a category
-DESCRIPTION:Details for an event with a category
-CATEGORIES:lonely-cat
-END:VEVENT
-BEGIN:VEVENT
-UID:5
-SUMMARY:Event with a category
-DESCRIPTION:Details for an event with a category
-CATEGORIES:cat1
-CATEGORIES:cat2
-CATEGORIES:cat3
-END:VEVENT
-END:VCALENDAR
diff --git a/modules/default/calendar/vendor/ical.js/test/test11.ics b/modules/default/calendar/vendor/ical.js/test/test11.ics
deleted file mode 100644
index 3a7e80de..00000000
--- a/modules/default/calendar/vendor/ical.js/test/test11.ics
+++ /dev/null
@@ -1,41 +0,0 @@
-BEGIN:VCALENDAR
-PRODID:Zimbra-Calendar-Provider
-VERSION:2.0
-METHOD:PUBLISH
-BEGIN:VFREEBUSY
-ORGANIZER:mailto:yvr-2a@example.com
-DTSTAMP:20140516T235436Z
-DTSTART:20140415T235436Z
-DTEND:20140717T235436Z
-URL:http://mail.example.com/yvr-2a@example.com/20140416
-FREEBUSY;FBTYPE=BUSY:20140416T151500Z/20140416T190000Z
-FREEBUSY;FBTYPE=BUSY:20140416T195500Z/20140416T231500Z
-FREEBUSY;FBTYPE=BUSY:20140417T193000Z/20140417T203000Z
-FREEBUSY;FBTYPE=BUSY:20140421T210000Z/20140421T213000Z
-FREEBUSY;FBTYPE=BUSY:20140423T180000Z/20140423T190000Z
-FREEBUSY;FBTYPE=BUSY:20140423T200000Z/20140423T210000Z
-FREEBUSY;FBTYPE=BUSY:20140423T223500Z/20140423T231500Z
-FREEBUSY;FBTYPE=BUSY:20140424T155000Z/20140424T165500Z
-FREEBUSY;FBTYPE=BUSY:20140424T170000Z/20140424T183000Z
-FREEBUSY;FBTYPE=BUSY:20140424T195000Z/20140424T230000Z
-FREEBUSY;FBTYPE=BUSY:20140425T144500Z/20140425T161500Z
-FREEBUSY;FBTYPE=BUSY:20140425T180000Z/20140425T194500Z
-FREEBUSY;FBTYPE=BUSY:20140425T223000Z/20140425T230000Z
-FREEBUSY;FBTYPE=BUSY:20140428T151500Z/20140428T163000Z
-FREEBUSY;FBTYPE=BUSY:20140428T170000Z/20140428T173000Z
-FREEBUSY;FBTYPE=BUSY:20140428T195500Z/20140428T213000Z
-FREEBUSY;FBTYPE=BUSY:20140428T231000Z/20140428T234000Z
-FREEBUSY;FBTYPE=BUSY:20140429T152500Z/20140429T170000Z
-FREEBUSY;FBTYPE=BUSY:20140429T180000Z/20140429T183000Z
-FREEBUSY;FBTYPE=BUSY:20140429T201500Z/20140429T230000Z
-FREEBUSY;FBTYPE=BUSY:20140430T162500Z/20140430T165500Z
-FREEBUSY;FBTYPE=BUSY:20140430T180000Z/20140430T190000Z
-FREEBUSY;FBTYPE=BUSY:20140501T170000Z/20140501T173000Z
-FREEBUSY;FBTYPE=BUSY:20140501T175000Z/20140501T190000Z
-FREEBUSY;FBTYPE=BUSY:20140501T232000Z/20140501T235000Z
-FREEBUSY;FBTYPE=BUSY:20140502T163500Z/20140502T173000Z
-FREEBUSY;FBTYPE=BUSY:20140505T165500Z/20140505T173000Z
-FREEBUSY;FBTYPE=BUSY:20140505T201500Z/20140505T203000Z
-FREEBUSY;FBTYPE=BUSY:20140505T210000Z/20140505T213000Z
-END:VFREEBUSY
-END:VCALENDAR
diff --git a/modules/default/calendar/vendor/ical.js/test/test12.ics b/modules/default/calendar/vendor/ical.js/test/test12.ics
deleted file mode 100644
index 4e78603b..00000000
--- a/modules/default/calendar/vendor/ical.js/test/test12.ics
+++ /dev/null
@@ -1,19 +0,0 @@
-BEGIN:VCALENDAR
-BEGIN:VEVENT
-UID:0000001
-SUMMARY:Treasure Hunting
-DTSTART;TZID=America/Los_Angeles:20150706T120000
-DTEND;TZID=America/Los_Angeles:20150706T130000
-RRULE:FREQ=DAILY;COUNT=10
-EXDATE;TZID=America/Los_Angeles:20150708T120000
-EXDATE;TZID=America/Los_Angeles:20150710T120000
-END:VEVENT
-BEGIN:VEVENT
-UID:0000001
-SUMMARY:More Treasure Hunting
-LOCATION:The other island
-DTSTART;TZID=America/Los_Angeles:20150709T150000
-DTEND;TZID=America/Los_Angeles:20150707T160000
-RECURRENCE-ID;TZID=America/Los_Angeles:20150707T120000
-END:VEVENT
-END:VCALENDAR
diff --git a/modules/default/calendar/vendor/ical.js/test/test13.ics b/modules/default/calendar/vendor/ical.js/test/test13.ics
deleted file mode 100644
index 3118186b..00000000
--- a/modules/default/calendar/vendor/ical.js/test/test13.ics
+++ /dev/null
@@ -1,57 +0,0 @@
-BEGIN:VCALENDAR
-PRODID:-//Google Inc//Google Calendar 70.9054//EN
-VERSION:2.0
-CALSCALE:GREGORIAN
-METHOD:PUBLISH
-X-WR-CALNAME:ical
-X-WR-TIMEZONE:Europe/Kiev
-X-WR-CALDESC:
-BEGIN:VTIMEZONE
-TZID:Europe/Kiev
-X-LIC-LOCATION:Europe/Kiev
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0300
-TZNAME:EEST
-DTSTART:19700329T030000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0300
-TZOFFSETTO:+0200
-TZNAME:EET
-DTSTART:19701025T040000
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
-END:STANDARD
-END:VTIMEZONE
-BEGIN:VEVENT
-DTSTART;TZID=Europe/Kiev:20160826T140000
-DTEND;TZID=Europe/Kiev:20160826T150000
-DTSTAMP:20160825T061505Z
-UID:6m2q7kb2l02798oagemrcgm6pk@google.com
-RECURRENCE-ID;TZID=Europe/Kiev:20160826T140000
-CREATED:20160823T125221Z
-DESCRIPTION:
-LAST-MODIFIED:20160823T130320Z
-LOCATION:
-SEQUENCE:0
-STATUS:CONFIRMED
-SUMMARY:bla bla
-TRANSP:OPAQUE
-END:VEVENT
-BEGIN:VEVENT
-DTSTART;TZID=Europe/Kiev:20160825T140000
-DTEND;TZID=Europe/Kiev:20160825T150000
-RRULE:FREQ=DAILY;UNTIL=20160828T110000Z
-DTSTAMP:20160825T061505Z
-UID:6m2q7kb2l02798oagemrcgm6pk@google.com
-CREATED:20160823T125221Z
-DESCRIPTION:
-LAST-MODIFIED:20160823T125221Z
-LOCATION:
-SEQUENCE:0
-STATUS:CONFIRMED
-SUMMARY:repeated
-TRANSP:OPAQUE
-END:VEVENT
-END:VCALENDAR
\ No newline at end of file
diff --git a/modules/default/calendar/vendor/ical.js/test/test14.ics b/modules/default/calendar/vendor/ical.js/test/test14.ics
deleted file mode 100644
index 5c4f5caf..00000000
--- a/modules/default/calendar/vendor/ical.js/test/test14.ics
+++ /dev/null
@@ -1,33 +0,0 @@
-BEGIN:VCALENDAR
-PRODID:-//Google Inc//Google Calendar 70.9054//EN
-VERSION:2.0
-CALSCALE:GREGORIAN
-METHOD:PUBLISH
-X-WR-CALNAME:ical
-X-WR-TIMEZONE:Europe/Kiev
-X-WR-CALDESC:
-BEGIN:VEVENT
-UID:98765432-ABCD-DCBB-999A-987765432123
-DTSTART;TZID=US/Central:20170216T090000
-DTEND;TZID=US/Central:20170216T190000
-DTSTAMP:20170727T044436Z
-EXDATE;TZID=US/Central:20170706T090000,20170717T090000,20170720T090000,20
- 170803T090000
-LAST-MODIFIED:20170727T044435Z
-RRULE:FREQ=WEEKLY;WKST=SU;UNTIL=20170814T045959Z;INTERVAL=2;BYDAY=MO,TH
-SEQUENCE:0
-SUMMARY:Example of comma-separated exdates
-END:VEVENT
-BEGIN:VEVENT
-UID:1234567-ABCD-ABCD-ABCD-123456789012
-DTSTART:20170814T140000Z
-DTEND:20170815T000000Z
-DTSTAMP:20171204T134925Z
-EXDATE:20171219T060000
-EXDATE:20171218T060000
-LAST-MODIFIED:20171024T140004Z
-RRULE:FREQ=WEEKLY;WKST=SU;INTERVAL=2;BYDAY=MO,TU
-SEQUENCE:0
-SUMMARY:Example of exdate with bad times
-END:VEVENT
-END:VCALENDAR
\ No newline at end of file
diff --git a/modules/default/calendar/vendor/ical.js/test/test2.ics b/modules/default/calendar/vendor/ical.js/test/test2.ics
deleted file mode 100644
index 29baf8cd..00000000
--- a/modules/default/calendar/vendor/ical.js/test/test2.ics
+++ /dev/null
@@ -1,83 +0,0 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-X-WR-TIMEZONE;VALUE=TEXT:US/Pacific
-METHOD:PUBLISH
-PRODID:-//Apple Computer\, Inc//iCal 1.0//EN
-X-WR-CALNAME;VALUE=TEXT:Example
-VERSION:2.0
-BEGIN:VEVENT
-SEQUENCE:5
-DTSTART;TZID=US/Pacific:20021028T140000
-DTSTAMP:20021028T011706Z
-SUMMARY:Coffee with Jason
-UID:EC9439B1-FF65-11D6-9973-003065F99D04
-DTEND;TZID=US/Pacific:20021028T150000
-END:VEVENT
-BEGIN:VALARM
-TRIGGER;VALUE=DURATION:-P1D
-ACTION:DISPLAY
-DESCRIPTION:Event reminder
-END:VALARM
-BEGIN:VEVENT
-SEQUENCE:1
-DTSTAMP:20021128T012034Z
-SUMMARY:Code Review
-UID:EC944331-FF65-11D6-9973-003065F99D04
-DTSTART;TZID=US/Pacific:20021127T120000
-DURATION:PT1H
-END:VEVENT
-BEGIN:VEVENT
-SEQUENCE:1
-DTSTAMP:20021028T012034Z
-SUMMARY:Dinner with T
-UID:EC944CFA-FF65-11D6-9973-003065F99D04
-DTSTART;TZID=US/Pacific:20021216T200000
-DURATION:PT1H
-END:VEVENT
-BEGIN:VTODO
-DTSTAMP:19980130T134500Z
-SEQUENCE:2
-UID:uid4@host1.com
-ORGANIZER:MAILTO:unclesam@us.gov
-ATTENDEE;PARTSTAT=ACCEPTED:MAILTO:jqpublic@host.com
-DUE:19980415T235959
-STATUS:NEEDS-ACTION
-SUMMARY:Submit Income Taxes
-END:VTODO
-BEGIN:VALARM
-ACTION:AUDIO
-TRIGGER:19980403T120000
-ATTACH;FMTTYPE=audio/basic:http://host.com/pub/audio-
- files/ssbanner.aud
-REPEAT:4
-DURATION:PT1H
-END:VALARM
-BEGIN:VJOURNAL
-DTSTAMP:19970324T120000Z
-UID:uid5@host1.com
-ORGANIZER:MAILTO:jsmith@host.com
-STATUS:DRAFT
-CLASS:PUBLIC
-CATEGORY:Project Report, XYZ, Weekly Meeting
-DESCRIPTION:Project xyz Review Meeting Minutes\n
-  Agenda\n1. Review of project version 1.0 requirements.\n2.
- Definition
-  of project processes.\n3. Review of project schedule.\n
-  Participants: John Smith, Jane Doe, Jim Dandy\n-It was
-   decided that the requirements need to be signed off by
-   product marketing.\n-Project processes were accepted.\n
-  -Project schedule needs to account for scheduled holidays
-   and employee vacation time. Check with HR for specific
-   dates.\n-New schedule will be distributed by Friday.\n-
-  Next weeks meeting is cancelled. No meeting until 3/23.
-END:VJOURNAL
-BEGIN:VFREEBUSY
-ORGANIZER:MAILTO:jsmith@host.com
-DTSTART:19980313T141711Z
-DTEND:19980410T141711Z
-FREEBUSY:19980314T233000Z/19980315T003000Z
-FREEBUSY:19980316T153000Z/19980316T163000Z
-FREEBUSY:19980318T030000Z/19980318T040000Z
-URL:http://www.host.com/calendar/busytime/jsmith.ifb
-END:VFREEBUSY
-END:VCALENDAR
diff --git a/modules/default/calendar/vendor/ical.js/test/test3.ics b/modules/default/calendar/vendor/ical.js/test/test3.ics
deleted file mode 100644
index ee7111e7..00000000
--- a/modules/default/calendar/vendor/ical.js/test/test3.ics
+++ /dev/null
@@ -1,226 +0,0 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:tvcountdown.com
-X-WR-CALNAME:tvcountdown.com
-VERSION:2.0
-METHOD:PUBLISH
-X-WR-TIMEZONE:US/Eastern
-X-WR-CALNAME;VALUE=TEXT:tvcountdown.com
-X-WR-CALDESC:
-BEGIN:VEVENT
-UID:20110519T200000Z-79@tvcountdown.com
-DTSTART;VALUE=DATE-TIME:20110519T200000
-DTEND;VALUE=DATE-TIME:20110519T203000
-DTSTAMP:20110430T192946Z
-URL;VALUE=URI:
-SUMMARY:The Big Bang Theory - S04E24 - The Roomate Transmogrfication
-END:VEVENT
-BEGIN:VEVENT
-UID:20110512T200000Z-79@tvcountdown.com
-DTSTART;VALUE=DATE-TIME:20110512T200000
-DTEND;VALUE=DATE-TIME:20110512T203000
-DTSTAMP:20110430T192946Z
-URL;VALUE=URI:
-SUMMARY:The Big Bang Theory - S04E23 - The Engagement Reaction
-END:VEVENT
-BEGIN:VEVENT
-UID:20110505T220000Z-83@tvcountdown.com
-DTSTART;VALUE=DATE-TIME:20110505T220000
-DTEND;VALUE=DATE-TIME:20110505T223000
-DTSTAMP:20110430T192946Z
-URL;VALUE=URI:
-SUMMARY:30 Rock - S05E23 - Respawn
-END:VEVENT
-BEGIN:VEVENT
-UID:20110505T200000Z-79@tvcountdown.com
-DTSTART;VALUE=DATE-TIME:20110505T200000
-DTEND;VALUE=DATE-TIME:20110505T203000
-DTSTAMP:20110430T192946Z
-URL;VALUE=URI:
-SUMMARY:The Big Bang Theory - S04E22 - The Wildebeest Implementation
-END:VEVENT
-BEGIN:VEVENT
-UID:20110504T230000Z-289@tvcountdown.com
-DTSTART;VALUE=DATE-TIME:20110504T230000
-DTEND;VALUE=DATE-TIME:20110504T233000
-DTSTAMP:20110430T192946Z
-URL;VALUE=URI:
-SUMMARY:The Daily Show - S16E59 - David Barton
-END:VEVENT
-BEGIN:VEVENT
-UID:20110503T230000Z-289@tvcountdown.com
-DTSTART;VALUE=DATE-TIME:20110503T230000
-DTEND;VALUE=DATE-TIME:20110503T233000
-DTSTAMP:20110430T192946Z
-URL;VALUE=URI:
-SUMMARY:The Daily Show - S16E58 - Rachel Maddow
-END:VEVENT
-BEGIN:VEVENT
-UID:20110502T230000Z-289@tvcountdown.com
-DTSTART;VALUE=DATE-TIME:20110502T230000
-DTEND;VALUE=DATE-TIME:20110502T233000
-DTSTAMP:20110430T192946Z
-URL;VALUE=URI:
-SUMMARY:The Daily Show - S16E57 - Philip K. Howard
-END:VEVENT
-BEGIN:VEVENT
-UID:20110428T230000Z-289@tvcountdown.com
-DTSTART;VALUE=DATE-TIME:20110428T230000
-DTEND;VALUE=DATE-TIME:20110428T233000
-DTSTAMP:20110430T192946Z
-URL;VALUE=URI:
-SUMMARY:The Daily Show - S16E56 - William Cohan
-END:VEVENT
-BEGIN:VEVENT
-UID:20110428T220000Z-83@tvcountdown.com
-DTSTART;VALUE=DATE-TIME:20110428T220000
-DTEND;VALUE=DATE-TIME:20110428T223000
-DTSTAMP:20110430T192946Z
-URL;VALUE=URI:
-SUMMARY:30 Rock - S05E22 - Everything Sunny All the Time Always
-END:VEVENT
-BEGIN:VEVENT
-UID:20110428T200000Z-79@tvcountdown.com
-DTSTART;VALUE=DATE-TIME:20110428T200000
-DTEND;VALUE=DATE-TIME:20110428T203000
-DTSTAMP:20110430T192946Z
-URL;VALUE=URI:
-SUMMARY:The Big Bang Theory - S04E21 - The Agreement Dissection
-END:VEVENT
-BEGIN:VEVENT
-UID:20110427T230000Z-289@tvcountdown.com
-DTSTART;VALUE=DATE-TIME:20110427T230000
-DTEND;VALUE=DATE-TIME:20110427T233000
-DTSTAMP:20110430T192946Z
-URL;VALUE=URI:
-SUMMARY:The Daily Show - S16E55 - Sen. Bernie Sanders
-END:VEVENT
-BEGIN:VEVENT
-UID:20110426T230000Z-289@tvcountdown.com
-DTSTART;VALUE=DATE-TIME:20110426T230000
-DTEND;VALUE=DATE-TIME:20110426T233000
-DTSTAMP:20110430T192946Z
-URL;VALUE=URI:
-SUMMARY:The Daily Show - S16E54 - Elizabeth Warren
-END:VEVENT
-BEGIN:VEVENT
-UID:20110425T230000Z-289@tvcountdown.com
-DTSTART;VALUE=DATE-TIME:20110425T230000
-DTEND;VALUE=DATE-TIME:20110425T233000
-DTSTAMP:20110430T192946Z
-URL;VALUE=URI:
-SUMMARY:The Daily Show - S16E53 - Gigi Ibrahim
-END:VEVENT
-BEGIN:VEVENT
-UID:20110421T220000Z-83@tvcountdown.com
-DTSTART;VALUE=DATE-TIME:20110421T220000
-DTEND;VALUE=DATE-TIME:20110421T223000
-DTSTAMP:20110430T192946Z
-URL;VALUE=URI:
-SUMMARY:30 Rock - S05E21 - 100th Episode Part 2 of 2
-END:VEVENT
-BEGIN:VEVENT
-UID:20110421T220000Z-83@tvcountdown.com
-DTSTART;VALUE=DATE-TIME:20110421T220000
-DTEND;VALUE=DATE-TIME:20110421T223000
-DTSTAMP:20110430T192946Z
-URL;VALUE=URI:
-SUMMARY:30 Rock - S05E20 - 100th Episode Part 1 of 2
-END:VEVENT
-BEGIN:VEVENT
-UID:20110414T230000Z-289@tvcountdown.com
-DTSTART;VALUE=DATE-TIME:20110414T230000
-DTEND;VALUE=DATE-TIME:20110414T233000
-DTSTAMP:20110430T192946Z
-URL;VALUE=URI:
-SUMMARY:The Daily Show - S16E52 - Ricky Gervais
-END:VEVENT
-BEGIN:VEVENT
-UID:20110414T220000Z-83@tvcountdown.com
-DTSTART;VALUE=DATE-TIME:20110414T220000
-DTEND;VALUE=DATE-TIME:20110414T223000
-DTSTAMP:20110430T192946Z
-URL;VALUE=URI:
-SUMMARY:30 Rock - S05E19 - I Heart Connecticut
-END:VEVENT
-BEGIN:VEVENT
-UID:20110413T230000Z-289@tvcountdown.com
-DTSTART;VALUE=DATE-TIME:20110413T230000
-DTEND;VALUE=DATE-TIME:20110413T233000
-DTSTAMP:20110430T192946Z
-URL;VALUE=URI:
-SUMMARY:The Daily Show - S16E51 - Tracy Morgan
-END:VEVENT
-BEGIN:VEVENT
-UID:20110412T230000Z-289@tvcountdown.com
-DTSTART;VALUE=DATE-TIME:20110412T230000
-DTEND;VALUE=DATE-TIME:20110412T233000
-DTSTAMP:20110430T192946Z
-URL;VALUE=URI:
-SUMMARY:The Daily Show - S16E50 - Gov. Deval Patrick
-END:VEVENT
-BEGIN:VEVENT
-UID:20110411T230000Z-289@tvcountdown.com
-DTSTART;VALUE=DATE-TIME:20110411T230000
-DTEND;VALUE=DATE-TIME:20110411T233000
-DTSTAMP:20110430T192946Z
-URL;VALUE=URI:
-SUMMARY:The Daily Show - S16E49 - Foo Fighters
-END:VEVENT
-BEGIN:VEVENT
-UID:20110407T230000Z-289@tvcountdown.com
-DTSTART;VALUE=DATE-TIME:20110407T230000
-DTEND;VALUE=DATE-TIME:20110407T233000
-DTSTAMP:20110430T192946Z
-URL;VALUE=URI:
-SUMMARY:The Daily Show - S16E48 - Jamie Oliver
-END:VEVENT
-BEGIN:VEVENT
-UID:20110407T200000Z-79@tvcountdown.com
-DTSTART;VALUE=DATE-TIME:20110407T200000
-DTEND;VALUE=DATE-TIME:20110407T203000
-DTSTAMP:20110430T192946Z
-URL;VALUE=URI:
-SUMMARY:The Big Bang Theory - S04E20 - The Herb Garden Germination
-END:VEVENT
-BEGIN:VEVENT
-UID:20110406T230000Z-289@tvcountdown.com
-DTSTART;VALUE=DATE-TIME:20110406T230000
-DTEND;VALUE=DATE-TIME:20110406T233000
-DTSTAMP:20110430T192946Z
-URL;VALUE=URI:
-SUMMARY:The Daily Show - S16E47 - Mike Huckabee
-END:VEVENT
-BEGIN:VEVENT
-UID:20110405T230000Z-289@tvcountdown.com
-DTSTART;VALUE=DATE-TIME:20110405T230000
-DTEND;VALUE=DATE-TIME:20110405T233000
-DTSTAMP:20110430T192946Z
-URL;VALUE=URI:
-SUMMARY:The Daily Show - S16E46 - Colin Quinn
-END:VEVENT
-BEGIN:VEVENT
-UID:20110404T230000Z-289@tvcountdown.com
-DTSTART;VALUE=DATE-TIME:20110404T230000
-DTEND;VALUE=DATE-TIME:20110404T233000
-DTSTAMP:20110430T192946Z
-URL;VALUE=URI:
-SUMMARY:The Daily Show - S16E45 - Billy Crystal
-END:VEVENT
-BEGIN:VEVENT
-UID:20110331T230000Z-289@tvcountdown.com
-DTSTART;VALUE=DATE-TIME:20110331T230000
-DTEND;VALUE=DATE-TIME:20110331T233000
-DTSTAMP:20110430T192946Z
-URL;VALUE=URI:
-SUMMARY:The Daily Show - S16E44 - Norm MacDonald
-END:VEVENT
-BEGIN:VEVENT
-UID:20110331T200000Z-79@tvcountdown.com
-DTSTART;VALUE=DATE-TIME:20110331T200000
-DTEND;VALUE=DATE-TIME:20110331T203000
-DTSTAMP:20110430T192946Z
-URL;VALUE=URI:
-SUMMARY:The Big Bang Theory - S04E19 - The Zarnecki Incursion
-END:VEVENT
-END:VCALENDAR
\ No newline at end of file
diff --git a/modules/default/calendar/vendor/ical.js/test/test4.ics b/modules/default/calendar/vendor/ical.js/test/test4.ics
deleted file mode 100644
index 390a404c..00000000
--- a/modules/default/calendar/vendor/ical.js/test/test4.ics
+++ /dev/null
@@ -1,747 +0,0 @@
-BEGIN:VCALENDAR
-X-WR-CALNAME:John Doe (TripIt)
-X-WR-CALDESC:TripIt Calendar
-X-PUBLISHED-TTL:PT15M
-PRODID:-//John Doe/NONSGML Bennu 0.1//EN
-VERSION:2.0
-BEGIN:VEVENT
-DTSTAMP:20120101T215311Z
-UID:c32a5eaba2354bb29e012ec18da827db90550a3b@tripit.com
-DTSTART;VALUE=DATE:20111011
-DTEND;VALUE=DATE:20111014
-SUMMARY:South San Francisco\, CA\, October 2011\;
-LOCATION:South San Francisco\, CA
-GEO:37.654656;-122.40775
-TRANSP:TRANSPARENT
-DESCRIPTION:John Doe is in South San Francisco\, CA from Oct 11 
- to Oct 13\, 2011\nView and/or edit details in TripIt : http://www.tripit.c
- om/trip/show/id/23710889\nTripIt - organize your travel at http://www.trip
- it.com\n
-END:VEVENT
-BEGIN:VEVENT
-DTSTAMP:20120101T215311Z
-TRANSP:TRANSPARENT
-UID:item-ee275ccffa83f492d9eb63b01953b39f18d4f944@tripit.com
-DTSTART:20111011T100500
-DTEND:20111011T110500
-SUMMARY:Directions from SFO to Embassy Suites San Francisco Airport - Sout
- h San Francisco
-LOCATION:250 GATEWAY BLVD\, South San Francisco\, CA\, 94080
-DESCRIPTION:View and/or edit details in TripIt : http://www.tripit.com/tri
- p/show/id/1234\n \n[Directions] 10/11/2011 10:05am - Directions from S
- FO to Embassy Suites San Francisco Airport - South San Francisco \nfrom: S
- FO \nto: 250 GATEWAY BLVD\, South San Francisco\, CA\, 94080 \nView direct
- ions here: http://maps.google.com/maps?output=mobile&saddr=SFO&daddr=250+G
- ATEWAY+BLVD%2C+South+San+Francisco%2C+CA%2C+94080 \n \n \n\nTripIt - organ
- ize your travel at http://www.tripit.com
-GEO:37.655634;-122.401273
-END:VEVENT
-BEGIN:VEVENT
-DTSTAMP:20120101T215311Z
-DTEND:20111011T165500Z
-SUMMARY:US403 PHX to SFO
-LOCATION:Phoenix (PHX)
-UID:item-c576afd397cf1f90578b4ba35e781b61ba8897db@tripit.com
-DTSTART:20111011T144500Z
-DESCRIPTION:View and/or edit details in TripIt : http://www.tripit.com/tri
- p/show/id/1234\n \n[Flight] 10/11/2011 US Airways(US) #403 dep PHX 7:4
- 5am MST arr SFO 9:55am PDT\; John Doe\; seat(s) 8B\; conf #DXH9K
- Z\, BXQ9WH \nBooked on http://www.americanexpress-travel.com/\; Reference 
- #: 4127 8626 9715\; http://www.americanexpress-travel.com/\; US:1-800-297-
- 2977\, Outside:210-582-2716 \n \n \n\nTripIt - organize your travel at htt
- p://www.tripit.com
-GEO:37.618889;-122.375
-END:VEVENT
-BEGIN:VEVENT
-DTSTAMP:20120101T215311Z
-SUMMARY:Pick-up Rental Car: Dollar Rent A Car
-TRANSP:TRANSPARENT
-UID:item-e99a90ee1c7e4f5b68a4e551009e5bb6c475940c@tripit.com
-DTSTART:20111011T172500Z
-DTEND:20111011T182500Z
-DESCRIPTION:View and/or edit details in TripIt : http://www.tripit.com/tri
- p/show/id/1234\n \n[Car Rental] Dollar Rent A Car\; San Francisco Inte
- rnational Airport\; primary driver John Doe\; conf #R9508361 \np
- ickup 10/11/2011 10:25am\; dropoff 10/13/2011 6:49pm \nEconomy \nBooked on
-  http://www.americanexpress-travel.com/\; Reference #: 4127 8626 9715\; ht
- tp://www.americanexpress-travel.com/\; US:1-800-297-2977\, Outside:210-582
- -2716 \n \n \n\nTripIt - organize your travel at http://www.tripit.com
-END:VEVENT
-BEGIN:VEVENT
-DTSTAMP:20120101T215311Z
-SUMMARY:Check-in: Embassy Suites San Francisco Airport - South San Francis
- co
-TRANSP:TRANSPARENT
-UID:item-7f3288d418bed063cc82b4512e792fbb5d8ae761@tripit.com
-DTSTART:20111011T185500Z
-DTEND:20111011T195500Z
-LOCATION:250 GATEWAY BLVD\, South San Francisco\, CA\, 94080
-DESCRIPTION:View and/or edit details in TripIt : http://www.tripit.com/tri
- p/show/id/23710889\n \n[Lodging] Embassy Suites San Francisco Airport - So
- uth San Francisco\; primary guest John Doe\; conf #R9508361 \n25
- 0 GATEWAY BLVD\, South San Francisco\, CA\, 94080\; tel 1.650.589.3400 \na
- rrive 10/11/2011\; depart 10/13/2011\; rooms: 1 \nBooked on http://www.ame
- ricanexpress-travel.com/\; Reference #: 4127 8626 9715\; http://www.americ
- anexpress-travel.com/\; US:1-800-297-2977\, Outside:210-582-2716 \n \n \n\
- nTripIt - organize your travel at http://www.tripit.com
-GEO:37.655634;-122.401273
-END:VEVENT
-BEGIN:VEVENT
-DTSTAMP:20120101T215311Z
-SUMMARY:Check-out: Embassy Suites San Francisco Airport - South San Franci
- sco
-TRANSP:TRANSPARENT
-UID:item-5eb4cb5fc25c55b0423921e18336e57f8c34598d@tripit.com
-DTSTART:20111014T011900Z
-DTEND:20111014T021900Z
-LOCATION:250 GATEWAY BLVD\, South San Francisco\, CA\, 94080
-DESCRIPTION:View and/or edit details in TripIt : http://www.tripit.com/tri
- p/show/id/23710889\n \n[Lodging] Embassy Suites San Francisco Airport - So
- uth San Francisco\; primary guest John Doe\; conf #R9508361 \n25
- 0 GATEWAY BLVD\, South San Francisco\, CA\, 94080\; tel 1.650.589.3400 \na
- rrive 10/11/2011\; depart 10/13/2011\; rooms: 1 \nBooked on http://www.ame
- ricanexpress-travel.com/\; Reference #: 4127 8626 9715\; http://www.americ
- anexpress-travel.com/\; US:1-800-297-2977\, Outside:210-582-2716 \n \n \n\
- nTripIt - organize your travel at http://www.tripit.com
-GEO:37.655634;-122.401273
-END:VEVENT
-BEGIN:VEVENT
-DTSTAMP:20120101T215311Z
-SUMMARY:Drop-off Rental Car: Dollar Rent A Car
-TRANSP:TRANSPARENT
-UID:item-11fdbf5d02e84646025716d9f9c7a4158e1fb025@tripit.com
-DTSTART:20111014T014900Z
-DTEND:20111014T024900Z
-DESCRIPTION:View and/or edit details in TripIt : http://www.tripit.com/tri
- p/show/id/23710889\n \n[Car Rental] Dollar Rent A Car\; San Francisco Inte
- rnational Airport\; primary driver John Doe\; conf #R9508361 \np
- ickup 10/11/2011 10:25am\; dropoff 10/13/2011 6:49pm \nEconomy \nBooked on
-  http://www.americanexpress-travel.com/\; Reference #: 4127 8626 9715\; ht
- tp://www.americanexpress-travel.com/\; US:1-800-297-2977\, Outside:210-582
- -2716 \n \n \n\nTripIt - organize your travel at http://www.tripit.com
-END:VEVENT
-BEGIN:VEVENT
-DTSTAMP:20120101T215311Z
-DTEND:20111014T051900Z
-SUMMARY:CO6256 SFO to PHX
-LOCATION:San Francisco (SFO)
-UID:item-cb485a571a01972d6bdc74c2b829905d6e3786bf@tripit.com
-DTSTART:20111014T031900Z
-DESCRIPTION:View and/or edit details in TripIt : http://www.tripit.com/tri
- p/show/id/23710889\n \n[Flight] 10/13/2011 Continental Airlines(CO) #6256 
- dep SFO 8:19pm PDT arr PHX 10:19pm MST\; John Doe\; conf #DXH9KZ
- \, BXQ9WH(Operated by United Airlines flight 6256) \nBooked on http://www.
- americanexpress-travel.com/\; Reference #: 4127 8626 9715\; http://www.ame
- ricanexpress-travel.com/\; US:1-800-297-2977\, Outside:210-582-2716 \n \n 
- \n\nTripIt - organize your travel at http://www.tripit.com
-GEO:33.436111;-112.009444
-END:VEVENT
-BEGIN:VEVENT
-DTSTAMP:20120101T215311Z
-UID:c7b133db1e7be2713a4a63b75dcbad209690cab5@tripit.com
-DTSTART;VALUE=DATE:20111023
-DTEND;VALUE=DATE:20111028
-SUMMARY:Santa Barbara\, CA\, October 2011
-LOCATION:Santa Barbara\, CA
-GEO:34.420831;-119.69819
-TRANSP:TRANSPARENT
-DESCRIPTION:John Doe is in Santa Barbara\, CA from Oct 23 to Oct
-  27\, 2011\nView and/or edit details in TripIt : http://www.tripit.com/tri
- p/show/id/24259445\nTripIt - organize your travel at http://www.tripit.com
- \n
-END:VEVENT
-BEGIN:VEVENT
-DTSTAMP:20120101T215311Z
-DTEND:20111023T191200Z
-SUMMARY:US2719 PHX to SBA
-LOCATION:Phoenix (PHX)
-UID:item-c4375369e9070fcc04df39ed18c4d93087577591@tripit.com
-DTSTART:20111023T173500Z
-DESCRIPTION:View and/or edit details in TripIt : http://www.tripit.com/tri
- p/show/id/24259445\n \n[Flight] 10/23/2011 US Airways(US) #2719 dep PHX 10
- :35am MST arr SBA 12:12pm PDT\; John Doe Ticket #0378717202638\;
-  conf #A44XS5\, PRX98G\, FYYJZ4 \nBooked on http://www.americanexpress-tra
- vel.com/\; Reference #: 7128 8086 8504\; http://www.americanexpress-travel
- .com/\; US:1-800-297-2977\, Outside:210-582-2716\; Total Cost: $699.99 \n 
- \n \n\nTripIt - organize your travel at http://www.tripit.com
-GEO:34.427778;-119.839444
-END:VEVENT
-BEGIN:VEVENT
-DTSTAMP:20120101T215311Z
-TRANSP:TRANSPARENT
-UID:item-962e4f045d12149319d1837ec096bf43770abd6e@tripit.com
-DTSTART:20111025T094000
-DTEND:20111025T104000
-SUMMARY:Directions from Hertz to Sofitel San Francisco Bay
-LOCATION:223 Twin Dolphin Drive\, Redwood City\, CA\, 94065
-DESCRIPTION:View and/or edit details in TripIt : http://www.tripit.com/tri
- p/show/id/24259445\n \n[Directions] 10/25/2011 9:40am - Directions from He
- rtz to Sofitel San Francisco Bay \nfrom: 780 McDonnell Road\, San Francisc
- o\, CA\, 94128 \nto: 223 Twin Dolphin Drive\, Redwood City\, CA\, 94065 \n
- View directions here: http://maps.google.com/maps?output=mobile&saddr=780+
- McDonnell+Road%2C+San+Francisco%2C+CA%2C+94128&daddr=223+Twin+Dolphin+Driv
- e%2C+Redwood+City%2C+CA%2C+94065 \n \n \n\nTripIt - organize your travel a
- t http://www.tripit.com
-GEO:37.5232475;-122.261296
-END:VEVENT
-BEGIN:VEVENT
-DTSTAMP:20120101T215311Z
-DTEND:20111025T162600Z
-SUMMARY:UA5304 SBA to SFO
-LOCATION:Santa Barbara (SBA)
-UID:item-ae300a6934c3820974dba2c9c5b8fae843c67693@tripit.com
-DTSTART:20111025T150900Z
-DESCRIPTION:View and/or edit details in TripIt : http://www.tripit.com/tri
- p/show/id/24259445\n \n[Flight] 10/25/2011 United Airlines(UA) #5304 dep S
- BA 8:09am PDT arr SFO 9:26am PDT\; John Doe Ticket #037871720263
- 8\; seat(s) 11B\; conf #A44XS5\, PRX98G\, FYYJZ4 \nBooked on http://www.am
- ericanexpress-travel.com/\; Reference #: 7128 8086 8504\; http://www.ameri
- canexpress-travel.com/\; US:1-800-297-2977\, Outside:210-582-2716\; Total 
- Cost: $699.99 \n \n \n\nTripIt - organize your travel at http://www.tripit
- .com
-GEO:37.618889;-122.375
-END:VEVENT
-BEGIN:VEVENT
-DTSTAMP:20120101T215311Z
-SUMMARY:Pick-up Rental Car: Hertz
-TRANSP:TRANSPARENT
-UID:item-2a9fd5a57a4cdda4677fc6ce23738e1954fdbe2a@tripit.com
-DTSTART:20111025T163000Z
-DTEND:20111025T173000Z
-LOCATION:780 McDonnell Road\, San Francisco\, CA\, 94128
-DESCRIPTION:View and/or edit details in TripIt : http://www.tripit.com/tri
- p/show/id/24259445\n \n[Car Rental] Hertz\; San Francisco International Ai
- rport\; primary driver John Doe\; conf #F2633064194 \n780 McDonn
- ell Road\, San Francisco\, CA\, 94128 \npickup 10/25/2011 9:30am\; dropoff
-  10/27/2011 7:00pm \nToyota Corolla or similar\; 84.57 USD \nBooked on htt
- p://www.hertz.com/\; Reference #: F2633064194\; http://www.hertz.com/\; 80
- 0-654-3131\; Booking Rate: 84.57 USD\; Total Cost: 333.76 USD \n \n \n\nTr
- ipIt - organize your travel at http://www.tripit.com
-GEO:37.6297569;-122.4000351
-END:VEVENT
-BEGIN:VEVENT
-DTSTAMP:20120101T215311Z
-TRANSP:TRANSPARENT
-UID:item-98dfcb0bcfdcffcce9c58a84947212ed67cadda6@tripit.com
-DTSTART:20111025T163600Z
-DTEND:20111025T173600Z
-SUMMARY:Directions from SFO to Sofitel San Francisco Bay
-LOCATION:223 Twin Dolphin Drive\, Redwood City\, CA\, 94065
-DESCRIPTION:View and/or edit details in TripIt : http://www.tripit.com/tri
- p/show/id/24259445\n \n[Directions] 10/25/2011 9:36am - Directions from SF
- O to Sofitel San Francisco Bay \nfrom: SFO \nto: 223 Twin Dolphin Drive\, 
- Redwood City\, CA\, 94065 \nView directions here: http://maps.google.com/m
- aps?output=mobile&saddr=SFO&daddr=223+Twin+Dolphin+Drive%2C+Redwood+City%2
- C+CA%2C+94065 \n \n \n\nTripIt - organize your travel at http://www.tripit
- .com
-GEO:37.5232475;-122.261296
-END:VEVENT
-BEGIN:VEVENT
-DTSTAMP:20120101T215311Z
-SUMMARY:Check-in: Sofitel San Francisco Bay
-TRANSP:TRANSPARENT
-UID:item-8de3937b336c333faf2d55ad0a41c5ca6cc02393@tripit.com
-DTSTART:20111025T220000Z
-DTEND:20111025T230000Z
-LOCATION:223 Twin Dolphin Drive\, Redwood City\, CA\, 94065
-DESCRIPTION:View and/or edit details in TripIt : http://www.tripit.com/tri
- p/show/id/24259445\n \n[Lodging] Sofitel San Francisco Bay\; primary guest
-  John Doe\; conf #F80-0GMW \n223 Twin Dolphin Drive\, Redwood Ci
- ty\, CA\, 94065\; tel (+1)650/598-9000 \narrive 10/25/2011\; depart 10/27/
- 2011\; rooms: 1 \nBooked on http://www.sofitel.com/\; http://www.sofitel.c
- om/\; Total Cost: 564.00 USD \n \n \n\nTripIt - organize your travel at ht
- tp://www.tripit.com
-GEO:37.5232475;-122.261296
-END:VEVENT
-BEGIN:VEVENT
-DTSTAMP:20120101T215311Z
-SUMMARY:Check-out: Sofitel San Francisco Bay
-TRANSP:TRANSPARENT
-UID:item-f3ade58646964bde101616a6d26ea7784a1a81e8@tripit.com
-DTSTART:20111027T190000Z
-DTEND:20111027T200000Z
-LOCATION:223 Twin Dolphin Drive\, Redwood City\, CA\, 94065
-DESCRIPTION:View and/or edit details in TripIt : http://www.tripit.com/tri
- p/show/id/24259445\n \n[Lodging] Sofitel San Francisco Bay\; primary guest
-  John Doe\; conf #F80-0GMW \n223 Twin Dolphin Drive\, Redwood Ci
- ty\, CA\, 94065\; tel (+1)650/598-9000 \narrive 10/25/2011\; depart 10/27/
- 2011\; rooms: 1 \nBooked on http://www.sofitel.com/\; http://www.sofitel.c
- om/\; Total Cost: 564.00 USD \n \n \n\nTripIt - organize your travel at ht
- tp://www.tripit.com
-GEO:37.5232475;-122.261296
-END:VEVENT
-BEGIN:VEVENT
-DTSTAMP:20120101T215311Z
-SUMMARY:Drop-off Rental Car: Hertz
-TRANSP:TRANSPARENT
-UID:item-50620273fea0614d37775649034d5e1de92ae361@tripit.com
-DTSTART:20111028T020000Z
-DTEND:20111028T030000Z
-LOCATION:780 McDonnell Road\, San Francisco\, CA\, 94128
-DESCRIPTION:View and/or edit details in TripIt : http://www.tripit.com/tri
- p/show/id/24259445\n \n[Car Rental] Hertz\; San Francisco International Ai
- rport\; primary driver John Doe\; conf #F2633064194 \n780 McDonn
- ell Road\, San Francisco\, CA\, 94128 \npickup 10/25/2011 9:30am\; dropoff
-  10/27/2011 7:00pm \nToyota Corolla or similar\; 84.57 USD \nBooked on htt
- p://www.hertz.com/\; Reference #: F2633064194\; http://www.hertz.com/\; 80
- 0-654-3131\; Booking Rate: 84.57 USD\; Total Cost: 333.76 USD \n \n \n\nTr
- ipIt - organize your travel at http://www.tripit.com
-GEO:37.6297569;-122.4000351
-END:VEVENT
-BEGIN:VEVENT
-DTSTAMP:20120101T215311Z
-DTEND:20111028T051900Z
-SUMMARY:CO6256 SFO to PHX
-LOCATION:San Francisco (SFO)
-UID:item-71d327f30d8beeaf7bf50c8fa63ce16005b9b0df@tripit.com
-DTSTART:20111028T031900Z
-DESCRIPTION:View and/or edit details in TripIt : http://www.tripit.com/tri
- p/show/id/24259445\n \n[Flight] 10/27/2011 Continental Airlines(CO) #6256 
- dep SFO 8:19pm PDT arr PHX 10:19pm MST\; John Doe Ticket #037871
- 7202638\; seat(s) 17D\; conf #A44XS5\, PRX98G\, FYYJZ4(Operated by United 
- Airlines flight 6256) \nBooked on http://www.americanexpress-travel.com/\;
-  Reference #: 7128 8086 8504\; http://www.americanexpress-travel.com/\; US
- :1-800-297-2977\, Outside:210-582-2716\; Total Cost: $699.99 \n \n \n\nTri
- pIt - organize your travel at http://www.tripit.com
-GEO:33.436111;-112.009444
-END:VEVENT
-BEGIN:VEVENT
-DTSTAMP:20120101T215311Z
-UID:2d4b446e63a94ade7dab0f0e9546b2d1965f011c@tripit.com
-DTSTART;VALUE=DATE:20111108
-DTEND;VALUE=DATE:20111111
-SUMMARY:Redwood City\, CA\, November 2011
-LOCATION:Redwood City\, CA
-GEO:37.485215;-122.236355
-TRANSP:TRANSPARENT
-DESCRIPTION:John Doe is in Redwood City\, CA from Nov 8 to Nov 1
- 0\, 2011\nView and/or edit details in TripIt : http://www.tripit.com/trip/
- show/id/24913749\nTripIt - organize your travel at http://www.tripit.com\n
-END:VEVENT
-BEGIN:VEVENT
-DTSTAMP:20120101T215311Z
-DTEND:20111108T175700Z
-SUMMARY:US403 PHX to SFO
-LOCATION:Phoenix (PHX)
-UID:item-7de7d829b2f95991de6d01c3d68f24b84770168c@tripit.com
-DTSTART:20111108T154500Z
-DESCRIPTION:View and/or edit details in TripIt : http://www.tripit.com/tri
- p/show/id/24913749\n \n[Flight] 11/8/2011 US Airways(US) #403 dep PHX 8:45
- am MST arr SFO 9:57am PST\; John Doe\; seat(s) 21C\; conf #FJDX0
- J\, I2W8HW \nBooked on http://www.americanexpress-travel.com/\; Reference 
- #: 4129 9623 4732\; http://www.americanexpress-travel.com/\; US:1-800-297-
- 2977\, Outside:210-582-2716 \n \n \n\nTripIt - organize your travel at htt
- p://www.tripit.com
-GEO:37.618889;-122.375
-END:VEVENT
-BEGIN:VEVENT
-DTSTAMP:20120101T215311Z
-SUMMARY:Pick-up Rental Car: Dollar Rent A Car
-TRANSP:TRANSPARENT
-UID:item-1ac6982fefdd79bc5ea849785f415a6291c450b1@tripit.com
-DTSTART:20111108T182700Z
-DTEND:20111108T192700Z
-DESCRIPTION:View and/or edit details in TripIt : http://www.tripit.com/tri
- p/show/id/24913749\n \n[Car Rental] Dollar Rent A Car\; San Francisco Inte
- rnational Airport\; primary driver John Doe\; conf #Q0058133 \np
- ickup 11/8/2011 10:27am\; dropoff 11/10/2011 6:25pm \nEconomy \nBooked on 
- http://www.americanexpress-travel.com/\; Reference #: 4129 9623 4732\; htt
- p://www.americanexpress-travel.com/\; US:1-800-297-2977\, Outside:210-582-
- 2716 \n \n \n\nTripIt - organize your travel at http://www.tripit.com
-END:VEVENT
-BEGIN:VEVENT
-DTSTAMP:20120101T215311Z
-SUMMARY:Check-in: Sofitel San Francisco Bay
-TRANSP:TRANSPARENT
-UID:item-126e584ffbefbec32a15ca503f0bdf8d3f9cc2f4@tripit.com
-DTSTART:20111108T195700Z
-DTEND:20111108T205700Z
-LOCATION:223 TWIN DOLPHIN DR\, Redwood City\, CA\, 94065-1514
-DESCRIPTION:View and/or edit details in TripIt : http://www.tripit.com/tri
- p/show/id/24913749\n \n[Lodging] Sofitel San Francisco Bay\; primary guest
-  John Doe\; conf #Q0058133 \n223 TWIN DOLPHIN DR\, Redwood City\
- , CA\, 94065-1514\; tel 1.650.598.9000 \narrive 11/8/2011\; depart 11/10/2
- 011\; rooms: 1 \nBooked on http://www.americanexpress-travel.com/\; Refere
- nce #: 4129 9623 4732\; http://www.americanexpress-travel.com/\; US:1-800-
- 297-2977\, Outside:210-582-2716 \n \n \n\nTripIt - organize your travel at
-  http://www.tripit.com
-GEO:37.5232475;-122.261296
-END:VEVENT
-BEGIN:VEVENT
-DTSTAMP:20120101T215311Z
-SUMMARY:Check-out: Sofitel San Francisco Bay
-TRANSP:TRANSPARENT
-UID:item-ff48c502022356ccaa862ebb61761a0de08a1ce9@tripit.com
-DTSTART:20111111T015500Z
-DTEND:20111111T025500Z
-LOCATION:223 TWIN DOLPHIN DR\, Redwood City\, CA\, 94065-1514
-DESCRIPTION:View and/or edit details in TripIt : http://www.tripit.com/tri
- p/show/id/24913749\n \n[Lodging] Sofitel San Francisco Bay\; primary guest
-  John Doe\; conf #Q0058133 \n223 TWIN DOLPHIN DR\, Redwood City\
- , CA\, 94065-1514\; tel 1.650.598.9000 \narrive 11/8/2011\; depart 11/10/2
- 011\; rooms: 1 \nBooked on http://www.americanexpress-travel.com/\; Refere
- nce #: 4129 9623 4732\; http://www.americanexpress-travel.com/\; US:1-800-
- 297-2977\, Outside:210-582-2716 \n \n \n\nTripIt - organize your travel at
-  http://www.tripit.com
-GEO:37.5232475;-122.261296
-END:VEVENT
-BEGIN:VEVENT
-DTSTAMP:20120101T215311Z
-SUMMARY:Drop-off Rental Car: Dollar Rent A Car
-TRANSP:TRANSPARENT
-UID:item-c0273c03ddbb68a9b05d5d43a489bc318136ca42@tripit.com
-DTSTART:20111111T022500Z
-DTEND:20111111T032500Z
-DESCRIPTION:View and/or edit details in TripIt : http://www.tripit.com/tri
- p/show/id/24913749\n \n[Car Rental] Dollar Rent A Car\; San Francisco Inte
- rnational Airport\; primary driver John Doe\; conf #Q0058133 \np
- ickup 11/8/2011 10:27am\; dropoff 11/10/2011 6:25pm \nEconomy \nBooked on 
- http://www.americanexpress-travel.com/\; Reference #: 4129 9623 4732\; htt
- p://www.americanexpress-travel.com/\; US:1-800-297-2977\, Outside:210-582-
- 2716 \n \n \n\nTripIt - organize your travel at http://www.tripit.com
-END:VEVENT
-BEGIN:VEVENT
-DTSTAMP:20120101T215311Z
-DTEND:20111111T055400Z
-SUMMARY:CO496 SFO to PHX
-LOCATION:San Francisco (SFO)
-UID:item-3473cf9275326ac393b37859df3b04306b4849aa@tripit.com
-DTSTART:20111111T035500Z
-DESCRIPTION:View and/or edit details in TripIt : http://www.tripit.com/tri
- p/show/id/24913749\n \n[Flight] 11/10/2011 Continental Airlines(CO) #496 d
- ep SFO 7:55pm PST arr PHX 10:54pm MST\; John Doe\; seat(s) 26B\;
-  conf #FJDX0J\, I2W8HW(Operated by United Airlines flight 496) \nBooked on
-  http://www.americanexpress-travel.com/\; Reference #: 4129 9623 4732\; ht
- tp://www.americanexpress-travel.com/\; US:1-800-297-2977\, Outside:210-582
- -2716 \n \n \n\nTripIt - organize your travel at http://www.tripit.com
-GEO:33.436111;-112.009444
-END:VEVENT
-BEGIN:VEVENT
-DTSTAMP:20120101T215311Z
-UID:4ee5ded058432990e3d8808f48ca851e04923b6d@tripit.com
-DTSTART;VALUE=DATE:20111129
-DTEND;VALUE=DATE:20111202
-SUMMARY:Milpitas\, CA\, November 2011
-LOCATION:Milpitas\, CA
-GEO:37.428272;-121.906624
-TRANSP:TRANSPARENT
-DESCRIPTION:John Doe is in Milpitas\, CA from Nov 29 to Dec 1\, 
- 2011\nView and/or edit details in TripIt : http://www.tripit.com/trip/show
- /id/25671681\nTripIt - organize your travel at http://www.tripit.com\n
-END:VEVENT
-BEGIN:VEVENT
-DTSTAMP:20120101T215311Z
-DTEND:20111129T172400Z
-SUMMARY:US282 PHX to SJC
-LOCATION:Phoenix (PHX)
-UID:item-644d5973b50d521d50e475ccf5321605d54bd0d5@tripit.com
-DTSTART:20111129T152500Z
-DESCRIPTION:View and/or edit details in TripIt : http://www.tripit.com/tri
- p/show/id/25671681\n \n[Flight] 11/29/2011 US Airways(US) #282 dep PHX 8:2
- 5am MST arr SJC 9:24am PST\; John Doe\; seat(s) 17C\; conf #DQKD
- GY \nBooked on http://www.americanexpress-travel.com/\; Reference #: 4131 
- 3301 9911\; http://www.americanexpress-travel.com/\; US:1-800-297-2977\, O
- utside:210-582-2716 \n \n \n\nTripIt - organize your travel at http://www.
- tripit.com
-GEO:37.361111;-121.925556
-END:VEVENT
-BEGIN:VEVENT
-DTSTAMP:20120101T215311Z
-SUMMARY:Pick-up Rental Car: Alamo
-TRANSP:TRANSPARENT
-UID:item-10368bbdbc9b6f26f83098500633cc4eb604c751@tripit.com
-DTSTART:20111129T175400Z
-DTEND:20111129T185400Z
-DESCRIPTION:View and/or edit details in TripIt : http://www.tripit.com/tri
- p/show/id/25671681\n \n[Car Rental] Alamo\; San Jose International Airport
- \; primary driver John Doe\; conf #372828149COUNT \npickup 11/29
- /2011 9:54am\; dropoff 12/1/2011 5:45pm \nIntermediate \nBooked on http://
- www.americanexpress-travel.com/\; Reference #: 4131 3301 9911\; http://www
- .americanexpress-travel.com/\; US:1-800-297-2977\, Outside:210-582-2716 \n
-  \n \n\nTripIt - organize your travel at http://www.tripit.com
-END:VEVENT
-BEGIN:VEVENT
-DTSTAMP:20120101T215311Z
-SUMMARY:Check-in: The Beverly Heritage Hotel
-TRANSP:TRANSPARENT
-UID:item-98d8638d3f1c011d03cb8f58b3a14a0f1203339b@tripit.com
-DTSTART:20111129T192400Z
-DTEND:20111129T202400Z
-LOCATION:1820 Barber Lane\, Milpitas\, CA\, 95035
-DESCRIPTION:View and/or edit details in TripIt : http://www.tripit.com/tri
- p/show/id/25671681\n \n[Lodging] The Beverly Heritage Hotel\; primary gues
- t John Doe\; conf #372828149COUNT \n1820 Barber Lane\, Milpitas\
- , CA\, 95035\; tel 1.408.943.9080 \narrive 11/29/2011\; depart 12/1/2011\;
-  rooms: 1 \nBooked on http://www.americanexpress-travel.com/\; Reference #
- : 4131 3301 9911\; http://www.americanexpress-travel.com/\; US:1-800-297-2
- 977\, Outside:210-582-2716 \n \n \n\nTripIt - organize your travel at http
- ://www.tripit.com
-GEO:37.4010467;-121.9116284
-END:VEVENT
-BEGIN:VEVENT
-DTSTAMP:20120101T215311Z
-DTEND:20111201T194400Z
-SUMMARY:US273 SJC to PHX
-LOCATION:San Jose (SJC)
-UID:item-7b9ee9bb4edfe69743e32b33f9be55753956a883@tripit.com
-DTSTART:20111201T175900Z
-DESCRIPTION:View and/or edit details in TripIt : http://www.tripit.com/tri
- p/show/id/25671681\n \n[Flight] 12/1/2011 US Airways(US) #273 dep SJC 9:59
- am PST arr PHX 12:44pm MST\; John Doe Ticket #0378727451156\; co
- nf #EMF71T \nBooked on http://www.americanexpress-travel.com/\; Reference 
- #: 5133 5264 1627\; http://www.americanexpress-travel.com/\; US:1-800-297-
- 2977\, Outside:210-582-2716\; Total Cost: $316.69 \n \n \n\nTripIt - organ
- ize your travel at http://www.tripit.com
-GEO:33.436111;-112.009444
-END:VEVENT
-BEGIN:VEVENT
-DTSTAMP:20120101T215311Z
-SUMMARY:Check-out: The Beverly Heritage Hotel
-TRANSP:TRANSPARENT
-UID:item-f79f203072002b8f06598dcb2be0e36af17b625b@tripit.com
-DTSTART:20111202T011500Z
-DTEND:20111202T021500Z
-LOCATION:1820 Barber Lane\, Milpitas\, CA\, 95035
-DESCRIPTION:View and/or edit details in TripIt : http://www.tripit.com/tri
- p/show/id/25671681\n \n[Lodging] The Beverly Heritage Hotel\; primary gues
- t John Doe\; conf #372828149COUNT \n1820 Barber Lane\, Milpitas\
- , CA\, 95035\; tel 1.408.943.9080 \narrive 11/29/2011\; depart 12/1/2011\;
-  rooms: 1 \nBooked on http://www.americanexpress-travel.com/\; Reference #
- : 4131 3301 9911\; http://www.americanexpress-travel.com/\; US:1-800-297-2
- 977\, Outside:210-582-2716 \n \n \n\nTripIt - organize your travel at http
- ://www.tripit.com
-GEO:37.4010467;-121.9116284
-END:VEVENT
-BEGIN:VEVENT
-DTSTAMP:20120101T215311Z
-SUMMARY:Drop-off Rental Car: Alamo
-TRANSP:TRANSPARENT
-UID:item-69f526ad49fa8ca0a74486f4fc77cc3f9d23a72f@tripit.com
-DTSTART:20111202T014500Z
-DTEND:20111202T024500Z
-DESCRIPTION:View and/or edit details in TripIt : http://www.tripit.com/tri
- p/show/id/25671681\n \n[Car Rental] Alamo\; San Jose International Airport
- \; primary driver John Doe\; conf #372828149COUNT \npickup 11/29
- /2011 9:54am\; dropoff 12/1/2011 5:45pm \nIntermediate \nBooked on http://
- www.americanexpress-travel.com/\; Reference #: 4131 3301 9911\; http://www
- .americanexpress-travel.com/\; US:1-800-297-2977\, Outside:210-582-2716 \n
-  \n \n\nTripIt - organize your travel at http://www.tripit.com
-END:VEVENT
-BEGIN:VEVENT
-DTSTAMP:20120101T215311Z
-DTEND:20111202T045900Z
-SUMMARY:US288 SJC to PHX
-LOCATION:San Jose (SJC)
-UID:item-dab68a87c8dd49064ab0ba1dec5ba75ba46ff1d3@tripit.com
-DTSTART:20111202T031500Z
-DESCRIPTION:View and/or edit details in TripIt : http://www.tripit.com/tri
- p/show/id/25671681\n \n[Flight] 12/1/2011 US Airways(US) #288 dep SJC 7:15
- pm PST arr PHX 9:59pm MST\; John Doe\; seat(s) 13C\; conf #DQKDG
- Y \nBooked on http://www.americanexpress-travel.com/\; Reference #: 4131 3
- 301 9911\; http://www.americanexpress-travel.com/\; US:1-800-297-2977\, Ou
- tside:210-582-2716 \n \n \n\nTripIt - organize your travel at http://www.t
- ripit.com
-GEO:33.436111;-112.009444
-END:VEVENT
-BEGIN:VEVENT
-DTSTAMP:20120101T215311Z
-UID:67d48ddde166a2e9bbac2cf7d93fe493b0860008@tripit.com
-DTSTART;VALUE=DATE:20111213
-DTEND;VALUE=DATE:20111216
-SUMMARY:San Jose\, CA\, December 2011
-LOCATION:San Jose\, CA
-GEO:37.339386;-121.894955
-TRANSP:TRANSPARENT
-DESCRIPTION:John Doe is in San Jose\, CA from Dec 13 to Dec 15\,
-  2011\nView and/or edit details in TripIt : http://www.tripit.com/trip/sho
- w/id/27037117\nTripIt - organize your travel at http://www.tripit.com\n
-END:VEVENT
-BEGIN:VEVENT
-DTSTAMP:20120101T215311Z
-DTEND:20111213T172400Z
-SUMMARY:US282 PHX to SJC
-LOCATION:Phoenix (PHX)
-UID:item-2b1b9021be548a87dd335f190b60ab78c33b619d@tripit.com
-DTSTART:20111213T152500Z
-DESCRIPTION:View and/or edit details in TripIt : http://www.tripit.com/tri
- p/show/id/27037117\n \n[Flight] 12/13/2011 US Airways(US) #282 dep PHX 8:2
- 5am MST arr SJC 9:24am PST\; John Doe Ticket #0378728465928\; se
- at(s) 15C\; conf #GGNV29 \nBooked on http://www.americanexpress-travel.com
- /\; Reference #: 3134 0525 5102\; http://www.americanexpress-travel.com/\;
-  US:1-800-297-2977\, Outside:210-582-2716\; Total Cost: $406.39 \n \n \n\n
- TripIt - organize your travel at http://www.tripit.com
-GEO:37.361111;-121.925556
-END:VEVENT
-BEGIN:VEVENT
-DTSTAMP:20120101T215311Z
-SUMMARY:Pick-up Rental Car: Advantage
-TRANSP:TRANSPARENT
-UID:item-619d345bb08aaef68e8767b672277243697f5bff@tripit.com
-DTSTART:20111213T180000Z
-DTEND:20111213T190000Z
-DESCRIPTION:View and/or edit details in TripIt : http://www.tripit.com/tri
- p/show/id/27037117\n \n[Car Rental] Advantage\; San Jose International Air
- port\; primary driver John Doe\; conf #F31539020E7 \npickup 12/1
- 3/2011 10:00am\; dropoff 12/15/2011 7:00pm \nStandard Convertible \nRefere
- nce #: 3134 0526 3890 \n \n \n\nTripIt - organize your travel at http://ww
- w.tripit.com
-END:VEVENT
-BEGIN:VEVENT
-DTSTAMP:20120101T215311Z
-SUMMARY:Check-in: Crestview Hotel:
-TRANSP:TRANSPARENT
-UID:item-fbe6c08e7523c82fac69b40ad1d0899f3d8d5982@tripit.com
-DTSTART:20111213T192400Z
-DTEND:20111213T202400Z
-DESCRIPTION:View and/or edit details in TripIt : http://www.tripit.com/tri
- p/show/id/27037117\n \n[Lodging] Crestview Hotel:\; conf #CR31342159 \ntel
-  650-966-8848 \narrive 12/13/2011\; depart 12/15/2011 \nBooking Rate: 153.
- 30 \n \n \n\nTripIt - organize your travel at http://www.tripit.com
-END:VEVENT
-BEGIN:VEVENT
-DTSTAMP:20120101T215311Z
-SUMMARY:Check-out: Crestview Hotel:
-TRANSP:TRANSPARENT
-UID:item-7ed8b84628e650a6b37161c7825bac9e72add49f@tripit.com
-DTSTART:20111216T011500Z
-DTEND:20111216T021500Z
-DESCRIPTION:View and/or edit details in TripIt : http://www.tripit.com/tri
- p/show/id/27037117\n \n[Lodging] Crestview Hotel:\; conf #CR31342159 \ntel
-  650-966-8848 \narrive 12/13/2011\; depart 12/15/2011 \nBooking Rate: 153.
- 30 \n \n \n\nTripIt - organize your travel at http://www.tripit.com
-END:VEVENT
-BEGIN:VEVENT
-DTSTAMP:20120101T215311Z
-SUMMARY:Drop-off Rental Car: Advantage
-TRANSP:TRANSPARENT
-UID:item-623b54ebe07ffd48845f1a120a86940ce79c698b@tripit.com
-DTSTART:20111216T030000Z
-DTEND:20111216T040000Z
-DESCRIPTION:View and/or edit details in TripIt : http://www.tripit.com/tri
- p/show/id/27037117\n \n[Car Rental] Advantage\; San Jose International Air
- port\; primary driver John Doe\; conf #F31539020E7 \npickup 12/1
- 3/2011 10:00am\; dropoff 12/15/2011 7:00pm \nStandard Convertible \nRefere
- nce #: 3134 0526 3890 \n \n \n\nTripIt - organize your travel at http://ww
- w.tripit.com
-END:VEVENT
-BEGIN:VEVENT
-DTSTAMP:20120101T215311Z
-DTEND:20111216T045900Z
-SUMMARY:US288 SJC to PHX
-LOCATION:San Jose (SJC)
-UID:item-52481e672972d2e88d5eaa5cf49bb801562c6014@tripit.com
-DTSTART:20111216T031500Z
-DESCRIPTION:View and/or edit details in TripIt : http://www.tripit.com/tri
- p/show/id/27037117\n \n[Flight] 12/15/2011 US Airways(US) #288 dep SJC 7:1
- 5pm PST arr PHX 9:59pm MST\; John Doe Ticket #0378728465928\; se
- at(s) 7B\; conf #GGNV29 \nBooked on http://www.americanexpress-travel.com/
- \; Reference #: 3134 0525 5102\; http://www.americanexpress-travel.com/\; 
- US:1-800-297-2977\, Outside:210-582-2716\; Total Cost: $406.39 \n \n \n\nT
- ripIt - organize your travel at http://www.tripit.com
-GEO:33.436111;-112.009444
-END:VEVENT
-BEGIN:VEVENT
-DTSTAMP:20120101T215311Z
-UID:7299ff29daed7d5c3e2ed4acc74deec5b7942bd5@tripit.com
-DTSTART;VALUE=DATE:20120103
-DTEND;VALUE=DATE:20120106
-SUMMARY:San Francisco\, CA\, January 2012
-LOCATION:San Francisco\, CA
-GEO:37.774929;-122.419415
-TRANSP:TRANSPARENT
-DESCRIPTION:John Doe is in San Francisco\, CA from Jan 3 to Jan 
- 5\, 2012\nView and/or edit details in TripIt : http://www.tripit.com/trip/
- show/id/27863159\nTripIt - organize your travel at http://www.tripit.com\n
-END:VEVENT
-BEGIN:VEVENT
-DTSTAMP:20120101T215311Z
-DTEND:20120103T175700Z
-SUMMARY:US403 PHX to SFO
-LOCATION:Phoenix (PHX)
-UID:item-f099e76114bf43ef3b122432579d8b40995412a7@tripit.com
-DTSTART:20120103T154500Z
-DESCRIPTION:View and/or edit details in TripIt : http://www.tripit.com/tri
- p/show/id/27863159\n \n[Flight] 1/3/2012 US Airways(US) #403 dep PHX 8:45a
- m MST arr SFO 9:57am PST\; John Doe Ticket #0378731791515\; conf
-  #FH9B72\, L4F9M5 \nBooked on http://www.americanexpress-travel.com/\; Ref
- erence #: 6135 7391 6119\; http://www.americanexpress-travel.com/\; US:1-8
- 00-297-2977\, Outside:210-582-2716\; Total Cost: $668.39 \n \n \n\nTripIt 
- - organize your travel at http://www.tripit.com
-GEO:37.618889;-122.375
-END:VEVENT
-BEGIN:VEVENT
-DTSTAMP:20120101T215311Z
-SUMMARY:Pick-up Rental Car: Alamo
-TRANSP:TRANSPARENT
-UID:item-fae4b4b07b66fc87df125238e0aaf645106cf4f3@tripit.com
-DTSTART:20120103T180000Z
-DTEND:20120103T190000Z
-DESCRIPTION:View and/or edit details in TripIt : http://www.tripit.com/tri
- p/show/id/27863159\n \n[Car Rental] Alamo\; San Francisco International Ai
- rport\; primary driver John Doe\; conf #373525981COUNT \npickup 
- 1/3/2012 10:00am\; dropoff 1/5/2012 6:00pm \nCompact \nReference #: 6135 7
- 391 6898 \n \n \n\nTripIt - organize your travel at http://www.tripit.com
-END:VEVENT
-BEGIN:VEVENT
-DTSTAMP:20120101T215311Z
-SUMMARY:Check-in: Grand Hotel Sunnyvale
-TRANSP:TRANSPARENT
-UID:item-d89a856eb9da9dfdcb4da46f42e49af3a838fcbb@tripit.com
-DTSTART:20120103T195700Z
-DTEND:20120103T205700Z
-DESCRIPTION:View and/or edit details in TripIt : http://www.tripit.com/tri
- p/show/id/27863159\n \n[Lodging] Grand Hotel Sunnyvale\; conf #22084SY0361
- 18 \ntel 1-408-7208500 \narrive 1/3/2012\; depart 1/5/2012 \nBooking Rate:
-  USD 169.00 \nPolicies: Guarantee to valid form of payment is required at 
- time of booking\; Cancel 1 day prior to arrival date to avoid penalty of 1
-  Nights Room Charge. Change fee may apply for early departures and changes
-  made to confirmed reservations.\; \n \n \n\nTripIt - organize your travel
-  at http://www.tripit.com
-END:VEVENT
-BEGIN:VEVENT
-DTSTAMP:20120101T215311Z
-SUMMARY:Check-out: Grand Hotel Sunnyvale
-TRANSP:TRANSPARENT
-UID:item-6edc82f6411fd0b66f2f7f6baafa41623a8623a9@tripit.com
-DTSTART:20120106T010900Z
-DTEND:20120106T020900Z
-DESCRIPTION:View and/or edit details in TripIt : http://www.tripit.com/tri
- p/show/id/27863159\n \n[Lodging] Grand Hotel Sunnyvale\; conf #22084SY0361
- 18 \ntel 1-408-7208500 \narrive 1/3/2012\; depart 1/5/2012 \nBooking Rate:
-  USD 169.00 \nPolicies: Guarantee to valid form of payment is required at 
- time of booking\; Cancel 1 day prior to arrival date to avoid penalty of 1
-  Nights Room Charge. Change fee may apply for early departures and changes
-  made to confirmed reservations.\; \n \n \n\nTripIt - organize your travel
-  at http://www.tripit.com
-END:VEVENT
-BEGIN:VEVENT
-DTSTAMP:20120101T215311Z
-SUMMARY:Drop-off Rental Car: Alamo
-TRANSP:TRANSPARENT
-UID:item-58a31b96066ffd09b800af49de59a84f7b7a3a06@tripit.com
-DTSTART:20120106T020000Z
-DTEND:20120106T030000Z
-DESCRIPTION:View and/or edit details in TripIt : http://www.tripit.com/tri
- p/show/id/27863159\n \n[Car Rental] Alamo\; San Francisco International Ai
- rport\; primary driver John Doe\; conf #373525981COUNT \npickup 
- 1/3/2012 10:00am\; dropoff 1/5/2012 6:00pm \nCompact \nReference #: 6135 7
- 391 6898 \n \n \n\nTripIt - organize your travel at http://www.tripit.com
-END:VEVENT
-BEGIN:VEVENT
-DTSTAMP:20120101T215311Z
-DTEND:20120106T050500Z
-SUMMARY:CO496 SFO to PHX
-LOCATION:San Francisco (SFO)
-UID:item-7884351ce42d503b90ccc48c33c7c30bd4f44767@tripit.com
-DTSTART:20120106T030900Z
-DESCRIPTION:View and/or edit details in TripIt : http://www.tripit.com/tri
- p/show/id/27863159\n \n[Flight] 1/5/2012 Continental Airlines(CO) #496 dep
-  SFO 7:09pm PST arr PHX 10:05pm MST\; John Doe Ticket #037873179
- 1515\; conf #FH9B72\, L4F9M5(Operated by United Airlines flight 496) \nBoo
- ked on http://www.americanexpress-travel.com/\; Reference #: 6135 7391 611
- 9\; http://www.americanexpress-travel.com/\; US:1-800-297-2977\, Outside:2
- 10-582-2716\; Total Cost: $668.39 \n \n \n\nTripIt - organize your travel 
- at http://www.tripit.com
-GEO:33.436111;-112.009444
-END:VEVENT
-END:VCALENDAR
diff --git a/modules/default/calendar/vendor/ical.js/test/test5.ics b/modules/default/calendar/vendor/ical.js/test/test5.ics
deleted file mode 100644
index c51f25ee..00000000
--- a/modules/default/calendar/vendor/ical.js/test/test5.ics
+++ /dev/null
@@ -1,41 +0,0 @@
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//Meetup//RemoteApi//EN
-CALSCALE:GREGORIAN
-METHOD:PUBLISH
-X-ORIGINAL-URL:http://www.meetup.com/events/ical/8333638/dfdba2e469216075
- 3404f737feace78d526ff0ce/going
-X-WR-CALNAME:My Meetups
-X-MS-OLK-FORCEINSPECTOROPEN:TRUE
-BEGIN:VTIMEZONE
-TZID:America/Phoenix
-TZURL:http://tzurl.org/zoneinfo-outlook/America/Phoenix
-X-LIC-LOCATION:America/Phoenix
-BEGIN:STANDARD
-TZOFFSETFROM:-0700
-TZOFFSETTO:-0700
-TZNAME:MST
-DTSTART:19700101T000000
-END:STANDARD
-END:VTIMEZONE
-BEGIN:VEVENT
-DTSTAMP:20111106T155927Z
-DTSTART;TZID=America/Phoenix:20111109T190000
-DTEND;TZID=America/Phoenix:20111109T210000
-STATUS:CONFIRMED
-SUMMARY:Phoenix Drupal User Group Monthly Meetup
-DESCRIPTION:Phoenix Drupal User Group\nWednesday\, November 9 at 7:00 PM\
- n\nCustomizing node display with template pages in Drupal 6\n\n Jon Shee
- han and Matthew Berry of the Office of Knowledge Enterprise Development 
- (OKED) Knowledge...\n\nDetails: http://www.meetup.com/Phoenix-Drupal-Use
- r-Group/events/33627272/
-CLASS:PUBLIC
-CREATED:20100630T083023Z
-GEO:33.56;-111.90
-LOCATION:Open Source Project Tempe (1415 E University Dr. #103A\, Tempe\,
-  AZ 85281)
-URL:http://www.meetup.com/Phoenix-Drupal-User-Group/events/33627272/
-LAST-MODIFIED:20111102T213309Z
-UID:event_nsmxnyppbfc@meetup.com
-END:VEVENT
-END:VCALENDAR
\ No newline at end of file
diff --git a/modules/default/calendar/vendor/ical.js/test/test6.ics b/modules/default/calendar/vendor/ical.js/test/test6.ics
deleted file mode 100644
index 3762d02b..00000000
--- a/modules/default/calendar/vendor/ical.js/test/test6.ics
+++ /dev/null
@@ -1,1170 +0,0 @@
-BEGIN:VCALENDAR
-BEGIN:VEVENT
-CATEGORIES:Event
-DTEND;VALUE=DATE:20110804T120000
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110804T120000
-LOCATION:All Areas
-SUMMARY:foobar Summer 2011 starts!
-URL:F
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Event
-DTEND;VALUE=DATE:20110804T120000
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110804T120000
-LOCATION:Main entrance
-SUMMARY:Main entrance opened
-URL:http://www.foobar.org/summer11/come-to-party/entry-setup
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Event
-DTEND;VALUE=DATE:20110804T120000
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110804T120000
-LOCATION:Loading entrances #1 and #2
-SUMMARY:Loading doors are opened
-URL:http://www.foobar.org/summer11/come-to-party/entry-setup
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Event
-DTEND;VALUE=DATE:20110804T120000
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110804T120000
-LOCATION:foobarTV
-SUMMARY:foobarTV broadcast starts
-RRULE:FREQ=WEEKLY;BYDAY=MO,FR;INTERVAL=5;UNTIL=20130130T230000Z
-URL:http://www.foobartv.net
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Event
-DTEND;VALUE=DATE:20110804T180000
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110804T180000
-LOCATION:Loading entrances #1 and #2
-SUMMARY:Loading doors close
-URL:http://www.foobar.org/summer11/come-to-party/entry-setup
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Event
-DTEND;VALUE=DATE:20110805T120000
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110805T120000
-LOCATION:Loading entrance #1
-SUMMARY:Loading doors are opened
-URL:http://www.foobar.org/summer11/come-to-party/entry-setup
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Event
-DTEND;VALUE=DATE:20110805T180000
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110805T180000
-LOCATION:Loading entrance #1
-SUMMARY:Loading doors close
-URL:http://www.foobar.org/summer11/come-to-party/entry-setup
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Compo_deadline
-DTEND;VALUE=DATE:20110804T220000
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110804T220000
-LOCATION:PMS
-SUMMARY:Oldskool demo\, individual and 4k intro compo deadline
-URL:http://www.foobar.org/summer11/compos/how-to/submit-entry
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Compo_deadline
-DTEND;VALUE=DATE:20110805T200000
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110805T200000
-LOCATION:PMS
-SUMMARY:Group compo deadline
-URL:http://www.foobar.org/summer11/compos/how-to/submit-entry
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Compo
-DTEND;VALUE=DATE:20110804T180000
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110804T120000
-LOCATION:PMS
-SUMMARY:Sign-up for street basketball & Guitar Hero solo guitar
-URL:http://www.foobar.org/summer11/compos/gaming-sports
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Compo
-DTEND;VALUE=DATE:20110805T110000
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110804T120000
-LOCATION:PMS
-SUMMARY:Sign-up for sports and machine dance compos
-URL:http://www.foobar.org/summer11/compos/gaming-sports
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Compo
-DTEND;VALUE=DATE:20110806T160000
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110804T120000
-LOCATION:PMS
-SUMMARY:Sign-up for poker tournament
-URL:http://www.foobar.org/summer11/compos/sponsored-unofficial/poker
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Compo_show
-DTEND;VALUE=DATE:20110804T220000
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110804T200000
-LOCATION:Outside main entrance
-SUMMARY:Street basketball
-URL:http://www.foobar.org/summer11/compos/sports-competitions/team/#stre
- etbasketball
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Compo
-DTEND;VALUE=DATE:20110805T124500
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110805T123000
-LOCATION:Infodesk
-SUMMARY:Sport compos - gather up at the infodesk
-URL:http://www.foobar.org/summer11/compos/gaming-sports
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Compo_show
-DTEND;VALUE=DATE:20110805T140000
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110805T130000
-LOCATION:Grass fields by Messukeskus
-SUMMARY:Disk throwing
-URL:http://www.foobar.org/summer11/compos/sports-competitions/individual
- /#disk
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Compo_show
-DTEND;VALUE=DATE:20110805T140000
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110805T130000
-LOCATION:Grass fields by Messukeskus
-SUMMARY:CD throwing
-URL:http://www.foobar.org/summer11/compos/sports-competitions/individual
- /#cd
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Compo_show
-DTEND;VALUE=DATE:20110805T160000
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110805T140000
-LOCATION:Grass fields by Messukeskus
-SUMMARY:ASUS soccer tournament
-URL:http://www.foobar.org/summer11/compos/sports-competitions/team/#socc
- er
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Compo
-DTEND;VALUE=DATE:20110805T000000
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110804T180000
-LOCATION:Guitar Hero
-SUMMARY:Guitar Hero: Guitar tournament - qualifying round #1
-URL:http://www.foobar.org/summer11/compos/gaming-sports/individual
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Compo
-DTEND;VALUE=DATE:20110805T180000
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110805T120000
-LOCATION:Guitar Hero
-SUMMARY:Guitar Hero: Guitar tournament - qualifying round #2
-URL:http://www.foobar.org/summer11/compos/gaming-sports/individual
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Compo
-DTEND;VALUE=DATE:20110806T180000
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110806T120000
-LOCATION:Guitar Hero
-SUMMARY:Guitar Hero: Guitar tournament - semifinal
-URL:http://www.foobar.org/summer11/compos/gaming-sports/individual
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Compo_show
-DTEND;VALUE=DATE:20110807T130000
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110807T120000
-LOCATION:Stage
-SUMMARY:Guitar Hero: Guitar Tournament final
-URL:http://www.foobar.org/summer11/compos/gaming-sports/individual
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Compo
-DTEND;VALUE=DATE:20110805T210000
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110805T160000
-LOCATION:Third floor
-SUMMARY:Machine Dance tournament
-URL:http://www.foobar.org/summer11/compos/gaming-sports/individual/#danc
- e
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Compo_show
-DTEND;VALUE=DATE:20110807T120000
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110807T110000
-LOCATION:Stage
-SUMMARY:Machine Dance tournament finals
-URL:http://www.foobar.org/summer11/compos/gaming-sports/individual/#danc
- e
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Compo
-DTEND;VALUE=DATE:20110807T000000
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110806T200000
-LOCATION:Seminar area
-SUMMARY:Poker tournament
-URL:http://www.foobar.org/summer11/compos/sponsored-unofficial/poker
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Compo
-DTEND;VALUE=DATE:20110804T180000
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110804T150000
-LOCATION:Infodesk
-SUMMARY:GameDev compo recording - come to Infodesk
-URL:http://www.foobar.org/summer11/compos/realtime/gamedev
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Compo_showing
-DTEND;VALUE=DATE:20110805T010000
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110805T000000
-LOCATION:Big screen
-SUMMARY:GameDev compo
-URL:http://www.foobar.org/summer11/compos/realtime/gamedev
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Compo
-DTEND;VALUE=DATE:20110804T190000
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110804T190000
-LOCATION:Website
-SUMMARY:Fast music - sample set released
-URL:http://www.foobar.org/summer11/compos/sound-vision/fast#music
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Compo_deadline
-DTEND;VALUE=DATE:20110804T203000
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110804T203000
-LOCATION:PMS
-SUMMARY:Fast music - deadline
-URL:http://www.foobar.org/summer11/compos/sound-vision/fast#music
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Compo_jury
-DTEND;VALUE=DATE:20110805T003000
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110804T223000
-LOCATION:Infodesk
-SUMMARY:Fast music - jury - come to Infodesk
-URL:http://www.foobar.org/summer11/compos/sound-vision/fast#music
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Compo_show
-DTEND;VALUE=DATE:20110805T161500
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110805T153000
-LOCATION:Big screen
-SUMMARY:Fast music compo
-URL:http://www.foobar.org/summer11/compos/sound-vision/fast#music
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Compo
-DTEND;VALUE=DATE:20110804T203000
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110804T203000
-LOCATION:Website
-SUMMARY:Fast graphics - objectives released
-URL:http://www.foobar.org/summer11/compos/sound-vision/fast#graphics
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Compo_deadline
-DTEND;VALUE=DATE:20110804T220000
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110804T220000
-LOCATION:PMS
-SUMMARY:Fast graphics - deadline
-URL:http://www.foobar.org/summer11/compos/sound-vision/fast#graphics
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Compo_jury
-DTEND;VALUE=DATE:20110805T001500
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110804T233000
-LOCATION:Infodesk
-SUMMARY:Fast graphics - jury - come to Infodesk
-URL:http://www.foobar.org/summer11/compos/sound-vision/fast#graphics
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Compo_show
-DTEND;VALUE=DATE:20110805T164500
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110805T163000
-LOCATION:Big screen
-SUMMARY:Fast graphics compo
-URL:http://www.foobar.org/summer11/compos/sound-vision/fast#graphics
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Compo_jury
-DTEND;VALUE=DATE:20110805T021500
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110804T221500
-LOCATION:Infodesk
-SUMMARY:Extreme music and Oldskool demo - jury - come to Infodesk
-URL:http://www.foobar.org/summer11/compos/realtime/oldskool
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Compo
-DTEND;VALUE=DATE:20110805T150000
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110805T110000
-LOCATION:Infodesk
-SUMMARY:Extreme music and Oldskool demo - compo entry recording\, come to 
- Infodesk
-URL:http://www.foobar.org/summer11/compos/realtime/oldskool
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Compo_show
-DTEND;VALUE=DATE:20110806T144500
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110806T140000
-LOCATION:Big screen
-SUMMARY:Extreme music compo
-URL:http://www.foobar.org/summer11/compos/realtime/extreme#music
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Compo_show
-DTEND;VALUE=DATE:20110806T171500
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110806T163000
-LOCATION:Big screen
-SUMMARY:Oldskool demo compo
-URL:http://www.foobar.org/summer11/compos/realtime/oldskool
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Compo_jury
-DTEND;VALUE=DATE:20110805T180000
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110805T130000
-LOCATION:Infodesk
-SUMMARY:Music compo - jury - come to Infodesk
-URL:http://www.foobar.org/summer11/compos/sound-vision/music#freestyle
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Compo_show
-DTEND;VALUE=DATE:20110806T161500
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110806T153000
-LOCATION:Big screen
-SUMMARY:Music compo
-URL:http://www.foobar.org/summer11/compos/sound-vision/music#freestyle
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Compo_jury
-DTEND;VALUE=DATE:20110805T163000
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110805T140000
-LOCATION:Infodesk
-SUMMARY:Graphics compo - jury - come to Infodesk
-URL:http://www.foobar.org/summer11/compos/sound-vision/graphics#freestyl
- e
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Compo_show
-DTEND;VALUE=DATE:20110806T151500
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110806T150000
-LOCATION:Big screen
-SUMMARY:Graphics compo
-URL:http://www.foobar.org/summer11/compos/sound-vision/graphics#freestyl
- e
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Compo
-DTEND;VALUE=DATE:20110805T110000
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110805T090000
-LOCATION:Infodesk
-SUMMARY:Real wild demo - recording assistance - come to Infodesk
-URL:http://www.foobar.org/summer11/compos/realtime/demo#mobile
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Compo_jury
-DTEND;VALUE=DATE:20110805T223000
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110805T203000
-LOCATION:Infodesk
-SUMMARY:Real wild demo - jury - come to Infodesk
-URL:http://www.foobar.org/summer11/compos/realtime/demo#mobile
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Compo_show
-DTEND;VALUE=DATE:20110806T181500
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110806T173000
-LOCATION:Big screen
-SUMMARY:Real wild demo compo
-URL:http://www.foobar.org/summer11/compos/realtime/demo#mobile
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Compo_jury
-DTEND;VALUE=DATE:20110805T013000
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110804T220000
-LOCATION:Infodesk
-SUMMARY:Short film & Real Wild demo - format conversions help - come to In
- fodesk
-URL:http://www.foobar.org/summer11/compos/sound-vision/short-film
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Compo_jury
-DTEND;VALUE=DATE:20110806T123000
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110806T100000
-LOCATION:Infodesk
-SUMMARY:Short film - jury - come to Infodesk
-URL:http://www.foobar.org/summer11/compos/sound-vision/short-film
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Compo_show
-DTEND;VALUE=DATE:20110806T204500
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110806T194500
-LOCATION:Big screen
-SUMMARY:Short film compo
-URL:http://www.foobar.org/summer11/compos/sound-vision/short-film
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Compo_jury
-DTEND;VALUE=DATE:20110805T180000
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110805T160000
-LOCATION:Infodesk
-SUMMARY:4k intro - jury - come to Infodesk
-URL:http://www.foobar.org/summer11/compos/realtime/demo#64k
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Compo_show
-DTEND;VALUE=DATE:20110806T214500
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110806T210000
-LOCATION:Big screen
-SUMMARY:4k intro compo
-URL:http://www.foobar.org/summer11/compos/realtime/demo#64k
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Compo_jury
-DTEND;VALUE=DATE:20110806T010000
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110805T230000
-LOCATION:Infodesk
-SUMMARY:64k intro - jury - come to Infodesk
-URL:http://www.foobar.org/summer11/compos/realtime/demo#64k
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Compo_show
-DTEND;VALUE=DATE:20110806T224500
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110806T220000
-LOCATION:Big screen
-SUMMARY:64k intro compo
-URL:http://www.foobar.org/summer11/compos/realtime/demo#64k
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Compo_jury
-DTEND;VALUE=DATE:20110806T160000
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110806T130000
-LOCATION:Infodesk
-SUMMARY:Demo - jury
-URL:http://www.foobar.org/summer11/compos/realtime/demo#demo
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Compo_show
-DTEND;VALUE=DATE:20110806T230000
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110806T220000
-LOCATION:Big screen
-SUMMARY:Demo compo
-URL:http://www.foobar.org/summer11/compos/realtime/demo#demo
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Compo_game
-DTEND;VALUE=DATE:20110804T160000
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110804T120000
-LOCATION:Powerplay
-SUMMARY:ASUS ROG Starcraft 2 - Brackets D\, E\, F
-URL:http://www.peliliiga.fi
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Compo_game
-DTEND;VALUE=DATE:20110804T210000
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110804T170000
-LOCATION:Powerplay
-SUMMARY:ASUS ROG Starcraft 2 - Brackets C\, G\, H
-URL:http://www.peliliiga.fi
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Compo_game
-DTEND;VALUE=DATE:20110805T020000
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110804T220000
-LOCATION:Powerplay
-SUMMARY:ASUS ROG Starcraft 2 - Brackets A\, B
-URL:http://www.peliliiga.fi
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Compo_game
-DTEND;VALUE=DATE:20110805T140000
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110805T110000
-LOCATION:Powerplay
-SUMMARY:ASUS ROG Starcraft 2 - Single elimination 16 players
-URL:http://www.peliliiga.fi
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Compo_game
-DTEND;VALUE=DATE:20110805T153000
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110805T140000
-LOCATION:Powerplay
-SUMMARY:ASUS ROG Starcraft 2 - Single elimination 6 players
-URL:http://www.peliliiga.fi
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Compo_game
-DTEND;VALUE=DATE:20110805T193000
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110805T180000
-LOCATION:Powerplay
-SUMMARY:ASUS ROG Starcraft 2 - Semifinal 1
-URL:http://www.peliliiga.fi
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Compo_game
-DTEND;VALUE=DATE:20110805T210000
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110805T193000
-LOCATION:Powerplay
-SUMMARY:ASUS ROG Starcraft 2 - Semifinal 2
-URL:http://www.peliliiga.fi
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Compo_game
-DTEND;VALUE=DATE:20110805T223000
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110805T210000
-LOCATION:Powerplay
-SUMMARY:ASUS ROG Starcraft 2 - Bronze match
-URL:http://www.peliliiga.fi
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Compo_game
-DTEND;VALUE=DATE:20110806T003000
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110805T230000
-LOCATION:Stage
-SUMMARY:ASUS ROG Starcraft 2 - Final
-URL:http://www.peliliiga.fi
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Compo_game
-DTEND;VALUE=DATE:20110806T160000
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110806T130000
-LOCATION:Game hall
-SUMMARY:WCG.fi Starcraft 2 – Brackets
-URL:http://www.peliliiga.fi
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Compo_game
-DTEND;VALUE=DATE:20110806T193000
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110806T173000
-LOCATION:Game hall
-SUMMARY:WCG.fi Starcraft 2 - Single elimination 8 players
-URL:http://www.peliliiga.fi
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Compo_game
-DTEND;VALUE=DATE:20110806T210000
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110806T200000
-LOCATION:Game hall
-SUMMARY:WCG.fi Starcraft 2 - Semifinal 1
-URL:http://www.peliliiga.fi
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Compo_game
-DTEND;VALUE=DATE:20110806T220000
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110806T210000
-LOCATION:Game hall
-SUMMARY:WCG.fi Starcraft 2 - Semifinal 2
-URL:http://www.peliliiga.fi
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Compo_game
-DTEND;VALUE=DATE:20110807T003000
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110806T223000
-LOCATION:Game hall
-SUMMARY:WCG.fi Starcraft 2 - Bronze match
-URL:http://www.peliliiga.fi
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Compo_game
-DTEND;VALUE=DATE:20110807T023000
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110807T000000
-LOCATION:Stage
-SUMMARY:WCG.fi Starcraft 2 - Final
-URL:http://www.peliliiga.fi
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Compo_game
-DTEND;VALUE=DATE:20110805T003000
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110804T193000
-LOCATION:Game hall
-SUMMARY:Brink - Brackets
-URL:http://www.peliliiga.fi
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Compo_game
-DTEND;VALUE=DATE:20110805T140000
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110805T120000
-LOCATION:Game hall
-SUMMARY:Brink - Bronze match
-URL:http://www.peliliiga.fi
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Compo_game
-DTEND;VALUE=DATE:20110805T190000
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110805T173000
-LOCATION:Stage
-SUMMARY:Brink - Final
-URL:http://www.peliliiga.fi
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Compo_game
-DTEND;VALUE=DATE:20110805T190000
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110805T120000
-LOCATION:Game hall
-SUMMARY:Team Fortress 2 - Brackets
-URL:http://www.peliliiga.fi
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Compo_game
-DTEND;VALUE=DATE:20110805T230000
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110805T210000
-LOCATION:Game hall
-SUMMARY:Team Fortress 2 - Semifinal 1
-URL:http://www.peliliiga.fi
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Compo_game
-DTEND;VALUE=DATE:20110805T230000
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110805T210000
-LOCATION:Game hall
-SUMMARY:Team Fortress 2 - Semifinal 2
-URL:http://www.peliliiga.fi
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Compo_game
-DTEND;VALUE=DATE:20110806T170000
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110806T150000
-LOCATION:Game hall
-SUMMARY:Team Fortress 2 - Bronze match
-URL:http://www.peliliiga.fi
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Compo_game
-DTEND;VALUE=DATE:20110806T130000
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110806T110000
-LOCATION:Stage
-SUMMARY:Team Fortress 2 - Final
-URL:http://www.peliliiga.fi
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Compo_game
-DTEND;VALUE=DATE:20110805T003000
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110804T180000
-LOCATION:Game hall
-SUMMARY:FIFA 2011 - tournament
-URL:http://www.peliliiga.fi
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Compo_game
-DTEND;VALUE=DATE:20110805T230000
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110805T190000
-LOCATION:Game hall
-SUMMARY:NHL 2011 - tournament
-URL:http://www.peliliiga.fi
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Compo_game
-DTEND;VALUE=DATE:20110806T180000
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110806T140000
-LOCATION:Game hall
-SUMMARY:Tekken 6 - tournament
-URL:http://www.peliliiga.fi
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Compo_game
-DTEND;VALUE=DATE:20110806T190000
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110806T150000
-LOCATION:Game hall
-SUMMARY:Super Street Fighter - tournament
-URL:http://www.peliliiga.fi
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Compo_game
-DTEND;VALUE=DATE:20110807T060000
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110804T180000
-LOCATION:Own computer place
-SUMMARY:Heroes of Newerth - Tournament
-URL:http://www.peliliiga.fi
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Event
-DTEND;VALUE=DATE:20110804T213000
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110804T210000
-LOCATION:Stage
-SUMMARY:Opening ceremony
-URL:
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Event
-DTEND;VALUE=DATE:20110806T170000
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110806T170000
-LOCATION:PMS
-SUMMARY:Voting closes for individual and Game development compos
-URL:http://www.foobar.org/summer11/party_manual/intranet/vote
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Compo
-DTEND;VALUE=DATE:20110806T193000
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110806T183000
-LOCATION:Stage
-SUMMARY:Prize ceremony 1
-URL:http://www.foobar.org/summer11/compos/prizes/
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Event
-DTEND;VALUE=DATE:20110807T120000
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110807T120000
-LOCATION:PMS
-SUMMARY:Voting closes
-URL:http://www.foobar.org/summer11/party_manual/intranet/vote
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Compo
-DTEND;VALUE=DATE:20110807T143000
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110807T140000
-LOCATION:Stage
-SUMMARY:Prize ceremony 2
-URL:http://www.foobar.org/summer11/compos/prizes/
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Event
-DTEND;VALUE=DATE:20110807T150000
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110807T143000
-LOCATION:Stage
-SUMMARY:Closing ceremony
-URL:
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Event
-DTEND;VALUE=DATE:20110806T130000
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110806T110000
-LOCATION:Outside loading door #1
-SUMMARY:Robowar tournament qualifier
-URL:http://www.foobar.org/summer11/program/robosota
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Event
-DTEND;VALUE=DATE:20110806T160000
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110806T150000
-LOCATION:Outside loading door #1
-SUMMARY:Robowar tournament final
-URL:http://www.foobar.org/summer11/program/robosota
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Event
-DTEND;VALUE=DATE:20110804T233000
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110804T220000
-LOCATION:Main stage
-SUMMARY:Concert - Machinae Supremacy
-URL:http://www.foobar.org/summer11/program/concerts
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Event
-DTEND;VALUE=DATE:20110805T220000
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110805T203000
-LOCATION:Main stage
-SUMMARY:Concert - Press Play on Tape
-URL:http://www.foobar.org/summer11/program/concerts
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Event
-DTEND;VALUE=DATE:20110805T143000
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110805T140000
-LOCATION:Stage
-SUMMARY:Cosplay event presented by BatMud
-URL:http://www.foobar.org/summer11/program/
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Event
-DTEND;VALUE=DATE:20110806T190000
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110806T140000
-LOCATION:Powerplay
-SUMMARY:ASUS presents - Paragon WOW raiding
-URL:http://www.foobar.org/summer11/program/
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Seminar
-DTEND;VALUE=DATE:20110804T184500
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110804T180000
-LOCATION:Seminar area
-SUMMARY:ARTtech seminars - Digital resistance\, East European demo art
-URL:http://www.foobar.org/summer11/seminars/sessions#demoart
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Seminar
-DTEND;VALUE=DATE:20110804T194500
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110804T190000
-LOCATION:Seminar area
-SUMMARY:ARTtech seminars - Why Being Poor and Having No Budget is Good For
-  Making Game
-URL:http://www.foobar.org/summer11/seminars/sessions#constraints
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Seminar
-DTEND;VALUE=DATE:20110804T204500
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110804T200000
-LOCATION:Seminar area
-SUMMARY:ARTtech seminars - Remix Culture In The Demoscene
-URL:http://www.foobar.org/summer11/seminars/sessions#remix
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Seminar
-DTEND;VALUE=DATE:20110804T214500
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110804T210000
-LOCATION:Seminar area
-SUMMARY:ARTtech seminars - DRM of Pacman
-URL:http://www.foobar.org/summer11/seminars/sessions#drmpacman
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Seminar
-DTEND;VALUE=DATE:20110805T104500
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110805T100000
-LOCATION:Seminar area
-SUMMARY:ARTtech seminars - Perfect harmony: crowdsourcing matches musician
- s and sound designers to game developers
-URL:http://www.foobar.org/summer11/seminars/sessions#music
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Seminar
-DTEND;VALUE=DATE:20110805T124500
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110805T120000
-LOCATION:Seminar area
-SUMMARY:ARTtech seminars - Browserscene: Creating demos on the Web
-URL:http://www.foobar.org/summer11/seminars/sessions#webgl2
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Seminar
-DTEND;VALUE=DATE:20110805T144500
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110805T140000
-LOCATION:Seminar area
-SUMMARY:ARTtech seminars - Fumbling my way through pixel-based effects mad
- e learning WebGL a lot easier
-URL:http://www.foobar.org/summer11/seminars/sessions#webgl1
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Seminar
-DTEND;VALUE=DATE:20110805T154500
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110805T150000
-LOCATION:Seminar area
-SUMMARY:ARTtech seminars - The Making of RO.ME
-URL:http://www.foobar.org/summer11/seminars/sessions#rome
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Seminar
-DTEND;VALUE=DATE:20110805T164500
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110805T160000
-LOCATION:Seminar area
-SUMMARY:ARTtech seminars - Developing next generation of online games
-URL:http://www.foobar.org/summer11/seminars/sessions#nextgenonline
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Seminar
-DTEND;VALUE=DATE:20110805T174500
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110805T170000
-LOCATION:Seminar area
-SUMMARY:ARTtech seminars - Developing Games for Nokia Phones
-URL:http://www.foobar.org/summer11/seminars/sessions#nokia_games
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Seminar
-DTEND;VALUE=DATE:20110805T184500
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110805T180000
-LOCATION:Seminar area
-SUMMARY:ARTtech seminars - Rocking your socks off with Windows Phone 7
-URL:http://www.foobar.org/summer11/seminars/sessions#wp7
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Seminar
-DTEND;VALUE=DATE:20110805T194500
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110805T190000
-LOCATION:Seminar area
-SUMMARY:ARTtech seminars - Wonders of Kinect Windows SDK
-URL:http://www.foobar.org/summer11/seminars/sessions#kinect
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Seminar
-DTEND;VALUE=DATE:20110806T114500
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110806T110000
-LOCATION:Seminar area
-SUMMARY:ARTtech seminars - Basics of demo programming
-URL:http://www.foobar.org/summer11/seminars/sessions#demoprogramming
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Seminar
-DTEND;VALUE=DATE:20110806T124500
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110806T120000
-LOCATION:Seminar area
-SUMMARY:ARTtech seminars - Kajak3D\, an open source multiplatform game eng
- ine
-URL:http://www.foobar.org/summer11/seminars/sessions#kajak3d
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Seminar
-DTEND;VALUE=DATE:20110806T134500
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110806T130000
-LOCATION:Seminar area
-SUMMARY:ARTtech seminars - Adventures in multithreaded gameplay coding
-URL:http://www.foobar.org/summer11/seminars/sessions#threaded
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Seminar
-DTEND;VALUE=DATE:20110806T144500
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110806T140000
-LOCATION:Seminar area
-SUMMARY:ARTtech seminars - The art and design of Ridge Racer Unbounded
-URL:http://www.foobar.org/summer11/seminars/sessions#ridgeracer
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Seminar
-DTEND;VALUE=DATE:20110806T154500
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110806T150000
-LOCATION:Seminar area
-SUMMARY:ARTtech seminars - Future of location based mobile games
-URL:http://www.foobar.org/summer11/seminars/sessions#location
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Seminar
-DTEND;VALUE=DATE:20110806T184500
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110806T180000
-LOCATION:Seminar area
-SUMMARY:ARTtech seminars - Robowar
-URL:http://www.foobar.org/summer11/seminars/sessions#robosota
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Event
-DTEND;VALUE=DATE:20110807T100000
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110807T100000
-LOCATION:Loading entrances #1 and #2
-SUMMARY:Loading doors open
-URL:http://www.foobar.org/summer11/come-to-party/leaving
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Event
-DTEND;VALUE=DATE:20110807T161500
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110807T161500
-LOCATION:All areas
-SUMMARY:Lights go on
-URL:
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Event
-DTEND;VALUE=DATE:20110807T163000
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110807T163000
-LOCATION:All areas
-SUMMARY:Party network goes down
-URL:
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Event
-DTEND;VALUE=DATE:20110807T170000
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110807T170000
-LOCATION:All areas
-SUMMARY:Electricity is cut
-URL:
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Event
-DTEND;VALUE=DATE:20110807T161500
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110807T161500
-LOCATION:foobarTV
-SUMMARY:foobarTV broadcast ends
-URL:http://www.foobartv.net
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Event
-DTEND;VALUE=DATE:20110807T180000
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110807T180000
-LOCATION:Loading entrances #1\, #2 and #3
-SUMMARY:Loading doors closed
-URL:http://www.foobar.org/summer11/come-to-party/leaving
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Event
-DTEND;VALUE=DATE:20110807T180000
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110807T180000
-LOCATION:All areas
-SUMMARY:foobar Summer 2011 is over - see you next year!
-URL:
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Event
-DTEND;VALUE=DATE:20110805T153000
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110805T150000
-LOCATION:Outside main entrance
-SUMMARY:RC helicopters: flying demonstration with T-REX 600N
-URL:
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Event
-DTEND;VALUE=DATE:20110805T173000
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110805T170000
-LOCATION:Outside main entrance
-SUMMARY:RC helicopters: flying demonstration with T-REX 600N
-URL:
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Event
-DTEND;VALUE=DATE:20110806T133000
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110806T130000
-LOCATION:Outside main entrance
-SUMMARY:RC helicopters: flying demonstration with T-REX 600N
-URL:
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Event
-DTEND;VALUE=DATE:20110806T163000
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110806T160000
-LOCATION:Outside main entrance
-SUMMARY:RC helicopters: flying demonstration with T-REX 600N
-URL:
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Seminar
-DTEND;VALUE=DATE:20110806T164500
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110806T160000
-LOCATION:Seminar area
-SUMMARY:ARTtech seminars – All aboard to the Dark side of the Moon (Iron
-  Sky)
-URL:http://www.foobar.org/summer11/seminars/sessions#ironsky
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Seminar
-DTEND;VALUE=DATE:20110806T174500
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110806T170000
-LOCATION:Seminar area
-SUMMARY:ARTtech seminars – Angry Birds on the web
-URL:http://www.foobar.org/summer11/seminars/sessions#angrybirds
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Event
-DTEND;VALUE=DATE:20110806T230000
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110806T120000
-LOCATION:Pelitalo stand
-SUMMARY:Pelitalo events begin
-URL:http://pelitalo.nettiareena.fi/foobar/ohjelma/
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Event
-DTEND;VALUE=DATE:20110806T210000
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110806T200000
-LOCATION:Pelitalo stand
-SUMMARY:Bomberman tournament
-URL:http://pelitalo.nettiareena.fi/foobar/ohjelma/
-END:VEVENT
-BEGIN:VEVENT
-CATEGORIES:Seminar
-DTEND;VALUE=DATE:20110805T134500
-DTSTAMP;VALUE=DATE:20120214T224612
-DTSTART;VALUE=DATE:20110805T130000
-LOCATION:Seminar area
-SUMMARY:ARTtech seminars - Deconstructing a browserscene demo
-URL:http://www.foobar.org/summer11/seminars/sessions#webgl2
-END:VEVENT
-END:VCALENDAR
diff --git a/modules/default/calendar/vendor/ical.js/test/test7.ics b/modules/default/calendar/vendor/ical.js/test/test7.ics
deleted file mode 100644
index 4379cd0e..00000000
--- a/modules/default/calendar/vendor/ical.js/test/test7.ics
+++ /dev/null
@@ -1,16 +0,0 @@
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:ownCloud Calendar 0.6.3
-X-WR-CALNAME:Fête Nationale - Férié
-BEGIN:VEVENT
-CREATED:20090502T140513Z
-DTSTAMP:20111106T124709Z
-UID:FA9831E7-C238-4FEC-95E5-CD46BD466421
-SUMMARY:Fête Nationale - Férié
-RRULE:FREQ=YEARLY
-DTSTART;VALUE=DATE:20120714
-DTEND;VALUE=DATE:20120715
-TRANSP:OPAQUE
-SEQUENCE:5
-END:VEVENT
-END:VCALENDAR
diff --git a/modules/default/calendar/vendor/ical.js/test/test8.ics b/modules/default/calendar/vendor/ical.js/test/test8.ics
deleted file mode 100644
index e7b2f50f..00000000
--- a/modules/default/calendar/vendor/ical.js/test/test8.ics
+++ /dev/null
@@ -1,23 +0,0 @@
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:ownCloud Calendar 0.6.3
-X-WR-CALNAME:Default calendar
-BEGIN:VTODO
-CREATED;VALUE=DATE-TIME:20130714T092804Z
-UID:0aa462f13c
-LAST-MODIFIED;VALUE=DATE-TIME:20130714T092804Z
-DTSTAMP;VALUE=DATE-TIME:20130714T092804Z
-CATEGORIES:Projets
-SUMMARY:Migrer le blog
-PERCENT-COMPLETE:100
-COMPLETED;VALUE=DATE-TIME;TZID=Europe/Monaco:20130716T105745
-END:VTODO
-BEGIN:VTODO
-CREATED;VALUE=DATE-TIME:20130714T092912Z
-UID:5e05bbcf34
-LAST-MODIFIED;VALUE=DATE-TIME:20130714T092912Z
-DTSTAMP;VALUE=DATE-TIME:20130714T092912Z
-SUMMARY:Créer test unitaire erreur ical
-CATEGORIES:Projets
-END:VTODO
-END:VCALENDAR
diff --git a/modules/default/calendar/vendor/ical.js/test/test9.ics b/modules/default/calendar/vendor/ical.js/test/test9.ics
deleted file mode 100644
index 76a1d7b9..00000000
--- a/modules/default/calendar/vendor/ical.js/test/test9.ics
+++ /dev/null
@@ -1,21 +0,0 @@
-BEGIN:VCALENDAR
-BEGIN:VEVENT
-UID:eb9e1bd2-ceba-499f-be77-f02773954c72
-SUMMARY:Event with an alarm
-DESCRIPTION:This is an event with an alarm.
-ORGANIZER="mailto:stomlinson@mozilla.com"
-DTSTART;TZID="America/Los_Angeles":20130418T110000
-DTEND;TZID="America/Los_Angeles":20130418T120000
-STATUS:CONFIRMED
-CLASS:PUBLIC
-TRANSP:OPAQUE
-LAST-MODIFIED:20130418T175632Z
-DTSTAMP:20130418T175632Z
-SEQUENCE:3
-BEGIN:VALARM
-ACTION:DISPLAY
-TRIGGER;RELATED=START:-PT5M
-DESCRIPTION:Reminder
-END:VALARM
-END:VEVENT
-END:VCALENDAR
diff --git a/modules/default/clock/clock.js b/modules/default/clock/clock.js
index 4b60c11b..cfcd1e40 100644
--- a/modules/default/clock/clock.js
+++ b/modules/default/clock/clock.js
@@ -52,10 +52,12 @@ Module.register("clock", {
 
 		//Calculate how many ms should pass until next update depending on if seconds is displayed or not
 		var delayCalculator = function (reducedSeconds) {
+			var EXTRA_DELAY = 50; //Deliberate imperceptable delay to prevent off-by-one timekeeping errors
+
 			if (self.config.displaySeconds) {
-				return 1000 - moment().milliseconds();
+				return 1000 - moment().milliseconds() + EXTRA_DELAY;
 			} else {
-				return (60 - reducedSeconds) * 1000 - moment().milliseconds();
+				return (60 - reducedSeconds) * 1000 - moment().milliseconds() + EXTRA_DELAY;
 			}
 		};
 
@@ -65,7 +67,7 @@ Module.register("clock", {
 
 			//If seconds is displayed CLOCK_SECOND-notification should be sent (but not when CLOCK_MINUTE-notification is sent)
 			if (self.config.displaySeconds) {
-				self.second = (self.second + 1) % 60;
+				self.second = moment().second();
 				if (self.second !== 0) {
 					self.sendNotification("CLOCK_SECOND", self.second);
 					setTimeout(notificationTimer, delayCalculator(0));
@@ -74,7 +76,7 @@ Module.register("clock", {
 			}
 
 			//If minute changed or seconds isn't displayed send CLOCK_MINUTE-notification
-			self.minute = (self.minute + 1) % 60;
+			self.minute = moment().minute();
 			self.sendNotification("CLOCK_MINUTE", self.minute);
 			setTimeout(notificationTimer, delayCalculator(0));
 		};
diff --git a/modules/default/clock/faces/face-001.svg b/modules/default/clock/faces/face-001.svg
index 13436c76..abd08ce7 100644
--- a/modules/default/clock/faces/face-001.svg
+++ b/modules/default/clock/faces/face-001.svg
@@ -1 +1 @@
-<svg id="Hour_Markers_-_Singlets" data-name="Hour Markers - Singlets" xmlns="https://www.w3.org/2000/svg" viewBox="0 0 250 250"><defs><style>.cls-1,.cls-2{fill:none;stroke:#fff;stroke-linecap:round;stroke-miterlimit:10;}.cls-2{stroke-width:0.5px;}</style></defs><title>face-001</title><line class="cls-1" x1="125" y1="1.25" x2="125" y2="16.23"/><line class="cls-1" x1="186.87" y1="17.83" x2="179.39" y2="30.8"/><line class="cls-1" x1="232.17" y1="63.12" x2="219.2" y2="70.61"/><line class="cls-1" x1="248.75" y1="125" x2="233.77" y2="125"/><line class="cls-1" x1="232.17" y1="186.87" x2="219.2" y2="179.39"/><line class="cls-1" x1="186.88" y1="232.17" x2="179.39" y2="219.2"/><line class="cls-1" x1="125" y1="248.75" x2="125" y2="233.77"/><line class="cls-1" x1="63.13" y1="232.17" x2="70.61" y2="219.2"/><line class="cls-1" x1="17.83" y1="186.88" x2="30.8" y2="179.39"/><line class="cls-1" x1="1.25" y1="125" x2="16.23" y2="125"/><line class="cls-1" x1="17.83" y1="63.13" x2="30.8" y2="70.61"/><line class="cls-1" x1="63.12" y1="17.83" x2="70.61" y2="30.8"/><line class="cls-2" x1="138.01" y1="1.25" x2="136.96" y2="11.23"/><line class="cls-2" x1="150.87" y1="3.29" x2="148.78" y2="13.11"/><line class="cls-2" x1="163.45" y1="6.66" x2="160.35" y2="16.21"/><line class="cls-2" x1="175.61" y1="11.33" x2="171.53" y2="20.5"/><line class="cls-2" x1="198.14" y1="24.33" x2="192.24" y2="32.45"/><line class="cls-2" x1="208.26" y1="32.53" x2="201.54" y2="39.99"/><line class="cls-2" x1="217.47" y1="41.74" x2="210.01" y2="48.46"/><line class="cls-2" x1="225.67" y1="51.86" x2="217.55" y2="57.76"/><line class="cls-2" x1="238.67" y1="74.39" x2="229.5" y2="78.47"/><line class="cls-2" x1="243.34" y1="86.55" x2="233.79" y2="89.65"/><line class="cls-2" x1="246.71" y1="99.13" x2="236.89" y2="101.22"/><line class="cls-2" x1="248.75" y1="111.99" x2="238.77" y2="113.04"/><line class="cls-2" x1="248.75" y1="138.01" x2="238.77" y2="136.96"/><line class="cls-2" x1="246.71" y1="150.87" x2="236.89" y2="148.78"/><line class="cls-2" x1="243.34" y1="163.45" x2="233.79" y2="160.35"/><line class="cls-2" x1="238.67" y1="175.61" x2="229.5" y2="171.53"/><line class="cls-2" x1="225.67" y1="198.14" x2="217.55" y2="192.24"/><line class="cls-2" x1="217.47" y1="208.26" x2="210.01" y2="201.54"/><line class="cls-2" x1="208.26" y1="217.47" x2="201.54" y2="210.01"/><line class="cls-2" x1="198.14" y1="225.67" x2="192.24" y2="217.55"/><line class="cls-2" x1="175.61" y1="238.67" x2="171.53" y2="229.5"/><line class="cls-2" x1="163.45" y1="243.34" x2="160.35" y2="233.79"/><line class="cls-2" x1="150.87" y1="246.71" x2="148.78" y2="236.89"/><line class="cls-2" x1="138.01" y1="248.75" x2="136.96" y2="238.77"/><line class="cls-2" x1="111.99" y1="248.75" x2="113.04" y2="238.77"/><line class="cls-2" x1="99.13" y1="246.71" x2="101.22" y2="236.89"/><line class="cls-2" x1="86.55" y1="243.34" x2="89.65" y2="233.79"/><line class="cls-2" x1="74.39" y1="238.67" x2="78.47" y2="229.5"/><line class="cls-2" x1="51.86" y1="225.67" x2="57.76" y2="217.55"/><line class="cls-2" x1="41.74" y1="217.47" x2="48.46" y2="210.01"/><line class="cls-2" x1="32.53" y1="208.26" x2="39.99" y2="201.54"/><line class="cls-2" x1="24.33" y1="198.14" x2="32.45" y2="192.24"/><line class="cls-2" x1="11.33" y1="175.61" x2="20.5" y2="171.53"/><line class="cls-2" x1="6.66" y1="163.45" x2="16.21" y2="160.35"/><line class="cls-2" x1="3.29" y1="150.87" x2="13.11" y2="148.78"/><line class="cls-2" x1="1.25" y1="138.01" x2="11.23" y2="136.96"/><line class="cls-2" x1="1.25" y1="111.99" x2="11.23" y2="113.04"/><line class="cls-2" x1="3.29" y1="99.13" x2="13.11" y2="101.22"/><line class="cls-2" x1="6.66" y1="86.55" x2="16.21" y2="89.65"/><line class="cls-2" x1="11.33" y1="74.39" x2="20.5" y2="78.47"/><line class="cls-2" x1="24.33" y1="51.86" x2="32.45" y2="57.76"/><line class="cls-2" x1="32.53" y1="41.74" x2="39.99" y2="48.46"/><line class="cls-2" x1="41.74" y1="32.53" x2="48.46" y2="39.99"/><line class="cls-2" x1="51.86" y1="24.33" x2="57.76" y2="32.45"/><line class="cls-2" x1="74.39" y1="11.33" x2="78.47" y2="20.5"/><line class="cls-2" x1="86.55" y1="6.66" x2="89.65" y2="16.21"/><line class="cls-2" x1="99.13" y1="3.29" x2="101.22" y2="13.11"/><line class="cls-2" x1="111.99" y1="1.25" x2="113.04" y2="11.23"/></svg>
+<svg id="Hour_Markers_-_Singlets" data-name="Hour Markers - Singlets" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 250 250"><defs><style>.cls-1,.cls-2{fill:none;stroke:#fff;stroke-linecap:round;stroke-miterlimit:10;}.cls-2{stroke-width:0.5px;}</style></defs><title>face-001</title><line class="cls-1" x1="125" y1="1.25" x2="125" y2="16.23"/><line class="cls-1" x1="186.87" y1="17.83" x2="179.39" y2="30.8"/><line class="cls-1" x1="232.17" y1="63.12" x2="219.2" y2="70.61"/><line class="cls-1" x1="248.75" y1="125" x2="233.77" y2="125"/><line class="cls-1" x1="232.17" y1="186.87" x2="219.2" y2="179.39"/><line class="cls-1" x1="186.88" y1="232.17" x2="179.39" y2="219.2"/><line class="cls-1" x1="125" y1="248.75" x2="125" y2="233.77"/><line class="cls-1" x1="63.13" y1="232.17" x2="70.61" y2="219.2"/><line class="cls-1" x1="17.83" y1="186.88" x2="30.8" y2="179.39"/><line class="cls-1" x1="1.25" y1="125" x2="16.23" y2="125"/><line class="cls-1" x1="17.83" y1="63.13" x2="30.8" y2="70.61"/><line class="cls-1" x1="63.12" y1="17.83" x2="70.61" y2="30.8"/><line class="cls-2" x1="138.01" y1="1.25" x2="136.96" y2="11.23"/><line class="cls-2" x1="150.87" y1="3.29" x2="148.78" y2="13.11"/><line class="cls-2" x1="163.45" y1="6.66" x2="160.35" y2="16.21"/><line class="cls-2" x1="175.61" y1="11.33" x2="171.53" y2="20.5"/><line class="cls-2" x1="198.14" y1="24.33" x2="192.24" y2="32.45"/><line class="cls-2" x1="208.26" y1="32.53" x2="201.54" y2="39.99"/><line class="cls-2" x1="217.47" y1="41.74" x2="210.01" y2="48.46"/><line class="cls-2" x1="225.67" y1="51.86" x2="217.55" y2="57.76"/><line class="cls-2" x1="238.67" y1="74.39" x2="229.5" y2="78.47"/><line class="cls-2" x1="243.34" y1="86.55" x2="233.79" y2="89.65"/><line class="cls-2" x1="246.71" y1="99.13" x2="236.89" y2="101.22"/><line class="cls-2" x1="248.75" y1="111.99" x2="238.77" y2="113.04"/><line class="cls-2" x1="248.75" y1="138.01" x2="238.77" y2="136.96"/><line class="cls-2" x1="246.71" y1="150.87" x2="236.89" y2="148.78"/><line class="cls-2" x1="243.34" y1="163.45" x2="233.79" y2="160.35"/><line class="cls-2" x1="238.67" y1="175.61" x2="229.5" y2="171.53"/><line class="cls-2" x1="225.67" y1="198.14" x2="217.55" y2="192.24"/><line class="cls-2" x1="217.47" y1="208.26" x2="210.01" y2="201.54"/><line class="cls-2" x1="208.26" y1="217.47" x2="201.54" y2="210.01"/><line class="cls-2" x1="198.14" y1="225.67" x2="192.24" y2="217.55"/><line class="cls-2" x1="175.61" y1="238.67" x2="171.53" y2="229.5"/><line class="cls-2" x1="163.45" y1="243.34" x2="160.35" y2="233.79"/><line class="cls-2" x1="150.87" y1="246.71" x2="148.78" y2="236.89"/><line class="cls-2" x1="138.01" y1="248.75" x2="136.96" y2="238.77"/><line class="cls-2" x1="111.99" y1="248.75" x2="113.04" y2="238.77"/><line class="cls-2" x1="99.13" y1="246.71" x2="101.22" y2="236.89"/><line class="cls-2" x1="86.55" y1="243.34" x2="89.65" y2="233.79"/><line class="cls-2" x1="74.39" y1="238.67" x2="78.47" y2="229.5"/><line class="cls-2" x1="51.86" y1="225.67" x2="57.76" y2="217.55"/><line class="cls-2" x1="41.74" y1="217.47" x2="48.46" y2="210.01"/><line class="cls-2" x1="32.53" y1="208.26" x2="39.99" y2="201.54"/><line class="cls-2" x1="24.33" y1="198.14" x2="32.45" y2="192.24"/><line class="cls-2" x1="11.33" y1="175.61" x2="20.5" y2="171.53"/><line class="cls-2" x1="6.66" y1="163.45" x2="16.21" y2="160.35"/><line class="cls-2" x1="3.29" y1="150.87" x2="13.11" y2="148.78"/><line class="cls-2" x1="1.25" y1="138.01" x2="11.23" y2="136.96"/><line class="cls-2" x1="1.25" y1="111.99" x2="11.23" y2="113.04"/><line class="cls-2" x1="3.29" y1="99.13" x2="13.11" y2="101.22"/><line class="cls-2" x1="6.66" y1="86.55" x2="16.21" y2="89.65"/><line class="cls-2" x1="11.33" y1="74.39" x2="20.5" y2="78.47"/><line class="cls-2" x1="24.33" y1="51.86" x2="32.45" y2="57.76"/><line class="cls-2" x1="32.53" y1="41.74" x2="39.99" y2="48.46"/><line class="cls-2" x1="41.74" y1="32.53" x2="48.46" y2="39.99"/><line class="cls-2" x1="51.86" y1="24.33" x2="57.76" y2="32.45"/><line class="cls-2" x1="74.39" y1="11.33" x2="78.47" y2="20.5"/><line class="cls-2" x1="86.55" y1="6.66" x2="89.65" y2="16.21"/><line class="cls-2" x1="99.13" y1="3.29" x2="101.22" y2="13.11"/><line class="cls-2" x1="111.99" y1="1.25" x2="113.04" y2="11.23"/></svg>
diff --git a/modules/default/clock/faces/face-002.svg b/modules/default/clock/faces/face-002.svg
index a3ee3682..1ec31049 100644
--- a/modules/default/clock/faces/face-002.svg
+++ b/modules/default/clock/faces/face-002.svg
@@ -1 +1 @@
-<svg id="Hour_Markers_-_Doubles" data-name="Hour Markers - Doubles" xmlns="https://www.w3.org/2000/svg" viewBox="0 0 250 250"><defs><style>.cls-1{fill:none;stroke:#fff;stroke-linecap:round;stroke-miterlimit:10;stroke-width:2.98px;}</style></defs><title>face-002</title><line class="cls-1" x1="122.01" y1="1.75" x2="122.01" y2="16.67"/><line class="cls-1" x1="186.62" y1="18.26" x2="179.17" y2="31.18"/><line class="cls-1" x1="231.74" y1="63.37" x2="218.82" y2="70.83"/><line class="cls-1" x1="248.25" y1="127.99" x2="233.33" y2="127.99"/><line class="cls-1" x1="231.74" y1="186.62" x2="218.82" y2="179.17"/><line class="cls-1" x1="186.63" y1="231.74" x2="179.17" y2="218.82"/><line class="cls-1" x1="127.99" y1="248.25" x2="127.99" y2="233.33"/><line class="cls-1" x1="63.38" y1="231.74" x2="70.83" y2="218.82"/><line class="cls-1" x1="18.26" y1="186.63" x2="31.18" y2="179.17"/><line class="cls-1" x1="1.75" y1="122.01" x2="16.67" y2="122.01"/><line class="cls-1" x1="18.26" y1="63.38" x2="31.18" y2="70.83"/><line class="cls-1" x1="63.37" y1="18.26" x2="70.83" y2="31.18"/><line class="cls-1" x1="127.99" y1="1.75" x2="127.99" y2="16.67"/><line class="cls-1" x1="248.25" y1="122.01" x2="233.33" y2="122.01"/><line class="cls-1" x1="122.01" y1="248.25" x2="122.01" y2="233.33"/><line class="cls-1" x1="1.75" y1="127.99" x2="16.67" y2="127.99"/></svg>
+<svg id="Hour_Markers_-_Doubles" data-name="Hour Markers - Doubles" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 250 250"><defs><style>.cls-1{fill:none;stroke:#fff;stroke-linecap:round;stroke-miterlimit:10;stroke-width:2.98px;}</style></defs><title>face-002</title><line class="cls-1" x1="122.01" y1="1.75" x2="122.01" y2="16.67"/><line class="cls-1" x1="186.62" y1="18.26" x2="179.17" y2="31.18"/><line class="cls-1" x1="231.74" y1="63.37" x2="218.82" y2="70.83"/><line class="cls-1" x1="248.25" y1="127.99" x2="233.33" y2="127.99"/><line class="cls-1" x1="231.74" y1="186.62" x2="218.82" y2="179.17"/><line class="cls-1" x1="186.63" y1="231.74" x2="179.17" y2="218.82"/><line class="cls-1" x1="127.99" y1="248.25" x2="127.99" y2="233.33"/><line class="cls-1" x1="63.38" y1="231.74" x2="70.83" y2="218.82"/><line class="cls-1" x1="18.26" y1="186.63" x2="31.18" y2="179.17"/><line class="cls-1" x1="1.75" y1="122.01" x2="16.67" y2="122.01"/><line class="cls-1" x1="18.26" y1="63.38" x2="31.18" y2="70.83"/><line class="cls-1" x1="63.37" y1="18.26" x2="70.83" y2="31.18"/><line class="cls-1" x1="127.99" y1="1.75" x2="127.99" y2="16.67"/><line class="cls-1" x1="248.25" y1="122.01" x2="233.33" y2="122.01"/><line class="cls-1" x1="122.01" y1="248.25" x2="122.01" y2="233.33"/><line class="cls-1" x1="1.75" y1="127.99" x2="16.67" y2="127.99"/></svg>
diff --git a/modules/default/clock/faces/face-003.svg b/modules/default/clock/faces/face-003.svg
index d3fc32de..7cfeebac 100644
--- a/modules/default/clock/faces/face-003.svg
+++ b/modules/default/clock/faces/face-003.svg
@@ -1 +1 @@
-<svg id="Hour_Markers_-_Digits" data-name="Hour Markers - Digits" xmlns="https://www.w3.org/2000/svg" viewBox="0 0 250 250"><defs><style>.cls-1{fill:#fff;stroke-width:1.15px;}.cls-1,.cls-2{stroke:#fff;stroke-miterlimit:10;}.cls-2{fill:none;stroke-linecap:round;stroke-width:0.47px;}</style></defs><title>face-003</title><path class="cls-1" d="M117.49,5l-2.84,1.1-0.49-1.42,4.9-1.87V17.3h3.33v1.4h-8.81V17.3h3.92V5Z"/><path class="cls-1" d="M127.64,17.3l5.76-7.44A4.44,4.44,0,0,0,134.7,7a2.4,2.4,0,0,0-2.5-2.54c-1.84,0-2.77,1.45-3,3.12l-1.54-.21c0.37-2.59,1.79-4.38,4.55-4.38a3.79,3.79,0,0,1,4.13,4,6.17,6.17,0,0,1-1.63,3.8l-5.08,6.6h6.69v1.4h-8.67V17.3Z"/><path class="cls-1" d="M182.09,20.46l-2.84,1.1-0.49-1.42,4.9-1.87V32.73H187v1.4h-8.81v-1.4h3.92V20.46Z"/><path class="cls-1" d="M220.42,74.88l5.76-7.44a4.44,4.44,0,0,0,1.31-2.91A2.4,2.4,0,0,0,225,62c-1.84,0-2.77,1.45-3,3.12l-1.54-.21c0.37-2.59,1.79-4.38,4.55-4.38a3.79,3.79,0,0,1,4.13,4,6.17,6.17,0,0,1-1.63,3.8l-5.08,6.6h6.69v1.4h-8.67v-1.4Z"/><path class="cls-1" d="M237.64,124.46l4.59-4.73h-6.48v-1.4h8.63v1.4l-4.31,4.41c2.42,0,4.5,1.38,4.5,4a5.42,5.42,0,0,1-2.82,4.73c-1.28.79-2.8,1.26-5.78,1.26v-1.47c2.56,0,3.66-.28,4.48-0.75a4.41,4.41,0,0,0,2.5-3.73c0-2-1.75-2.61-3.47-2.61a16,16,0,0,0-1.82.19v-1.26Z"/><path class="cls-1" d="M220.35,187.58l2.31-12,1.56,0.42-2,10.14h4.22v-7.9H228v7.9h1.24v1.4H228v3.89h-1.56v-3.89h-6.09Z"/><path class="cls-1" d="M178.82,218.09h8v1.4h-6.41v4.78a6.61,6.61,0,0,1,2.31-.49,4,4,0,0,1,4.22,4.13,5.61,5.61,0,0,1-2.75,4.78c-1.21.77-2.8,1.17-5.83,1.17v-1.47a10.26,10.26,0,0,0,4.55-.68,4.38,4.38,0,0,0,2.4-3.8,2.53,2.53,0,0,0-2.75-2.66,5.36,5.36,0,0,0-2.59.82h-1.12v-8Z"/><path class="cls-1" d="M127.83,235.93a3.8,3.8,0,0,0-2.49-1.17c-2.82,0-3,3.59-3.08,5.67a4.56,4.56,0,0,1,3.1-1.26c2.94,0,4,2.42,4,5,0,2.77-1.49,5.11-4.48,5.11-4,0-4.27-4.85-4.27-7.81,0-3.17.4-8.16,4.64-8.16a5.09,5.09,0,0,1,3.45,1.35ZM125,247.8c1.91,0,2.73-1.68,2.73-3.57s-0.54-3.59-2.61-3.59a4.47,4.47,0,0,0-2.87,1.52C122.28,247,123.58,247.8,125,247.8Z"/><path class="cls-1" d="M70.2,218.51H63.79v-1.4h8.67L65.4,233l-1.4-.63Z"/><path class="cls-1" d="M29.71,187.55a4.17,4.17,0,0,1-4.45,4.17,4.17,4.17,0,0,1-4.45-4.17c0-2.17,1.35-3.19,3.12-4.08-1.42-.89-2.61-2-2.61-3.75a3.94,3.94,0,1,1,7.88,0c0,1.8-1.17,2.87-2.59,3.75C28.36,184.35,29.71,185.38,29.71,187.55Zm-7.27.07a2.64,2.64,0,0,0,2.82,2.63,2.64,2.64,0,0,0,2.82-2.63c0-1.84-1.45-2.5-2.82-3.36C23.88,185.12,22.43,185.78,22.43,187.62Zm5.13-7.9a2.32,2.32,0,1,0-4.62,0c0,1.56,1.17,2.17,2.31,2.94C26.4,181.88,27.56,181.28,27.56,179.71Z"/><path class="cls-1" d="M6.93,131.49a3.75,3.75,0,0,0,2.52,1.17c2.82,0,3-3.59,3.05-5.67a4.5,4.5,0,0,1-3.08,1.26c-2.94,0-4-2.4-4-5,0-2.75,1.47-5.11,4.45-5.11,4,0,4.27,4.85,4.27,7.81,0,3.17-.4,8.16-4.64,8.16A5.13,5.13,0,0,1,6,132.77Zm2.84-11.87c-1.91,0-2.73,1.68-2.73,3.59s0.51,3.57,2.61,3.57a4.49,4.49,0,0,0,2.84-1.49C12.5,120.51,11.24,119.62,9.78,119.62Z"/><path class="cls-1" d="M21.75,62.66l-2.84,1.1-0.49-1.42,4.9-1.87V74.92h3.33v1.4H17.84v-1.4h3.92V62.66Z"/><path class="cls-1" d="M40.57,68.56c0,2.5.42,8-4.34,8s-4.34-5.29-4.34-8c0-3.66-.19-8,4.34-8C41.18,60.56,40.57,66.81,40.57,68.56Zm-7,0c0,6.11,1.12,6.5,2.7,6.5,1.8,0,2.7-.72,2.7-6.5,0-6-1-6.53-2.7-6.53C33.3,62,33.53,65.46,33.53,68.56Z"/><path class="cls-1" d="M61.91,20.49l-2.84,1.1-0.49-1.42,4.9-1.87V32.75H66.8v1.4H58v-1.4h3.92V20.49Z"/><path class="cls-1" d="M75.9,20.49l-2.84,1.1-0.49-1.42,4.9-1.87V32.75h3.33v1.4H72v-1.4H75.9V20.49Z"/><line class="cls-2" x1="134.41" y1="35.49" x2="133.65" y2="42.71"/><line class="cls-2" x1="143.71" y1="36.97" x2="142.2" y2="44.07"/><line class="cls-2" x1="152.81" y1="39.4" x2="150.57" y2="46.31"/><line class="cls-2" x1="161.61" y1="42.78" x2="158.65" y2="49.41"/><line class="cls-2" x1="170" y1="47.06" x2="166.37" y2="53.35"/><line class="cls-2" x1="177.9" y1="52.19" x2="173.63" y2="58.06"/><line class="cls-2" x1="185.22" y1="58.12" x2="180.36" y2="63.51"/><line class="cls-2" x1="191.88" y1="64.78" x2="186.49" y2="69.64"/><line class="cls-2" x1="197.81" y1="72.1" x2="191.94" y2="76.37"/><line class="cls-2" x1="202.94" y1="80" x2="196.65" y2="83.63"/><line class="cls-2" x1="207.22" y1="88.39" x2="200.59" y2="91.35"/><line class="cls-2" x1="210.6" y1="97.19" x2="203.69" y2="99.43"/><line class="cls-2" x1="213.03" y1="106.29" x2="205.93" y2="107.8"/><line class="cls-2" x1="214.51" y1="115.59" x2="207.29" y2="116.35"/><line class="cls-2" x1="215" y1="125" x2="207.74" y2="125"/><line class="cls-2" x1="214.51" y1="134.41" x2="207.29" y2="133.65"/><line class="cls-2" x1="213.03" y1="143.71" x2="205.93" y2="142.2"/><line class="cls-2" x1="210.6" y1="152.81" x2="203.69" y2="150.57"/><line class="cls-2" x1="207.22" y1="161.61" x2="200.59" y2="158.65"/><line class="cls-2" x1="202.94" y1="170" x2="196.65" y2="166.37"/><line class="cls-2" x1="197.81" y1="177.9" x2="191.94" y2="173.63"/><line class="cls-2" x1="191.88" y1="185.22" x2="186.49" y2="180.36"/><line class="cls-2" x1="185.22" y1="191.88" x2="180.36" y2="186.49"/><line class="cls-2" x1="177.9" y1="197.81" x2="173.63" y2="191.94"/><line class="cls-2" x1="170" y1="202.94" x2="166.37" y2="196.65"/><line class="cls-2" x1="161.61" y1="207.22" x2="158.65" y2="200.59"/><line class="cls-2" x1="152.81" y1="210.6" x2="150.57" y2="203.69"/><line class="cls-2" x1="143.71" y1="213.03" x2="142.2" y2="205.93"/><line class="cls-2" x1="134.41" y1="214.51" x2="133.65" y2="207.29"/><line class="cls-2" x1="125" y1="215" x2="125" y2="207.74"/><line class="cls-2" x1="115.59" y1="214.51" x2="116.35" y2="207.29"/><line class="cls-2" x1="106.29" y1="213.03" x2="107.8" y2="205.93"/><line class="cls-2" x1="97.19" y1="210.6" x2="99.43" y2="203.69"/><line class="cls-2" x1="88.39" y1="207.22" x2="91.35" y2="200.59"/><line class="cls-2" x1="80" y1="202.94" x2="83.63" y2="196.65"/><line class="cls-2" x1="72.1" y1="197.81" x2="76.37" y2="191.94"/><line class="cls-2" x1="64.78" y1="191.88" x2="69.64" y2="186.49"/><line class="cls-2" x1="58.12" y1="185.22" x2="63.51" y2="180.36"/><line class="cls-2" x1="52.19" y1="177.9" x2="58.06" y2="173.63"/><line class="cls-2" x1="47.06" y1="170" x2="53.35" y2="166.37"/><line class="cls-2" x1="42.78" y1="161.61" x2="49.41" y2="158.65"/><line class="cls-2" x1="39.4" y1="152.81" x2="46.31" y2="150.57"/><line class="cls-2" x1="36.97" y1="143.71" x2="44.07" y2="142.2"/><line class="cls-2" x1="35.49" y1="134.41" x2="42.71" y2="133.65"/><line class="cls-2" x1="35" y1="125" x2="42.26" y2="125"/><line class="cls-2" x1="35.49" y1="115.59" x2="42.71" y2="116.35"/><line class="cls-2" x1="36.97" y1="106.29" x2="44.07" y2="107.8"/><line class="cls-2" x1="39.4" y1="97.19" x2="46.31" y2="99.43"/><line class="cls-2" x1="42.78" y1="88.39" x2="49.41" y2="91.35"/><line class="cls-2" x1="47.06" y1="80" x2="53.35" y2="83.63"/><line class="cls-2" x1="52.19" y1="72.1" x2="58.06" y2="76.37"/><line class="cls-2" x1="58.12" y1="64.78" x2="63.51" y2="69.64"/><line class="cls-2" x1="64.78" y1="58.12" x2="69.64" y2="63.51"/><line class="cls-2" x1="72.1" y1="52.19" x2="76.37" y2="58.06"/><line class="cls-2" x1="80" y1="47.06" x2="83.63" y2="53.35"/><line class="cls-2" x1="88.39" y1="42.78" x2="91.35" y2="49.41"/><line class="cls-2" x1="97.19" y1="39.4" x2="99.43" y2="46.31"/><line class="cls-2" x1="106.29" y1="36.97" x2="107.8" y2="44.07"/><line class="cls-2" x1="115.59" y1="35.49" x2="116.35" y2="42.71"/><line class="cls-2" x1="125" y1="35" x2="125" y2="42.26"/></svg>
+<svg id="Hour_Markers_-_Digits" data-name="Hour Markers - Digits" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 250 250"><defs><style>.cls-1{fill:#fff;stroke-width:1.15px;}.cls-1,.cls-2{stroke:#fff;stroke-miterlimit:10;}.cls-2{fill:none;stroke-linecap:round;stroke-width:0.47px;}</style></defs><title>face-003</title><path class="cls-1" d="M117.49,5l-2.84,1.1-0.49-1.42,4.9-1.87V17.3h3.33v1.4h-8.81V17.3h3.92V5Z"/><path class="cls-1" d="M127.64,17.3l5.76-7.44A4.44,4.44,0,0,0,134.7,7a2.4,2.4,0,0,0-2.5-2.54c-1.84,0-2.77,1.45-3,3.12l-1.54-.21c0.37-2.59,1.79-4.38,4.55-4.38a3.79,3.79,0,0,1,4.13,4,6.17,6.17,0,0,1-1.63,3.8l-5.08,6.6h6.69v1.4h-8.67V17.3Z"/><path class="cls-1" d="M182.09,20.46l-2.84,1.1-0.49-1.42,4.9-1.87V32.73H187v1.4h-8.81v-1.4h3.92V20.46Z"/><path class="cls-1" d="M220.42,74.88l5.76-7.44a4.44,4.44,0,0,0,1.31-2.91A2.4,2.4,0,0,0,225,62c-1.84,0-2.77,1.45-3,3.12l-1.54-.21c0.37-2.59,1.79-4.38,4.55-4.38a3.79,3.79,0,0,1,4.13,4,6.17,6.17,0,0,1-1.63,3.8l-5.08,6.6h6.69v1.4h-8.67v-1.4Z"/><path class="cls-1" d="M237.64,124.46l4.59-4.73h-6.48v-1.4h8.63v1.4l-4.31,4.41c2.42,0,4.5,1.38,4.5,4a5.42,5.42,0,0,1-2.82,4.73c-1.28.79-2.8,1.26-5.78,1.26v-1.47c2.56,0,3.66-.28,4.48-0.75a4.41,4.41,0,0,0,2.5-3.73c0-2-1.75-2.61-3.47-2.61a16,16,0,0,0-1.82.19v-1.26Z"/><path class="cls-1" d="M220.35,187.58l2.31-12,1.56,0.42-2,10.14h4.22v-7.9H228v7.9h1.24v1.4H228v3.89h-1.56v-3.89h-6.09Z"/><path class="cls-1" d="M178.82,218.09h8v1.4h-6.41v4.78a6.61,6.61,0,0,1,2.31-.49,4,4,0,0,1,4.22,4.13,5.61,5.61,0,0,1-2.75,4.78c-1.21.77-2.8,1.17-5.83,1.17v-1.47a10.26,10.26,0,0,0,4.55-.68,4.38,4.38,0,0,0,2.4-3.8,2.53,2.53,0,0,0-2.75-2.66,5.36,5.36,0,0,0-2.59.82h-1.12v-8Z"/><path class="cls-1" d="M127.83,235.93a3.8,3.8,0,0,0-2.49-1.17c-2.82,0-3,3.59-3.08,5.67a4.56,4.56,0,0,1,3.1-1.26c2.94,0,4,2.42,4,5,0,2.77-1.49,5.11-4.48,5.11-4,0-4.27-4.85-4.27-7.81,0-3.17.4-8.16,4.64-8.16a5.09,5.09,0,0,1,3.45,1.35ZM125,247.8c1.91,0,2.73-1.68,2.73-3.57s-0.54-3.59-2.61-3.59a4.47,4.47,0,0,0-2.87,1.52C122.28,247,123.58,247.8,125,247.8Z"/><path class="cls-1" d="M70.2,218.51H63.79v-1.4h8.67L65.4,233l-1.4-.63Z"/><path class="cls-1" d="M29.71,187.55a4.17,4.17,0,0,1-4.45,4.17,4.17,4.17,0,0,1-4.45-4.17c0-2.17,1.35-3.19,3.12-4.08-1.42-.89-2.61-2-2.61-3.75a3.94,3.94,0,1,1,7.88,0c0,1.8-1.17,2.87-2.59,3.75C28.36,184.35,29.71,185.38,29.71,187.55Zm-7.27.07a2.64,2.64,0,0,0,2.82,2.63,2.64,2.64,0,0,0,2.82-2.63c0-1.84-1.45-2.5-2.82-3.36C23.88,185.12,22.43,185.78,22.43,187.62Zm5.13-7.9a2.32,2.32,0,1,0-4.62,0c0,1.56,1.17,2.17,2.31,2.94C26.4,181.88,27.56,181.28,27.56,179.71Z"/><path class="cls-1" d="M6.93,131.49a3.75,3.75,0,0,0,2.52,1.17c2.82,0,3-3.59,3.05-5.67a4.5,4.5,0,0,1-3.08,1.26c-2.94,0-4-2.4-4-5,0-2.75,1.47-5.11,4.45-5.11,4,0,4.27,4.85,4.27,7.81,0,3.17-.4,8.16-4.64,8.16A5.13,5.13,0,0,1,6,132.77Zm2.84-11.87c-1.91,0-2.73,1.68-2.73,3.59s0.51,3.57,2.61,3.57a4.49,4.49,0,0,0,2.84-1.49C12.5,120.51,11.24,119.62,9.78,119.62Z"/><path class="cls-1" d="M21.75,62.66l-2.84,1.1-0.49-1.42,4.9-1.87V74.92h3.33v1.4H17.84v-1.4h3.92V62.66Z"/><path class="cls-1" d="M40.57,68.56c0,2.5.42,8-4.34,8s-4.34-5.29-4.34-8c0-3.66-.19-8,4.34-8C41.18,60.56,40.57,66.81,40.57,68.56Zm-7,0c0,6.11,1.12,6.5,2.7,6.5,1.8,0,2.7-.72,2.7-6.5,0-6-1-6.53-2.7-6.53C33.3,62,33.53,65.46,33.53,68.56Z"/><path class="cls-1" d="M61.91,20.49l-2.84,1.1-0.49-1.42,4.9-1.87V32.75H66.8v1.4H58v-1.4h3.92V20.49Z"/><path class="cls-1" d="M75.9,20.49l-2.84,1.1-0.49-1.42,4.9-1.87V32.75h3.33v1.4H72v-1.4H75.9V20.49Z"/><line class="cls-2" x1="134.41" y1="35.49" x2="133.65" y2="42.71"/><line class="cls-2" x1="143.71" y1="36.97" x2="142.2" y2="44.07"/><line class="cls-2" x1="152.81" y1="39.4" x2="150.57" y2="46.31"/><line class="cls-2" x1="161.61" y1="42.78" x2="158.65" y2="49.41"/><line class="cls-2" x1="170" y1="47.06" x2="166.37" y2="53.35"/><line class="cls-2" x1="177.9" y1="52.19" x2="173.63" y2="58.06"/><line class="cls-2" x1="185.22" y1="58.12" x2="180.36" y2="63.51"/><line class="cls-2" x1="191.88" y1="64.78" x2="186.49" y2="69.64"/><line class="cls-2" x1="197.81" y1="72.1" x2="191.94" y2="76.37"/><line class="cls-2" x1="202.94" y1="80" x2="196.65" y2="83.63"/><line class="cls-2" x1="207.22" y1="88.39" x2="200.59" y2="91.35"/><line class="cls-2" x1="210.6" y1="97.19" x2="203.69" y2="99.43"/><line class="cls-2" x1="213.03" y1="106.29" x2="205.93" y2="107.8"/><line class="cls-2" x1="214.51" y1="115.59" x2="207.29" y2="116.35"/><line class="cls-2" x1="215" y1="125" x2="207.74" y2="125"/><line class="cls-2" x1="214.51" y1="134.41" x2="207.29" y2="133.65"/><line class="cls-2" x1="213.03" y1="143.71" x2="205.93" y2="142.2"/><line class="cls-2" x1="210.6" y1="152.81" x2="203.69" y2="150.57"/><line class="cls-2" x1="207.22" y1="161.61" x2="200.59" y2="158.65"/><line class="cls-2" x1="202.94" y1="170" x2="196.65" y2="166.37"/><line class="cls-2" x1="197.81" y1="177.9" x2="191.94" y2="173.63"/><line class="cls-2" x1="191.88" y1="185.22" x2="186.49" y2="180.36"/><line class="cls-2" x1="185.22" y1="191.88" x2="180.36" y2="186.49"/><line class="cls-2" x1="177.9" y1="197.81" x2="173.63" y2="191.94"/><line class="cls-2" x1="170" y1="202.94" x2="166.37" y2="196.65"/><line class="cls-2" x1="161.61" y1="207.22" x2="158.65" y2="200.59"/><line class="cls-2" x1="152.81" y1="210.6" x2="150.57" y2="203.69"/><line class="cls-2" x1="143.71" y1="213.03" x2="142.2" y2="205.93"/><line class="cls-2" x1="134.41" y1="214.51" x2="133.65" y2="207.29"/><line class="cls-2" x1="125" y1="215" x2="125" y2="207.74"/><line class="cls-2" x1="115.59" y1="214.51" x2="116.35" y2="207.29"/><line class="cls-2" x1="106.29" y1="213.03" x2="107.8" y2="205.93"/><line class="cls-2" x1="97.19" y1="210.6" x2="99.43" y2="203.69"/><line class="cls-2" x1="88.39" y1="207.22" x2="91.35" y2="200.59"/><line class="cls-2" x1="80" y1="202.94" x2="83.63" y2="196.65"/><line class="cls-2" x1="72.1" y1="197.81" x2="76.37" y2="191.94"/><line class="cls-2" x1="64.78" y1="191.88" x2="69.64" y2="186.49"/><line class="cls-2" x1="58.12" y1="185.22" x2="63.51" y2="180.36"/><line class="cls-2" x1="52.19" y1="177.9" x2="58.06" y2="173.63"/><line class="cls-2" x1="47.06" y1="170" x2="53.35" y2="166.37"/><line class="cls-2" x1="42.78" y1="161.61" x2="49.41" y2="158.65"/><line class="cls-2" x1="39.4" y1="152.81" x2="46.31" y2="150.57"/><line class="cls-2" x1="36.97" y1="143.71" x2="44.07" y2="142.2"/><line class="cls-2" x1="35.49" y1="134.41" x2="42.71" y2="133.65"/><line class="cls-2" x1="35" y1="125" x2="42.26" y2="125"/><line class="cls-2" x1="35.49" y1="115.59" x2="42.71" y2="116.35"/><line class="cls-2" x1="36.97" y1="106.29" x2="44.07" y2="107.8"/><line class="cls-2" x1="39.4" y1="97.19" x2="46.31" y2="99.43"/><line class="cls-2" x1="42.78" y1="88.39" x2="49.41" y2="91.35"/><line class="cls-2" x1="47.06" y1="80" x2="53.35" y2="83.63"/><line class="cls-2" x1="52.19" y1="72.1" x2="58.06" y2="76.37"/><line class="cls-2" x1="58.12" y1="64.78" x2="63.51" y2="69.64"/><line class="cls-2" x1="64.78" y1="58.12" x2="69.64" y2="63.51"/><line class="cls-2" x1="72.1" y1="52.19" x2="76.37" y2="58.06"/><line class="cls-2" x1="80" y1="47.06" x2="83.63" y2="53.35"/><line class="cls-2" x1="88.39" y1="42.78" x2="91.35" y2="49.41"/><line class="cls-2" x1="97.19" y1="39.4" x2="99.43" y2="46.31"/><line class="cls-2" x1="106.29" y1="36.97" x2="107.8" y2="44.07"/><line class="cls-2" x1="115.59" y1="35.49" x2="116.35" y2="42.71"/><line class="cls-2" x1="125" y1="35" x2="125" y2="42.26"/></svg>
diff --git a/modules/default/clock/faces/face-004.svg b/modules/default/clock/faces/face-004.svg
index 140955d7..bc97588c 100644
--- a/modules/default/clock/faces/face-004.svg
+++ b/modules/default/clock/faces/face-004.svg
@@ -1 +1 @@
-<svg id="Hour_Markers_-_Doubles" data-name="Hour Markers - Doubles" xmlns="https://www.w3.org/2000/svg" viewBox="0 0 250 250"><defs><style>.cls-1,.cls-2{fill:none;stroke:#fff;stroke-linecap:round;stroke-miterlimit:10;}.cls-1{stroke-width:2.98px;}.cls-2{stroke-width:0.47px;}</style></defs><title>face-004</title><line class="cls-1" x1="122.01" y1="1.75" x2="122.01" y2="16.67"/><line class="cls-1" x1="186.62" y1="18.26" x2="179.17" y2="31.18"/><line class="cls-1" x1="231.74" y1="63.37" x2="218.82" y2="70.83"/><line class="cls-1" x1="248.25" y1="127.99" x2="233.33" y2="127.99"/><line class="cls-1" x1="231.74" y1="186.62" x2="218.82" y2="179.17"/><line class="cls-1" x1="186.63" y1="231.74" x2="179.17" y2="218.82"/><line class="cls-1" x1="127.99" y1="248.25" x2="127.99" y2="233.33"/><line class="cls-1" x1="63.38" y1="231.74" x2="70.83" y2="218.82"/><line class="cls-1" x1="18.26" y1="186.63" x2="31.18" y2="179.17"/><line class="cls-1" x1="1.75" y1="122.01" x2="16.67" y2="122.01"/><line class="cls-1" x1="18.26" y1="63.38" x2="31.18" y2="70.83"/><line class="cls-1" x1="63.37" y1="18.26" x2="70.83" y2="31.18"/><line class="cls-1" x1="127.99" y1="1.75" x2="127.99" y2="16.67"/><line class="cls-1" x1="248.25" y1="122.01" x2="233.33" y2="122.01"/><line class="cls-1" x1="122.01" y1="248.25" x2="122.01" y2="233.33"/><line class="cls-1" x1="1.75" y1="127.99" x2="16.67" y2="127.99"/><line class="cls-2" x1="134.41" y1="35.49" x2="133.65" y2="42.71"/><line class="cls-2" x1="143.71" y1="36.97" x2="142.2" y2="44.07"/><line class="cls-2" x1="152.81" y1="39.4" x2="150.57" y2="46.31"/><line class="cls-2" x1="161.61" y1="42.78" x2="158.65" y2="49.41"/><line class="cls-2" x1="170" y1="47.06" x2="166.37" y2="53.35"/><line class="cls-2" x1="177.9" y1="52.19" x2="173.63" y2="58.06"/><line class="cls-2" x1="185.22" y1="58.12" x2="180.36" y2="63.51"/><line class="cls-2" x1="191.88" y1="64.78" x2="186.49" y2="69.64"/><line class="cls-2" x1="197.81" y1="72.1" x2="191.94" y2="76.37"/><line class="cls-2" x1="202.94" y1="80" x2="196.65" y2="83.63"/><line class="cls-2" x1="207.22" y1="88.39" x2="200.59" y2="91.35"/><line class="cls-2" x1="210.6" y1="97.19" x2="203.69" y2="99.43"/><line class="cls-2" x1="213.03" y1="106.29" x2="205.93" y2="107.8"/><line class="cls-2" x1="214.51" y1="115.59" x2="207.29" y2="116.35"/><line class="cls-2" x1="215" y1="125" x2="207.74" y2="125"/><line class="cls-2" x1="214.51" y1="134.41" x2="207.29" y2="133.65"/><line class="cls-2" x1="213.03" y1="143.71" x2="205.93" y2="142.2"/><line class="cls-2" x1="210.6" y1="152.81" x2="203.69" y2="150.57"/><line class="cls-2" x1="207.22" y1="161.61" x2="200.59" y2="158.65"/><line class="cls-2" x1="202.94" y1="170" x2="196.65" y2="166.37"/><line class="cls-2" x1="197.81" y1="177.9" x2="191.94" y2="173.63"/><line class="cls-2" x1="191.88" y1="185.22" x2="186.49" y2="180.36"/><line class="cls-2" x1="185.22" y1="191.88" x2="180.36" y2="186.49"/><line class="cls-2" x1="177.9" y1="197.81" x2="173.63" y2="191.94"/><line class="cls-2" x1="170" y1="202.94" x2="166.37" y2="196.65"/><line class="cls-2" x1="161.61" y1="207.22" x2="158.65" y2="200.59"/><line class="cls-2" x1="152.81" y1="210.6" x2="150.57" y2="203.69"/><line class="cls-2" x1="143.71" y1="213.03" x2="142.2" y2="205.93"/><line class="cls-2" x1="134.41" y1="214.51" x2="133.65" y2="207.29"/><line class="cls-2" x1="125" y1="215" x2="125" y2="207.74"/><line class="cls-2" x1="115.59" y1="214.51" x2="116.35" y2="207.29"/><line class="cls-2" x1="106.29" y1="213.03" x2="107.8" y2="205.93"/><line class="cls-2" x1="97.19" y1="210.6" x2="99.43" y2="203.69"/><line class="cls-2" x1="88.39" y1="207.22" x2="91.35" y2="200.59"/><line class="cls-2" x1="80" y1="202.94" x2="83.63" y2="196.65"/><line class="cls-2" x1="72.1" y1="197.81" x2="76.37" y2="191.94"/><line class="cls-2" x1="64.78" y1="191.88" x2="69.64" y2="186.49"/><line class="cls-2" x1="58.12" y1="185.22" x2="63.51" y2="180.36"/><line class="cls-2" x1="52.19" y1="177.9" x2="58.06" y2="173.63"/><line class="cls-2" x1="47.06" y1="170" x2="53.35" y2="166.37"/><line class="cls-2" x1="42.78" y1="161.61" x2="49.41" y2="158.65"/><line class="cls-2" x1="39.4" y1="152.81" x2="46.31" y2="150.57"/><line class="cls-2" x1="36.97" y1="143.71" x2="44.07" y2="142.2"/><line class="cls-2" x1="35.49" y1="134.41" x2="42.71" y2="133.65"/><line class="cls-2" x1="35" y1="125" x2="42.26" y2="125"/><line class="cls-2" x1="35.49" y1="115.59" x2="42.71" y2="116.35"/><line class="cls-2" x1="36.97" y1="106.29" x2="44.07" y2="107.8"/><line class="cls-2" x1="39.4" y1="97.19" x2="46.31" y2="99.43"/><line class="cls-2" x1="42.78" y1="88.39" x2="49.41" y2="91.35"/><line class="cls-2" x1="47.06" y1="80" x2="53.35" y2="83.63"/><line class="cls-2" x1="52.19" y1="72.1" x2="58.06" y2="76.37"/><line class="cls-2" x1="58.12" y1="64.78" x2="63.51" y2="69.64"/><line class="cls-2" x1="64.78" y1="58.12" x2="69.64" y2="63.51"/><line class="cls-2" x1="72.1" y1="52.19" x2="76.37" y2="58.06"/><line class="cls-2" x1="80" y1="47.06" x2="83.63" y2="53.35"/><line class="cls-2" x1="88.39" y1="42.78" x2="91.35" y2="49.41"/><line class="cls-2" x1="97.19" y1="39.4" x2="99.43" y2="46.31"/><line class="cls-2" x1="106.29" y1="36.97" x2="107.8" y2="44.07"/><line class="cls-2" x1="115.59" y1="35.49" x2="116.35" y2="42.71"/><line class="cls-2" x1="125" y1="35" x2="125" y2="42.26"/></svg>
+<svg id="Hour_Markers_-_Doubles" data-name="Hour Markers - Doubles" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 250 250"><defs><style>.cls-1,.cls-2{fill:none;stroke:#fff;stroke-linecap:round;stroke-miterlimit:10;}.cls-1{stroke-width:2.98px;}.cls-2{stroke-width:0.47px;}</style></defs><title>face-004</title><line class="cls-1" x1="122.01" y1="1.75" x2="122.01" y2="16.67"/><line class="cls-1" x1="186.62" y1="18.26" x2="179.17" y2="31.18"/><line class="cls-1" x1="231.74" y1="63.37" x2="218.82" y2="70.83"/><line class="cls-1" x1="248.25" y1="127.99" x2="233.33" y2="127.99"/><line class="cls-1" x1="231.74" y1="186.62" x2="218.82" y2="179.17"/><line class="cls-1" x1="186.63" y1="231.74" x2="179.17" y2="218.82"/><line class="cls-1" x1="127.99" y1="248.25" x2="127.99" y2="233.33"/><line class="cls-1" x1="63.38" y1="231.74" x2="70.83" y2="218.82"/><line class="cls-1" x1="18.26" y1="186.63" x2="31.18" y2="179.17"/><line class="cls-1" x1="1.75" y1="122.01" x2="16.67" y2="122.01"/><line class="cls-1" x1="18.26" y1="63.38" x2="31.18" y2="70.83"/><line class="cls-1" x1="63.37" y1="18.26" x2="70.83" y2="31.18"/><line class="cls-1" x1="127.99" y1="1.75" x2="127.99" y2="16.67"/><line class="cls-1" x1="248.25" y1="122.01" x2="233.33" y2="122.01"/><line class="cls-1" x1="122.01" y1="248.25" x2="122.01" y2="233.33"/><line class="cls-1" x1="1.75" y1="127.99" x2="16.67" y2="127.99"/><line class="cls-2" x1="134.41" y1="35.49" x2="133.65" y2="42.71"/><line class="cls-2" x1="143.71" y1="36.97" x2="142.2" y2="44.07"/><line class="cls-2" x1="152.81" y1="39.4" x2="150.57" y2="46.31"/><line class="cls-2" x1="161.61" y1="42.78" x2="158.65" y2="49.41"/><line class="cls-2" x1="170" y1="47.06" x2="166.37" y2="53.35"/><line class="cls-2" x1="177.9" y1="52.19" x2="173.63" y2="58.06"/><line class="cls-2" x1="185.22" y1="58.12" x2="180.36" y2="63.51"/><line class="cls-2" x1="191.88" y1="64.78" x2="186.49" y2="69.64"/><line class="cls-2" x1="197.81" y1="72.1" x2="191.94" y2="76.37"/><line class="cls-2" x1="202.94" y1="80" x2="196.65" y2="83.63"/><line class="cls-2" x1="207.22" y1="88.39" x2="200.59" y2="91.35"/><line class="cls-2" x1="210.6" y1="97.19" x2="203.69" y2="99.43"/><line class="cls-2" x1="213.03" y1="106.29" x2="205.93" y2="107.8"/><line class="cls-2" x1="214.51" y1="115.59" x2="207.29" y2="116.35"/><line class="cls-2" x1="215" y1="125" x2="207.74" y2="125"/><line class="cls-2" x1="214.51" y1="134.41" x2="207.29" y2="133.65"/><line class="cls-2" x1="213.03" y1="143.71" x2="205.93" y2="142.2"/><line class="cls-2" x1="210.6" y1="152.81" x2="203.69" y2="150.57"/><line class="cls-2" x1="207.22" y1="161.61" x2="200.59" y2="158.65"/><line class="cls-2" x1="202.94" y1="170" x2="196.65" y2="166.37"/><line class="cls-2" x1="197.81" y1="177.9" x2="191.94" y2="173.63"/><line class="cls-2" x1="191.88" y1="185.22" x2="186.49" y2="180.36"/><line class="cls-2" x1="185.22" y1="191.88" x2="180.36" y2="186.49"/><line class="cls-2" x1="177.9" y1="197.81" x2="173.63" y2="191.94"/><line class="cls-2" x1="170" y1="202.94" x2="166.37" y2="196.65"/><line class="cls-2" x1="161.61" y1="207.22" x2="158.65" y2="200.59"/><line class="cls-2" x1="152.81" y1="210.6" x2="150.57" y2="203.69"/><line class="cls-2" x1="143.71" y1="213.03" x2="142.2" y2="205.93"/><line class="cls-2" x1="134.41" y1="214.51" x2="133.65" y2="207.29"/><line class="cls-2" x1="125" y1="215" x2="125" y2="207.74"/><line class="cls-2" x1="115.59" y1="214.51" x2="116.35" y2="207.29"/><line class="cls-2" x1="106.29" y1="213.03" x2="107.8" y2="205.93"/><line class="cls-2" x1="97.19" y1="210.6" x2="99.43" y2="203.69"/><line class="cls-2" x1="88.39" y1="207.22" x2="91.35" y2="200.59"/><line class="cls-2" x1="80" y1="202.94" x2="83.63" y2="196.65"/><line class="cls-2" x1="72.1" y1="197.81" x2="76.37" y2="191.94"/><line class="cls-2" x1="64.78" y1="191.88" x2="69.64" y2="186.49"/><line class="cls-2" x1="58.12" y1="185.22" x2="63.51" y2="180.36"/><line class="cls-2" x1="52.19" y1="177.9" x2="58.06" y2="173.63"/><line class="cls-2" x1="47.06" y1="170" x2="53.35" y2="166.37"/><line class="cls-2" x1="42.78" y1="161.61" x2="49.41" y2="158.65"/><line class="cls-2" x1="39.4" y1="152.81" x2="46.31" y2="150.57"/><line class="cls-2" x1="36.97" y1="143.71" x2="44.07" y2="142.2"/><line class="cls-2" x1="35.49" y1="134.41" x2="42.71" y2="133.65"/><line class="cls-2" x1="35" y1="125" x2="42.26" y2="125"/><line class="cls-2" x1="35.49" y1="115.59" x2="42.71" y2="116.35"/><line class="cls-2" x1="36.97" y1="106.29" x2="44.07" y2="107.8"/><line class="cls-2" x1="39.4" y1="97.19" x2="46.31" y2="99.43"/><line class="cls-2" x1="42.78" y1="88.39" x2="49.41" y2="91.35"/><line class="cls-2" x1="47.06" y1="80" x2="53.35" y2="83.63"/><line class="cls-2" x1="52.19" y1="72.1" x2="58.06" y2="76.37"/><line class="cls-2" x1="58.12" y1="64.78" x2="63.51" y2="69.64"/><line class="cls-2" x1="64.78" y1="58.12" x2="69.64" y2="63.51"/><line class="cls-2" x1="72.1" y1="52.19" x2="76.37" y2="58.06"/><line class="cls-2" x1="80" y1="47.06" x2="83.63" y2="53.35"/><line class="cls-2" x1="88.39" y1="42.78" x2="91.35" y2="49.41"/><line class="cls-2" x1="97.19" y1="39.4" x2="99.43" y2="46.31"/><line class="cls-2" x1="106.29" y1="36.97" x2="107.8" y2="44.07"/><line class="cls-2" x1="115.59" y1="35.49" x2="116.35" y2="42.71"/><line class="cls-2" x1="125" y1="35" x2="125" y2="42.26"/></svg>
diff --git a/modules/default/clock/faces/face-005.svg b/modules/default/clock/faces/face-005.svg
index fb52a435..0bc1b430 100644
--- a/modules/default/clock/faces/face-005.svg
+++ b/modules/default/clock/faces/face-005.svg
@@ -1 +1 @@
-<svg id="Hour_Markers_-_Roman" data-name="Hour Markers - Roman" xmlns="https://www.w3.org/2000/svg" viewBox="0 0 150 150"><defs><style>.cls-1{fill:#fff;}.cls-2{fill:none;stroke:#fff;stroke-linecap:round;stroke-miterlimit:10;stroke-width:0.5px;}</style></defs><title>faces</title><path class="cls-1" d="M64.35,4.45V3.88Q65.5,4,66.45,4t2.44-.11V4.45a3.43,3.43,0,0,0-1.07.43,0.27,0.27,0,0,0-.1.21,2.31,2.31,0,0,0,.24.68q1,2.15,1.74,3.42,1.19-2,2.11-3.81A1.37,1.37,0,0,0,72,5a0.25,0.25,0,0,0-.1-0.19,4.22,4.22,0,0,0-1-.33V3.88Q72.16,4,72.86,4a16.81,16.81,0,0,0,1.77-.11V4.45A3.49,3.49,0,0,0,73.38,5a6.62,6.62,0,0,0-1,1.42q-1.3,2.24-2.13,3.84,0.62,1.33,1.62,3.25l1.49,2.85a1.32,1.32,0,0,0,.29.31,4.78,4.78,0,0,0,1.15.51v0.58q-1.3-.11-2.08-0.11t-2.28.11V17.15a6.18,6.18,0,0,0,1-.42,0.3,0.3,0,0,0,.08-0.22,1.84,1.84,0,0,0-.21-0.67q-1-2.22-2-4-0.88,1.43-2.19,3.95a2.28,2.28,0,0,0-.27.69,0.39,0.39,0,0,0,.11.27,2.31,2.31,0,0,0,.77.31L68,17.15v0.58a20.49,20.49,0,0,0-2.05-.11,11.91,11.91,0,0,0-1.67.11V17.15a3,3,0,0,0,1.14-.51,10.4,10.4,0,0,0,1.19-1.76q1.54-2.7,2.24-4Q68.12,9.38,66.62,6.5a6.71,6.71,0,0,0-.89-1.4A4.91,4.91,0,0,0,64.35,4.45Z"/><path class="cls-1" d="M80.28,3.88V4.45l-0.38.11A2.47,2.47,0,0,0,78.77,5a1.65,1.65,0,0,0-.15.89V6.22l0,3.92,0,5.7a1.6,1.6,0,0,0,.15.87,2,2,0,0,0,1,.32l0.49,0.12v0.58q-1.18-.11-2.27-0.11t-2.47.11V17.15l0.32-.1A2.74,2.74,0,0,0,77,16.63a1.88,1.88,0,0,0,.15-1V15.18l0-3.58q0-5.52,0-6.11A0.84,0.84,0,0,0,77,5a2.77,2.77,0,0,0-1.1-.42l-0.39-.13V3.88Q77.12,4,78,4T80.28,3.88Z"/><path class="cls-1" d="M85.75,3.88V4.45l-0.38.11A2.48,2.48,0,0,0,84.24,5a1.67,1.67,0,0,0-.15.89V6.22l0,3.92,0,5.7a1.59,1.59,0,0,0,.15.87,2,2,0,0,0,1,.32l0.49,0.12v0.58q-1.18-.11-2.27-0.11T81,17.72V17.15l0.32-.1a2.74,2.74,0,0,0,1.19-.41,1.87,1.87,0,0,0,.15-1V15.18l0-3.58q0-5.52,0-6.11A0.83,0.83,0,0,0,82.49,5a2.76,2.76,0,0,0-1.1-.42L81,4.45V3.88Q82.59,4,83.49,4T85.75,3.88Z"/><path class="cls-1" d="M112.66,14.61l-0.29.5L112,15a2.49,2.49,0,0,0-1.19-.2,1.66,1.66,0,0,0-.58.7l-0.17.3-2,3.38-2.83,4.95a1.58,1.58,0,0,0-.3.83,2,2,0,0,0,.73.79L106,26.1l-0.29.5q-1-.68-1.91-1.23t-2.2-1.14l0.29-.5,0.33,0.08a2.74,2.74,0,0,0,1.24.24,1.88,1.88,0,0,0,.61-0.76l0.23-.43,1.81-3.09q2.76-4.78,3-5.3a0.84,0.84,0,0,0,.11-0.51,2.77,2.77,0,0,0-.75-0.92l-0.27-.3,0.29-.5q1.32,0.89,2.1,1.33T112.66,14.61Z"/><path class="cls-1" d="M136.43,39.17l-0.5.29-0.28-.28a2.49,2.49,0,0,0-.93-0.76,1.67,1.67,0,0,0-.85.31l-0.29.17-3.42,1.93-4.92,2.87a1.59,1.59,0,0,0-.68.56,2,2,0,0,0,.24,1.05q0.06,0.16.14,0.48l-0.5.29q-0.5-1.07-1-2T122.07,42l0.5-.29a2.24,2.24,0,0,1,.25.23,2.75,2.75,0,0,0,1,.82,1.87,1.87,0,0,0,.91-0.35l0.42-.26,3.11-1.77q4.78-2.76,5.28-3.07a0.84,0.84,0,0,0,.35-0.38,2.77,2.77,0,0,0-.19-1.17c0-.09,0-0.22-0.08-0.4l0.5-.29q0.7,1.43,1.15,2.21T136.43,39.17Z"/><path class="cls-1" d="M139.17,43.91l-0.5.29-0.28-.28a2.48,2.48,0,0,0-.93-0.76,1.66,1.66,0,0,0-.85.31l-0.3.17-3.42,1.93L128,48.44a1.6,1.6,0,0,0-.68.56,2,2,0,0,0,.24,1.05c0,0.11.09,0.27,0.14,0.48l-0.5.29q-0.5-1.08-1-2t-1.33-2.09l0.5-.29a2.13,2.13,0,0,1,.25.23,2.76,2.76,0,0,0,1,.82,1.88,1.88,0,0,0,.91-0.35l0.42-.26,3.11-1.77q4.78-2.76,5.28-3.07a0.83,0.83,0,0,0,.35-0.38,2.77,2.77,0,0,0-.19-1.17c0-.09,0-0.22-0.08-0.4l0.5-.29q0.7,1.43,1.15,2.21T139.17,43.91Z"/><path class="cls-1" d="M146.12,71.92h-0.58c-0.05-.17-0.09-0.3-0.11-0.38a2.49,2.49,0,0,0-.42-1.13,1.67,1.67,0,0,0-.89-0.15h-0.34l-3.92,0-5.7,0a1.59,1.59,0,0,0-.87.15,2,2,0,0,0-.32,1q0,0.17-.12.49h-0.58q0.11-1.18.11-2.27t-0.11-2.47h0.58a2.06,2.06,0,0,1,.1.32,2.75,2.75,0,0,0,.42,1.19,1.87,1.87,0,0,0,1,.15h0.49l3.58,0q5.52,0,6.11,0a0.84,0.84,0,0,0,.5-0.16,2.75,2.75,0,0,0,.42-1.1l0.13-.39h0.58Q146,68.76,146,69.66T146.12,71.92Z"/><path class="cls-1" d="M146.12,77.39h-0.58c-0.05-.17-0.09-0.3-0.11-0.38a2.48,2.48,0,0,0-.42-1.13,1.66,1.66,0,0,0-.89-0.15h-0.34l-3.92,0-5.7,0a1.6,1.6,0,0,0-.87.15,2,2,0,0,0-.32,1c0,0.11-.06.28-0.12,0.49h-0.58c0.07-.79.11-1.54,0.11-2.27s0-1.58-.11-2.47h0.58a2.06,2.06,0,0,1,.1.32,2.75,2.75,0,0,0,.42,1.19,1.87,1.87,0,0,0,1,.15h0.49l3.58,0q5.52,0,6.11,0a0.84,0.84,0,0,0,.5-0.16,2.75,2.75,0,0,0,.42-1.1l0.13-.39h0.58Q146,74.23,146,75.13C146,75.79,146.05,76.55,146.12,77.39Z"/><path class="cls-1" d="M146.12,82.87h-0.58c-0.05-.17-0.09-0.3-0.11-0.38a2.49,2.49,0,0,0-.42-1.13,1.67,1.67,0,0,0-.89-0.15h-0.34l-3.92,0-5.7,0a1.59,1.59,0,0,0-.87.15,2,2,0,0,0-.32,1q0,0.17-.12.49h-0.58q0.11-1.18.11-2.27t-0.11-2.47h0.58a2,2,0,0,1,.1.32,2.75,2.75,0,0,0,.42,1.19,1.87,1.87,0,0,0,1,.15h0.49l3.58,0q5.52,0,6.11,0a0.84,0.84,0,0,0,.5-0.16,2.75,2.75,0,0,0,.42-1.1l0.13-.39h0.58Q146,79.71,146,80.6T146.12,82.87Z"/><path class="cls-1" d="M138,108.11l-0.5-.29c0-.17.07-0.3,0.1-0.38a2.46,2.46,0,0,0,.2-1.19,1.66,1.66,0,0,0-.7-0.58l-0.3-.17-3.38-2-4.95-2.83a1.59,1.59,0,0,0-.83-0.3,2,2,0,0,0-.79.73l-0.35.37-0.5-.29q0.68-1,1.23-1.91t1.14-2.2l0.5,0.29a1.9,1.9,0,0,1-.08.33,2.77,2.77,0,0,0-.23,1.24,1.86,1.86,0,0,0,.76.61l0.43,0.23,3.09,1.81q4.78,2.76,5.3,3a0.84,0.84,0,0,0,.51.11,2.75,2.75,0,0,0,.92-0.75l0.3-.27,0.5,0.29q-0.89,1.32-1.33,2.1T138,108.11Z"/><path class="cls-1" d="M122.85,106.16l0.24-.42q3.7,1,8.42,2.18,3.93,1,4.36,1a1.11,1.11,0,0,0,.48,0,4.85,4.85,0,0,0,1-.7l0.5,0.29q-0.88,1.32-1.13,1.75-0.35.62-.95,1.85l-0.5-.29c0-.09,0-0.16,0-0.21a2.57,2.57,0,0,0,.1-0.92,0.48,0.48,0,0,0-.22-0.28l-0.2-.09q-0.68-.24-4.21-1.16l-5.12-1.35q2.24,2.33,4.19,4.24,2.44,2.39,2.72,2.62l0.11,0.08a0.42,0.42,0,0,0,.32.06,3.73,3.73,0,0,0,1-.68l0.47,0.27-0.29.44q-0.63.94-.79,1.22a12.23,12.23,0,0,0-.65,1.34l-0.47-.27a3,3,0,0,0,.08-1.07,2.35,2.35,0,0,0-.54-0.8q-0.94-1.06-5.75-5.92Z"/><path class="cls-1" d="M103.21,124.55l0.42-.24q2.68,2.75,6.2,6.1,2.93,2.79,3.27,3.06a1.14,1.14,0,0,0,.43.22,4.92,4.92,0,0,0,1.19-.12l0.29,0.5q-1.42.7-1.85,0.95-0.62.35-1.75,1.13l-0.29-.5,0.14-.16a2.55,2.55,0,0,0,.54-0.75,0.49,0.49,0,0,0-.05-0.35,1.17,1.17,0,0,0-.13-0.17q-0.47-.55-3.06-3.11l-3.75-3.73q0.77,3.14,1.51,5.77,0.92,3.29,1,3.63a0.78,0.78,0,0,0,.06.13,0.43,0.43,0,0,0,.25.21,3.81,3.81,0,0,0,1.17-.11l0.27,0.47-0.47.24q-1,.5-1.29.66a12,12,0,0,0-1.23.84l-0.27-.47a3,3,0,0,0,.61-0.88,2.36,2.36,0,0,0-.07-1q-0.29-1.39-2-8Z"/><path class="cls-1" d="M77.4,132h0.48q1,3.72,2.32,8.38,1.14,3.88,1.3,4.28a1.14,1.14,0,0,0,.26.41,4.91,4.91,0,0,0,1.09.49v0.58Q81.28,146,80.78,146q-0.71,0-2.08.11v-0.58l0.2-.07a2.53,2.53,0,0,0,.84-0.37,0.47,0.47,0,0,0,.13-0.33,1.17,1.17,0,0,0,0-.21q-0.13-.71-1.1-4.23l-1.39-5.1q-0.9,3.1-1.58,5.75-0.85,3.31-.91,3.67a0.75,0.75,0,0,0,0,.14,0.43,0.43,0,0,0,.11.3,3.74,3.74,0,0,0,1.07.49v0.55l-0.53,0Q74.39,146,74.07,146a12.15,12.15,0,0,0-1.49.11v-0.55a3,3,0,0,0,1-.46,2.34,2.34,0,0,0,.42-0.87q0.45-1.35,2.25-7.94Z"/><path class="cls-1" d="M67.38,146.12v-0.58l0.38-.11a2.49,2.49,0,0,0,1.13-.42,1.67,1.67,0,0,0,.15-0.89v-0.34l0-3.92,0-5.7a1.59,1.59,0,0,0-.15-0.87,2,2,0,0,0-1-.32l-0.49-.12v-0.58q1.18,0.11,2.27.11t2.47-.11v0.58l-0.32.1a2.75,2.75,0,0,0-1.19.42,1.87,1.87,0,0,0-.15,1v0.49l0,3.58q0,5.52,0,6.11a0.84,0.84,0,0,0,.16.5,2.75,2.75,0,0,0,1.1.42l0.39,0.13v0.58Q70.53,146,69.64,146T67.38,146.12Z"/><path class="cls-1" d="M51,126.93l0.42,0.24q-1,3.7-2.18,8.42-1,3.93-1,4.36a1.14,1.14,0,0,0,0,.48,4.87,4.87,0,0,0,.7,1l-0.29.5q-1.31-.88-1.75-1.13-0.62-.36-1.85-0.95l0.29-.5,0.21,0a2.52,2.52,0,0,0,.92.1,0.47,0.47,0,0,0,.28-0.22,1.13,1.13,0,0,0,.09-0.2q0.24-.68,1.16-4.21l1.35-5.12Q47,132,45.1,133.91q-2.39,2.44-2.62,2.72l-0.08.11a0.43,0.43,0,0,0-.06.32,3.74,3.74,0,0,0,.68,1l-0.27.47-0.44-.29q-0.94-.63-1.21-0.79a12.38,12.38,0,0,0-1.34-.65l0.27-.47a3,3,0,0,0,1.07.08,2.33,2.33,0,0,0,.8-0.54q1.06-.94,5.92-5.75Z"/><path class="cls-1" d="M35.24,134.16l0.29-.5,0.38,0.1a2.49,2.49,0,0,0,1.19.2,1.68,1.68,0,0,0,.58-0.7l0.17-.3,2-3.38,2.83-4.95a1.6,1.6,0,0,0,.3-0.83,2,2,0,0,0-.73-0.79l-0.37-.35,0.29-.5q1,0.68,1.91,1.23t2.2,1.14L46,125,45.66,125a2.75,2.75,0,0,0-1.24-.24,1.88,1.88,0,0,0-.61.76l-0.23.43L41.77,129q-2.76,4.78-3,5.3a0.83,0.83,0,0,0-.11.51,2.77,2.77,0,0,0,.75.92l0.27,0.3-0.29.5q-1.32-.89-2.1-1.33T35.24,134.16Z"/><path class="cls-1" d="M30.5,131.42l0.29-.5,0.38,0.1a2.49,2.49,0,0,0,1.19.2,1.67,1.67,0,0,0,.58-0.7l0.17-.3,2-3.38,2.83-4.95a1.6,1.6,0,0,0,.31-0.83,2,2,0,0,0-.73-0.79l-0.37-.35,0.29-.5q1,0.68,1.91,1.23t2.2,1.14l-0.29.5-0.33-.08a2.75,2.75,0,0,0-1.24-.24,1.88,1.88,0,0,0-.61.76l-0.23.43L37,126.27q-2.76,4.78-3,5.3a0.83,0.83,0,0,0-.11.51,2.77,2.77,0,0,0,.75.92l0.27,0.3-0.29.5q-1.32-.89-2.1-1.33T30.5,131.42Z"/><path class="cls-1" d="M29.59,110.34l0.24,0.42q-2.74,2.68-6.1,6.2-2.79,2.93-3.06,3.27a1.14,1.14,0,0,0-.22.43,4.88,4.88,0,0,0,.12,1.19l-0.5.29q-0.7-1.42-.95-1.85-0.36-.62-1.13-1.75l0.5-.29,0.16,0.14a2.49,2.49,0,0,0,.75.54,0.47,0.47,0,0,0,.35-0.05l0.17-.13q0.55-.47,3.11-3.06l3.73-3.75q-3.14.77-5.77,1.51-3.29.92-3.63,1l-0.13.06a0.42,0.42,0,0,0-.21.25,3.72,3.72,0,0,0,.11,1.17l-0.47.27-0.24-.47q-0.5-1-.66-1.29a12.13,12.13,0,0,0-.83-1.23l0.47-.27a3,3,0,0,0,.88.61,2.36,2.36,0,0,0,1-.07q1.39-.29,8-2Z"/><path class="cls-1" d="M12.34,108.73l0.5-.29,0.28,0.28a2.49,2.49,0,0,0,.93.76,1.68,1.68,0,0,0,.85-0.31l0.3-.17,3.42-1.93,4.92-2.87a1.6,1.6,0,0,0,.68-0.56,2,2,0,0,0-.24-1.05c0-.11-0.09-0.27-0.14-0.48l0.5-.29q0.5,1.07,1,2t1.33,2.09l-0.5.29A2.08,2.08,0,0,1,26,106a2.75,2.75,0,0,0-1-.82,1.87,1.87,0,0,0-.91.35l-0.42.26-3.11,1.77q-4.78,2.76-5.28,3.07a0.83,0.83,0,0,0-.35.38,2.76,2.76,0,0,0,.19,1.17c0,0.09,0,.22.08,0.4l-0.5.29q-0.7-1.43-1.15-2.2T12.34,108.73Z"/><path class="cls-1" d="M9.6,104l0.5-.29L10.38,104a2.49,2.49,0,0,0,.93.76,1.67,1.67,0,0,0,.85-0.31l0.3-.17,3.42-1.93,4.92-2.87a1.6,1.6,0,0,0,.68-0.56,2,2,0,0,0-.24-1.05c0-.11-0.09-0.27-0.14-0.48l0.5-.29q0.5,1.07,1,2T24,101.18l-0.5.29a2.08,2.08,0,0,1-.25-0.23,2.73,2.73,0,0,0-1-.82,1.86,1.86,0,0,0-.91.35l-0.42.26-3.11,1.77q-4.78,2.76-5.28,3.07a0.84,0.84,0,0,0-.35.39,2.76,2.76,0,0,0,.19,1.17c0,0.09,0,.22.08,0.4l-0.5.29q-0.7-1.43-1.15-2.21T9.6,104Z"/><path class="cls-1" d="M6.87,99.25L7.36,99l0.28,0.28a2.49,2.49,0,0,0,.93.76,1.67,1.67,0,0,0,.85-0.31l0.3-.17,3.42-1.93,4.92-2.87a1.6,1.6,0,0,0,.68-0.56,2,2,0,0,0-.24-1.05q-0.06-.16-0.14-0.48l0.5-.29q0.5,1.07,1,2t1.33,2.09l-0.5.29a2.11,2.11,0,0,1-.25-0.23,2.73,2.73,0,0,0-1-.82,1.86,1.86,0,0,0-.91.35l-0.42.26L15.1,98.05q-4.78,2.76-5.28,3.07a0.84,0.84,0,0,0-.35.39,2.76,2.76,0,0,0,.19,1.17c0,0.09,0,.22.08,0.4l-0.5.29q-0.7-1.43-1.15-2.2T6.87,99.25Z"/><path class="cls-1" d="M3.88,78.23H4.45c0.05,0.17.09,0.3,0.11,0.38A2.48,2.48,0,0,0,5,79.74a1.67,1.67,0,0,0,.89.15H6.22l3.92,0,5.7,0a1.59,1.59,0,0,0,.87-0.15,2,2,0,0,0,.32-1q0-.17.12-0.49h0.58q-0.11,1.18-.11,2.27T17.72,83H17.15a2.06,2.06,0,0,1-.1-0.32,2.74,2.74,0,0,0-.41-1.19,1.87,1.87,0,0,0-1-.15H15.18l-3.58,0q-5.52,0-6.11,0a0.83,0.83,0,0,0-.5.16,2.76,2.76,0,0,0-.42,1.1L4.45,83H3.88Q4,81.39,4,80.49T3.88,78.23Z"/><path class="cls-1" d="M4.45,77.44H3.88Q4,76.3,4,75.34T3.88,72.9H4.45A3.43,3.43,0,0,0,4.88,74a0.27,0.27,0,0,0,.21.1,2.31,2.31,0,0,0,.68-0.24q2.15-1,3.42-1.74Q7.15,70.9,5.38,70A1.37,1.37,0,0,0,5,69.81a0.25,0.25,0,0,0-.19.1,4.22,4.22,0,0,0-.33,1H3.88Q4,69.63,4,68.94a16.81,16.81,0,0,0-.11-1.77H4.45A3.49,3.49,0,0,0,5,68.41a6.62,6.62,0,0,0,1.42,1q2.24,1.3,3.84,2.13,1.33-.62,3.25-1.62l2.85-1.49a1.32,1.32,0,0,0,.31-0.29A4.78,4.78,0,0,0,17.15,67h0.58q-0.11,1.3-.11,2.08t0.11,2.28H17.15a6.18,6.18,0,0,0-.42-1,0.3,0.3,0,0,0-.22-0.08,1.84,1.84,0,0,0-.67.21q-2.22,1-4,2,1.43,0.88,3.95,2.19a2.29,2.29,0,0,0,.69.27,0.39,0.39,0,0,0,.27-0.11A2.31,2.31,0,0,0,17.08,74l0.07-.21h0.58a20.5,20.5,0,0,0-.11,2.05,11.92,11.92,0,0,0,.11,1.67H17.15a3,3,0,0,0-.51-1.14,10.37,10.37,0,0,0-1.76-1.19q-2.7-1.55-4-2.24-1.45.68-4.32,2.19a6.74,6.74,0,0,0-1.4.89A4.93,4.93,0,0,0,4.45,77.44Z"/><path class="cls-1" d="M11.35,44.22l-0.5-.29Q11.51,43,12,42.16T13.12,40l0.5,0.29a3.45,3.45,0,0,0-.16,1.14,0.27,0.27,0,0,0,.13.19,2.32,2.32,0,0,0,.71.13q2.37,0.19,3.83.2-1.18-2-2.25-3.73a1.4,1.4,0,0,0-.27-0.34,0.25,0.25,0,0,0-.21,0,4.16,4.16,0,0,0-.76.66l-0.5-.29q0.71-1,1.06-1.61A16.76,16.76,0,0,0,16,35l0.5,0.29a3.49,3.49,0,0,0-.18,1.33A6.61,6.61,0,0,0,17,38.24q1.29,2.25,2.26,3.77,1.46,0.13,3.63.23l3.21,0.14a1.34,1.34,0,0,0,.42-0.1,4.76,4.76,0,0,0,1-.74l0.5,0.29q-0.74,1.07-1.13,1.75t-1,2l-0.5-.29a6.31,6.31,0,0,0,.16-1.11A0.3,0.3,0,0,0,25.38,44a1.83,1.83,0,0,0-.69-0.16q-2.45-.2-4.44-0.25,0.8,1.48,2.32,3.87a2.28,2.28,0,0,0,.46.58,0.39,0.39,0,0,0,.29,0A2.26,2.26,0,0,0,24,47.59l0.17-.15,0.5,0.29a20.38,20.38,0,0,0-1.12,1.73,11.85,11.85,0,0,0-.74,1.5l-0.5-.29a3,3,0,0,0,.13-1.24,10.4,10.4,0,0,0-.93-1.91q-1.57-2.69-2.39-4-1.59-.13-4.84-0.27a6.73,6.73,0,0,0-1.66.07A4.91,4.91,0,0,0,11.35,44.22Z"/><path class="cls-1" d="M32.88,17.89l-0.29-.5q1-.48,1.87-1t2.06-1.31l0.29,0.5a3.43,3.43,0,0,0-.71.91,0.27,0.27,0,0,0,0,.22,2.3,2.3,0,0,0,.55.47q2,1.35,3.22,2.09,0-2.36-.08-4.35a1.37,1.37,0,0,0-.07-0.44,0.25,0.25,0,0,0-.17-0.11,4.15,4.15,0,0,0-1,.19l-0.29-.5q1.12-.52,1.72-0.87a16.59,16.59,0,0,0,1.48-1l0.29,0.5A3.5,3.5,0,0,0,41,13.82a6.63,6.63,0,0,0-.17,1.73q0,2.59.07,4.4,1.2,0.84,3,2l2.71,1.73a1.36,1.36,0,0,0,.41.12,4.78,4.78,0,0,0,1.25-.14l0.29,0.5q-1.18.56-1.85,0.95t-1.92,1.23l-0.29-.5A6.32,6.32,0,0,0,45.17,25a0.3,0.3,0,0,0,0-.24,1.84,1.84,0,0,0-.51-0.48q-2-1.4-3.72-2.44,0,1.68.07,4.51a2.27,2.27,0,0,0,.11.73,0.38,0.38,0,0,0,.23.18,2.23,2.23,0,0,0,.82-0.11l0.22,0,0.29,0.5q-1,.44-1.83.93a11.92,11.92,0,0,0-1.39.93l-0.29-.5a3,3,0,0,0,.73-1A10.41,10.41,0,0,0,40,25.81q0-3.11-.09-4.62-1.31-.91-4.05-2.65a6.84,6.84,0,0,0-1.47-.77A5,5,0,0,0,32.88,17.89Z"/><path class="cls-1" d="M46.39,9.43l0.29,0.5-0.28.28a2.48,2.48,0,0,0-.76.93,1.66,1.66,0,0,0,.31.85l0.17,0.3L48,15.7l2.87,4.92a1.59,1.59,0,0,0,.56.68,2,2,0,0,0,1.05-.23L53,20.92l0.29,0.5q-1.07.5-2,1T49.2,23.79l-0.29-.5a2,2,0,0,1,.23-0.24,2.75,2.75,0,0,0,.82-1,1.88,1.88,0,0,0-.35-0.91l-0.26-.42-1.77-3.11q-2.76-4.78-3.07-5.28A0.84,0.84,0,0,0,44.12,12a2.78,2.78,0,0,0-1.17.19l-0.4.08-0.29-.5q1.43-.7,2.21-1.15T46.39,9.43Z"/><line class="cls-2" x1="80.64" y1="21.3" x2="80.19" y2="25.63"/><line class="cls-2" x1="86.23" y1="22.18" x2="85.32" y2="26.44"/><line class="cls-2" x1="91.69" y1="23.64" x2="90.34" y2="27.79"/><line class="cls-2" x1="96.96" y1="25.67" x2="95.19" y2="29.65"/><line class="cls-2" x1="102" y1="28.23" x2="99.82" y2="32.01"/><line class="cls-2" x1="106.74" y1="31.31" x2="104.18" y2="34.84"/><line class="cls-2" x1="111.13" y1="34.87" x2="108.22" y2="38.11"/><line class="cls-2" x1="115.13" y1="38.87" x2="111.89" y2="41.78"/><line class="cls-2" x1="118.69" y1="43.26" x2="115.16" y2="45.82"/><line class="cls-2" x1="121.77" y1="48" x2="117.99" y2="50.18"/><line class="cls-2" x1="124.33" y1="53.04" x2="120.35" y2="54.81"/><line class="cls-2" x1="126.36" y1="58.31" x2="122.21" y2="59.66"/><line class="cls-2" x1="127.82" y1="63.77" x2="123.56" y2="64.68"/><line class="cls-2" x1="128.7" y1="69.36" x2="124.37" y2="69.81"/><line class="cls-2" x1="129" y1="75" x2="124.64" y2="75"/><line class="cls-2" x1="128.7" y1="80.64" x2="124.37" y2="80.19"/><line class="cls-2" x1="127.82" y1="86.23" x2="123.56" y2="85.32"/><line class="cls-2" x1="126.36" y1="91.69" x2="122.21" y2="90.34"/><line class="cls-2" x1="124.33" y1="96.96" x2="120.35" y2="95.19"/><line class="cls-2" x1="121.77" y1="102" x2="117.99" y2="99.82"/><line class="cls-2" x1="118.69" y1="106.74" x2="115.16" y2="104.18"/><line class="cls-2" x1="115.13" y1="111.13" x2="111.89" y2="108.22"/><line class="cls-2" x1="111.13" y1="115.13" x2="108.22" y2="111.89"/><line class="cls-2" x1="106.74" y1="118.69" x2="104.18" y2="115.16"/><line class="cls-2" x1="102" y1="121.77" x2="99.82" y2="117.99"/><line class="cls-2" x1="96.96" y1="124.33" x2="95.19" y2="120.35"/><line class="cls-2" x1="91.69" y1="126.36" x2="90.34" y2="122.21"/><line class="cls-2" x1="86.23" y1="127.82" x2="85.32" y2="123.56"/><line class="cls-2" x1="80.64" y1="128.7" x2="80.19" y2="124.37"/><line class="cls-2" x1="75" y1="129" x2="75" y2="124.64"/><line class="cls-2" x1="69.36" y1="128.7" x2="69.81" y2="124.37"/><line class="cls-2" x1="63.77" y1="127.82" x2="64.68" y2="123.56"/><line class="cls-2" x1="58.31" y1="126.36" x2="59.66" y2="122.21"/><line class="cls-2" x1="53.04" y1="124.33" x2="54.81" y2="120.35"/><line class="cls-2" x1="48" y1="121.77" x2="50.18" y2="117.99"/><line class="cls-2" x1="43.26" y1="118.69" x2="45.82" y2="115.16"/><line class="cls-2" x1="38.87" y1="115.13" x2="41.78" y2="111.89"/><line class="cls-2" x1="34.87" y1="111.13" x2="38.11" y2="108.22"/><line class="cls-2" x1="31.31" y1="106.74" x2="34.84" y2="104.18"/><line class="cls-2" x1="28.23" y1="102" x2="32.01" y2="99.82"/><line class="cls-2" x1="25.67" y1="96.96" x2="29.65" y2="95.19"/><line class="cls-2" x1="23.64" y1="91.69" x2="27.79" y2="90.34"/><line class="cls-2" x1="22.18" y1="86.23" x2="26.44" y2="85.32"/><line class="cls-2" x1="21.3" y1="80.64" x2="25.63" y2="80.19"/><line class="cls-2" x1="21" y1="75" x2="25.36" y2="75"/><line class="cls-2" x1="21.3" y1="69.36" x2="25.63" y2="69.81"/><line class="cls-2" x1="22.18" y1="63.77" x2="26.44" y2="64.68"/><line class="cls-2" x1="23.64" y1="58.31" x2="27.79" y2="59.66"/><line class="cls-2" x1="25.67" y1="53.04" x2="29.65" y2="54.81"/><line class="cls-2" x1="28.23" y1="48" x2="32.01" y2="50.18"/><line class="cls-2" x1="31.31" y1="43.26" x2="34.84" y2="45.82"/><line class="cls-2" x1="34.87" y1="38.87" x2="38.11" y2="41.78"/><line class="cls-2" x1="38.87" y1="34.87" x2="41.78" y2="38.11"/><line class="cls-2" x1="43.26" y1="31.31" x2="45.82" y2="34.84"/><line class="cls-2" x1="48" y1="28.23" x2="50.18" y2="32.01"/><line class="cls-2" x1="53.04" y1="25.67" x2="54.81" y2="29.65"/><line class="cls-2" x1="58.31" y1="23.64" x2="59.66" y2="27.79"/><line class="cls-2" x1="63.77" y1="22.18" x2="64.68" y2="26.44"/><line class="cls-2" x1="69.36" y1="21.3" x2="69.81" y2="25.63"/><line class="cls-2" x1="75" y1="21" x2="75" y2="25.36"/></svg>
+<svg id="Hour_Markers_-_Roman" data-name="Hour Markers - Roman" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 150 150"><defs><style>.cls-1{fill:#fff;}.cls-2{fill:none;stroke:#fff;stroke-linecap:round;stroke-miterlimit:10;stroke-width:0.5px;}</style></defs><title>faces</title><path class="cls-1" d="M64.35,4.45V3.88Q65.5,4,66.45,4t2.44-.11V4.45a3.43,3.43,0,0,0-1.07.43,0.27,0.27,0,0,0-.1.21,2.31,2.31,0,0,0,.24.68q1,2.15,1.74,3.42,1.19-2,2.11-3.81A1.37,1.37,0,0,0,72,5a0.25,0.25,0,0,0-.1-0.19,4.22,4.22,0,0,0-1-.33V3.88Q72.16,4,72.86,4a16.81,16.81,0,0,0,1.77-.11V4.45A3.49,3.49,0,0,0,73.38,5a6.62,6.62,0,0,0-1,1.42q-1.3,2.24-2.13,3.84,0.62,1.33,1.62,3.25l1.49,2.85a1.32,1.32,0,0,0,.29.31,4.78,4.78,0,0,0,1.15.51v0.58q-1.3-.11-2.08-0.11t-2.28.11V17.15a6.18,6.18,0,0,0,1-.42,0.3,0.3,0,0,0,.08-0.22,1.84,1.84,0,0,0-.21-0.67q-1-2.22-2-4-0.88,1.43-2.19,3.95a2.28,2.28,0,0,0-.27.69,0.39,0.39,0,0,0,.11.27,2.31,2.31,0,0,0,.77.31L68,17.15v0.58a20.49,20.49,0,0,0-2.05-.11,11.91,11.91,0,0,0-1.67.11V17.15a3,3,0,0,0,1.14-.51,10.4,10.4,0,0,0,1.19-1.76q1.54-2.7,2.24-4Q68.12,9.38,66.62,6.5a6.71,6.71,0,0,0-.89-1.4A4.91,4.91,0,0,0,64.35,4.45Z"/><path class="cls-1" d="M80.28,3.88V4.45l-0.38.11A2.47,2.47,0,0,0,78.77,5a1.65,1.65,0,0,0-.15.89V6.22l0,3.92,0,5.7a1.6,1.6,0,0,0,.15.87,2,2,0,0,0,1,.32l0.49,0.12v0.58q-1.18-.11-2.27-0.11t-2.47.11V17.15l0.32-.1A2.74,2.74,0,0,0,77,16.63a1.88,1.88,0,0,0,.15-1V15.18l0-3.58q0-5.52,0-6.11A0.84,0.84,0,0,0,77,5a2.77,2.77,0,0,0-1.1-.42l-0.39-.13V3.88Q77.12,4,78,4T80.28,3.88Z"/><path class="cls-1" d="M85.75,3.88V4.45l-0.38.11A2.48,2.48,0,0,0,84.24,5a1.67,1.67,0,0,0-.15.89V6.22l0,3.92,0,5.7a1.59,1.59,0,0,0,.15.87,2,2,0,0,0,1,.32l0.49,0.12v0.58q-1.18-.11-2.27-0.11T81,17.72V17.15l0.32-.1a2.74,2.74,0,0,0,1.19-.41,1.87,1.87,0,0,0,.15-1V15.18l0-3.58q0-5.52,0-6.11A0.83,0.83,0,0,0,82.49,5a2.76,2.76,0,0,0-1.1-.42L81,4.45V3.88Q82.59,4,83.49,4T85.75,3.88Z"/><path class="cls-1" d="M112.66,14.61l-0.29.5L112,15a2.49,2.49,0,0,0-1.19-.2,1.66,1.66,0,0,0-.58.7l-0.17.3-2,3.38-2.83,4.95a1.58,1.58,0,0,0-.3.83,2,2,0,0,0,.73.79L106,26.1l-0.29.5q-1-.68-1.91-1.23t-2.2-1.14l0.29-.5,0.33,0.08a2.74,2.74,0,0,0,1.24.24,1.88,1.88,0,0,0,.61-0.76l0.23-.43,1.81-3.09q2.76-4.78,3-5.3a0.84,0.84,0,0,0,.11-0.51,2.77,2.77,0,0,0-.75-0.92l-0.27-.3,0.29-.5q1.32,0.89,2.1,1.33T112.66,14.61Z"/><path class="cls-1" d="M136.43,39.17l-0.5.29-0.28-.28a2.49,2.49,0,0,0-.93-0.76,1.67,1.67,0,0,0-.85.31l-0.29.17-3.42,1.93-4.92,2.87a1.59,1.59,0,0,0-.68.56,2,2,0,0,0,.24,1.05q0.06,0.16.14,0.48l-0.5.29q-0.5-1.07-1-2T122.07,42l0.5-.29a2.24,2.24,0,0,1,.25.23,2.75,2.75,0,0,0,1,.82,1.87,1.87,0,0,0,.91-0.35l0.42-.26,3.11-1.77q4.78-2.76,5.28-3.07a0.84,0.84,0,0,0,.35-0.38,2.77,2.77,0,0,0-.19-1.17c0-.09,0-0.22-0.08-0.4l0.5-.29q0.7,1.43,1.15,2.21T136.43,39.17Z"/><path class="cls-1" d="M139.17,43.91l-0.5.29-0.28-.28a2.48,2.48,0,0,0-.93-0.76,1.66,1.66,0,0,0-.85.31l-0.3.17-3.42,1.93L128,48.44a1.6,1.6,0,0,0-.68.56,2,2,0,0,0,.24,1.05c0,0.11.09,0.27,0.14,0.48l-0.5.29q-0.5-1.08-1-2t-1.33-2.09l0.5-.29a2.13,2.13,0,0,1,.25.23,2.76,2.76,0,0,0,1,.82,1.88,1.88,0,0,0,.91-0.35l0.42-.26,3.11-1.77q4.78-2.76,5.28-3.07a0.83,0.83,0,0,0,.35-0.38,2.77,2.77,0,0,0-.19-1.17c0-.09,0-0.22-0.08-0.4l0.5-.29q0.7,1.43,1.15,2.21T139.17,43.91Z"/><path class="cls-1" d="M146.12,71.92h-0.58c-0.05-.17-0.09-0.3-0.11-0.38a2.49,2.49,0,0,0-.42-1.13,1.67,1.67,0,0,0-.89-0.15h-0.34l-3.92,0-5.7,0a1.59,1.59,0,0,0-.87.15,2,2,0,0,0-.32,1q0,0.17-.12.49h-0.58q0.11-1.18.11-2.27t-0.11-2.47h0.58a2.06,2.06,0,0,1,.1.32,2.75,2.75,0,0,0,.42,1.19,1.87,1.87,0,0,0,1,.15h0.49l3.58,0q5.52,0,6.11,0a0.84,0.84,0,0,0,.5-0.16,2.75,2.75,0,0,0,.42-1.1l0.13-.39h0.58Q146,68.76,146,69.66T146.12,71.92Z"/><path class="cls-1" d="M146.12,77.39h-0.58c-0.05-.17-0.09-0.3-0.11-0.38a2.48,2.48,0,0,0-.42-1.13,1.66,1.66,0,0,0-.89-0.15h-0.34l-3.92,0-5.7,0a1.6,1.6,0,0,0-.87.15,2,2,0,0,0-.32,1c0,0.11-.06.28-0.12,0.49h-0.58c0.07-.79.11-1.54,0.11-2.27s0-1.58-.11-2.47h0.58a2.06,2.06,0,0,1,.1.32,2.75,2.75,0,0,0,.42,1.19,1.87,1.87,0,0,0,1,.15h0.49l3.58,0q5.52,0,6.11,0a0.84,0.84,0,0,0,.5-0.16,2.75,2.75,0,0,0,.42-1.1l0.13-.39h0.58Q146,74.23,146,75.13C146,75.79,146.05,76.55,146.12,77.39Z"/><path class="cls-1" d="M146.12,82.87h-0.58c-0.05-.17-0.09-0.3-0.11-0.38a2.49,2.49,0,0,0-.42-1.13,1.67,1.67,0,0,0-.89-0.15h-0.34l-3.92,0-5.7,0a1.59,1.59,0,0,0-.87.15,2,2,0,0,0-.32,1q0,0.17-.12.49h-0.58q0.11-1.18.11-2.27t-0.11-2.47h0.58a2,2,0,0,1,.1.32,2.75,2.75,0,0,0,.42,1.19,1.87,1.87,0,0,0,1,.15h0.49l3.58,0q5.52,0,6.11,0a0.84,0.84,0,0,0,.5-0.16,2.75,2.75,0,0,0,.42-1.1l0.13-.39h0.58Q146,79.71,146,80.6T146.12,82.87Z"/><path class="cls-1" d="M138,108.11l-0.5-.29c0-.17.07-0.3,0.1-0.38a2.46,2.46,0,0,0,.2-1.19,1.66,1.66,0,0,0-.7-0.58l-0.3-.17-3.38-2-4.95-2.83a1.59,1.59,0,0,0-.83-0.3,2,2,0,0,0-.79.73l-0.35.37-0.5-.29q0.68-1,1.23-1.91t1.14-2.2l0.5,0.29a1.9,1.9,0,0,1-.08.33,2.77,2.77,0,0,0-.23,1.24,1.86,1.86,0,0,0,.76.61l0.43,0.23,3.09,1.81q4.78,2.76,5.3,3a0.84,0.84,0,0,0,.51.11,2.75,2.75,0,0,0,.92-0.75l0.3-.27,0.5,0.29q-0.89,1.32-1.33,2.1T138,108.11Z"/><path class="cls-1" d="M122.85,106.16l0.24-.42q3.7,1,8.42,2.18,3.93,1,4.36,1a1.11,1.11,0,0,0,.48,0,4.85,4.85,0,0,0,1-.7l0.5,0.29q-0.88,1.32-1.13,1.75-0.35.62-.95,1.85l-0.5-.29c0-.09,0-0.16,0-0.21a2.57,2.57,0,0,0,.1-0.92,0.48,0.48,0,0,0-.22-0.28l-0.2-.09q-0.68-.24-4.21-1.16l-5.12-1.35q2.24,2.33,4.19,4.24,2.44,2.39,2.72,2.62l0.11,0.08a0.42,0.42,0,0,0,.32.06,3.73,3.73,0,0,0,1-.68l0.47,0.27-0.29.44q-0.63.94-.79,1.22a12.23,12.23,0,0,0-.65,1.34l-0.47-.27a3,3,0,0,0,.08-1.07,2.35,2.35,0,0,0-.54-0.8q-0.94-1.06-5.75-5.92Z"/><path class="cls-1" d="M103.21,124.55l0.42-.24q2.68,2.75,6.2,6.1,2.93,2.79,3.27,3.06a1.14,1.14,0,0,0,.43.22,4.92,4.92,0,0,0,1.19-.12l0.29,0.5q-1.42.7-1.85,0.95-0.62.35-1.75,1.13l-0.29-.5,0.14-.16a2.55,2.55,0,0,0,.54-0.75,0.49,0.49,0,0,0-.05-0.35,1.17,1.17,0,0,0-.13-0.17q-0.47-.55-3.06-3.11l-3.75-3.73q0.77,3.14,1.51,5.77,0.92,3.29,1,3.63a0.78,0.78,0,0,0,.06.13,0.43,0.43,0,0,0,.25.21,3.81,3.81,0,0,0,1.17-.11l0.27,0.47-0.47.24q-1,.5-1.29.66a12,12,0,0,0-1.23.84l-0.27-.47a3,3,0,0,0,.61-0.88,2.36,2.36,0,0,0-.07-1q-0.29-1.39-2-8Z"/><path class="cls-1" d="M77.4,132h0.48q1,3.72,2.32,8.38,1.14,3.88,1.3,4.28a1.14,1.14,0,0,0,.26.41,4.91,4.91,0,0,0,1.09.49v0.58Q81.28,146,80.78,146q-0.71,0-2.08.11v-0.58l0.2-.07a2.53,2.53,0,0,0,.84-0.37,0.47,0.47,0,0,0,.13-0.33,1.17,1.17,0,0,0,0-.21q-0.13-.71-1.1-4.23l-1.39-5.1q-0.9,3.1-1.58,5.75-0.85,3.31-.91,3.67a0.75,0.75,0,0,0,0,.14,0.43,0.43,0,0,0,.11.3,3.74,3.74,0,0,0,1.07.49v0.55l-0.53,0Q74.39,146,74.07,146a12.15,12.15,0,0,0-1.49.11v-0.55a3,3,0,0,0,1-.46,2.34,2.34,0,0,0,.42-0.87q0.45-1.35,2.25-7.94Z"/><path class="cls-1" d="M67.38,146.12v-0.58l0.38-.11a2.49,2.49,0,0,0,1.13-.42,1.67,1.67,0,0,0,.15-0.89v-0.34l0-3.92,0-5.7a1.59,1.59,0,0,0-.15-0.87,2,2,0,0,0-1-.32l-0.49-.12v-0.58q1.18,0.11,2.27.11t2.47-.11v0.58l-0.32.1a2.75,2.75,0,0,0-1.19.42,1.87,1.87,0,0,0-.15,1v0.49l0,3.58q0,5.52,0,6.11a0.84,0.84,0,0,0,.16.5,2.75,2.75,0,0,0,1.1.42l0.39,0.13v0.58Q70.53,146,69.64,146T67.38,146.12Z"/><path class="cls-1" d="M51,126.93l0.42,0.24q-1,3.7-2.18,8.42-1,3.93-1,4.36a1.14,1.14,0,0,0,0,.48,4.87,4.87,0,0,0,.7,1l-0.29.5q-1.31-.88-1.75-1.13-0.62-.36-1.85-0.95l0.29-.5,0.21,0a2.52,2.52,0,0,0,.92.1,0.47,0.47,0,0,0,.28-0.22,1.13,1.13,0,0,0,.09-0.2q0.24-.68,1.16-4.21l1.35-5.12Q47,132,45.1,133.91q-2.39,2.44-2.62,2.72l-0.08.11a0.43,0.43,0,0,0-.06.32,3.74,3.74,0,0,0,.68,1l-0.27.47-0.44-.29q-0.94-.63-1.21-0.79a12.38,12.38,0,0,0-1.34-.65l0.27-.47a3,3,0,0,0,1.07.08,2.33,2.33,0,0,0,.8-0.54q1.06-.94,5.92-5.75Z"/><path class="cls-1" d="M35.24,134.16l0.29-.5,0.38,0.1a2.49,2.49,0,0,0,1.19.2,1.68,1.68,0,0,0,.58-0.7l0.17-.3,2-3.38,2.83-4.95a1.6,1.6,0,0,0,.3-0.83,2,2,0,0,0-.73-0.79l-0.37-.35,0.29-.5q1,0.68,1.91,1.23t2.2,1.14L46,125,45.66,125a2.75,2.75,0,0,0-1.24-.24,1.88,1.88,0,0,0-.61.76l-0.23.43L41.77,129q-2.76,4.78-3,5.3a0.83,0.83,0,0,0-.11.51,2.77,2.77,0,0,0,.75.92l0.27,0.3-0.29.5q-1.32-.89-2.1-1.33T35.24,134.16Z"/><path class="cls-1" d="M30.5,131.42l0.29-.5,0.38,0.1a2.49,2.49,0,0,0,1.19.2,1.67,1.67,0,0,0,.58-0.7l0.17-.3,2-3.38,2.83-4.95a1.6,1.6,0,0,0,.31-0.83,2,2,0,0,0-.73-0.79l-0.37-.35,0.29-.5q1,0.68,1.91,1.23t2.2,1.14l-0.29.5-0.33-.08a2.75,2.75,0,0,0-1.24-.24,1.88,1.88,0,0,0-.61.76l-0.23.43L37,126.27q-2.76,4.78-3,5.3a0.83,0.83,0,0,0-.11.51,2.77,2.77,0,0,0,.75.92l0.27,0.3-0.29.5q-1.32-.89-2.1-1.33T30.5,131.42Z"/><path class="cls-1" d="M29.59,110.34l0.24,0.42q-2.74,2.68-6.1,6.2-2.79,2.93-3.06,3.27a1.14,1.14,0,0,0-.22.43,4.88,4.88,0,0,0,.12,1.19l-0.5.29q-0.7-1.42-.95-1.85-0.36-.62-1.13-1.75l0.5-.29,0.16,0.14a2.49,2.49,0,0,0,.75.54,0.47,0.47,0,0,0,.35-0.05l0.17-.13q0.55-.47,3.11-3.06l3.73-3.75q-3.14.77-5.77,1.51-3.29.92-3.63,1l-0.13.06a0.42,0.42,0,0,0-.21.25,3.72,3.72,0,0,0,.11,1.17l-0.47.27-0.24-.47q-0.5-1-.66-1.29a12.13,12.13,0,0,0-.83-1.23l0.47-.27a3,3,0,0,0,.88.61,2.36,2.36,0,0,0,1-.07q1.39-.29,8-2Z"/><path class="cls-1" d="M12.34,108.73l0.5-.29,0.28,0.28a2.49,2.49,0,0,0,.93.76,1.68,1.68,0,0,0,.85-0.31l0.3-.17,3.42-1.93,4.92-2.87a1.6,1.6,0,0,0,.68-0.56,2,2,0,0,0-.24-1.05c0-.11-0.09-0.27-0.14-0.48l0.5-.29q0.5,1.07,1,2t1.33,2.09l-0.5.29A2.08,2.08,0,0,1,26,106a2.75,2.75,0,0,0-1-.82,1.87,1.87,0,0,0-.91.35l-0.42.26-3.11,1.77q-4.78,2.76-5.28,3.07a0.83,0.83,0,0,0-.35.38,2.76,2.76,0,0,0,.19,1.17c0,0.09,0,.22.08,0.4l-0.5.29q-0.7-1.43-1.15-2.2T12.34,108.73Z"/><path class="cls-1" d="M9.6,104l0.5-.29L10.38,104a2.49,2.49,0,0,0,.93.76,1.67,1.67,0,0,0,.85-0.31l0.3-.17,3.42-1.93,4.92-2.87a1.6,1.6,0,0,0,.68-0.56,2,2,0,0,0-.24-1.05c0-.11-0.09-0.27-0.14-0.48l0.5-.29q0.5,1.07,1,2T24,101.18l-0.5.29a2.08,2.08,0,0,1-.25-0.23,2.73,2.73,0,0,0-1-.82,1.86,1.86,0,0,0-.91.35l-0.42.26-3.11,1.77q-4.78,2.76-5.28,3.07a0.84,0.84,0,0,0-.35.39,2.76,2.76,0,0,0,.19,1.17c0,0.09,0,.22.08,0.4l-0.5.29q-0.7-1.43-1.15-2.21T9.6,104Z"/><path class="cls-1" d="M6.87,99.25L7.36,99l0.28,0.28a2.49,2.49,0,0,0,.93.76,1.67,1.67,0,0,0,.85-0.31l0.3-.17,3.42-1.93,4.92-2.87a1.6,1.6,0,0,0,.68-0.56,2,2,0,0,0-.24-1.05q-0.06-.16-0.14-0.48l0.5-.29q0.5,1.07,1,2t1.33,2.09l-0.5.29a2.11,2.11,0,0,1-.25-0.23,2.73,2.73,0,0,0-1-.82,1.86,1.86,0,0,0-.91.35l-0.42.26L15.1,98.05q-4.78,2.76-5.28,3.07a0.84,0.84,0,0,0-.35.39,2.76,2.76,0,0,0,.19,1.17c0,0.09,0,.22.08,0.4l-0.5.29q-0.7-1.43-1.15-2.2T6.87,99.25Z"/><path class="cls-1" d="M3.88,78.23H4.45c0.05,0.17.09,0.3,0.11,0.38A2.48,2.48,0,0,0,5,79.74a1.67,1.67,0,0,0,.89.15H6.22l3.92,0,5.7,0a1.59,1.59,0,0,0,.87-0.15,2,2,0,0,0,.32-1q0-.17.12-0.49h0.58q-0.11,1.18-.11,2.27T17.72,83H17.15a2.06,2.06,0,0,1-.1-0.32,2.74,2.74,0,0,0-.41-1.19,1.87,1.87,0,0,0-1-.15H15.18l-3.58,0q-5.52,0-6.11,0a0.83,0.83,0,0,0-.5.16,2.76,2.76,0,0,0-.42,1.1L4.45,83H3.88Q4,81.39,4,80.49T3.88,78.23Z"/><path class="cls-1" d="M4.45,77.44H3.88Q4,76.3,4,75.34T3.88,72.9H4.45A3.43,3.43,0,0,0,4.88,74a0.27,0.27,0,0,0,.21.1,2.31,2.31,0,0,0,.68-0.24q2.15-1,3.42-1.74Q7.15,70.9,5.38,70A1.37,1.37,0,0,0,5,69.81a0.25,0.25,0,0,0-.19.1,4.22,4.22,0,0,0-.33,1H3.88Q4,69.63,4,68.94a16.81,16.81,0,0,0-.11-1.77H4.45A3.49,3.49,0,0,0,5,68.41a6.62,6.62,0,0,0,1.42,1q2.24,1.3,3.84,2.13,1.33-.62,3.25-1.62l2.85-1.49a1.32,1.32,0,0,0,.31-0.29A4.78,4.78,0,0,0,17.15,67h0.58q-0.11,1.3-.11,2.08t0.11,2.28H17.15a6.18,6.18,0,0,0-.42-1,0.3,0.3,0,0,0-.22-0.08,1.84,1.84,0,0,0-.67.21q-2.22,1-4,2,1.43,0.88,3.95,2.19a2.29,2.29,0,0,0,.69.27,0.39,0.39,0,0,0,.27-0.11A2.31,2.31,0,0,0,17.08,74l0.07-.21h0.58a20.5,20.5,0,0,0-.11,2.05,11.92,11.92,0,0,0,.11,1.67H17.15a3,3,0,0,0-.51-1.14,10.37,10.37,0,0,0-1.76-1.19q-2.7-1.55-4-2.24-1.45.68-4.32,2.19a6.74,6.74,0,0,0-1.4.89A4.93,4.93,0,0,0,4.45,77.44Z"/><path class="cls-1" d="M11.35,44.22l-0.5-.29Q11.51,43,12,42.16T13.12,40l0.5,0.29a3.45,3.45,0,0,0-.16,1.14,0.27,0.27,0,0,0,.13.19,2.32,2.32,0,0,0,.71.13q2.37,0.19,3.83.2-1.18-2-2.25-3.73a1.4,1.4,0,0,0-.27-0.34,0.25,0.25,0,0,0-.21,0,4.16,4.16,0,0,0-.76.66l-0.5-.29q0.71-1,1.06-1.61A16.76,16.76,0,0,0,16,35l0.5,0.29a3.49,3.49,0,0,0-.18,1.33A6.61,6.61,0,0,0,17,38.24q1.29,2.25,2.26,3.77,1.46,0.13,3.63.23l3.21,0.14a1.34,1.34,0,0,0,.42-0.1,4.76,4.76,0,0,0,1-.74l0.5,0.29q-0.74,1.07-1.13,1.75t-1,2l-0.5-.29a6.31,6.31,0,0,0,.16-1.11A0.3,0.3,0,0,0,25.38,44a1.83,1.83,0,0,0-.69-0.16q-2.45-.2-4.44-0.25,0.8,1.48,2.32,3.87a2.28,2.28,0,0,0,.46.58,0.39,0.39,0,0,0,.29,0A2.26,2.26,0,0,0,24,47.59l0.17-.15,0.5,0.29a20.38,20.38,0,0,0-1.12,1.73,11.85,11.85,0,0,0-.74,1.5l-0.5-.29a3,3,0,0,0,.13-1.24,10.4,10.4,0,0,0-.93-1.91q-1.57-2.69-2.39-4-1.59-.13-4.84-0.27a6.73,6.73,0,0,0-1.66.07A4.91,4.91,0,0,0,11.35,44.22Z"/><path class="cls-1" d="M32.88,17.89l-0.29-.5q1-.48,1.87-1t2.06-1.31l0.29,0.5a3.43,3.43,0,0,0-.71.91,0.27,0.27,0,0,0,0,.22,2.3,2.3,0,0,0,.55.47q2,1.35,3.22,2.09,0-2.36-.08-4.35a1.37,1.37,0,0,0-.07-0.44,0.25,0.25,0,0,0-.17-0.11,4.15,4.15,0,0,0-1,.19l-0.29-.5q1.12-.52,1.72-0.87a16.59,16.59,0,0,0,1.48-1l0.29,0.5A3.5,3.5,0,0,0,41,13.82a6.63,6.63,0,0,0-.17,1.73q0,2.59.07,4.4,1.2,0.84,3,2l2.71,1.73a1.36,1.36,0,0,0,.41.12,4.78,4.78,0,0,0,1.25-.14l0.29,0.5q-1.18.56-1.85,0.95t-1.92,1.23l-0.29-.5A6.32,6.32,0,0,0,45.17,25a0.3,0.3,0,0,0,0-.24,1.84,1.84,0,0,0-.51-0.48q-2-1.4-3.72-2.44,0,1.68.07,4.51a2.27,2.27,0,0,0,.11.73,0.38,0.38,0,0,0,.23.18,2.23,2.23,0,0,0,.82-0.11l0.22,0,0.29,0.5q-1,.44-1.83.93a11.92,11.92,0,0,0-1.39.93l-0.29-.5a3,3,0,0,0,.73-1A10.41,10.41,0,0,0,40,25.81q0-3.11-.09-4.62-1.31-.91-4.05-2.65a6.84,6.84,0,0,0-1.47-.77A5,5,0,0,0,32.88,17.89Z"/><path class="cls-1" d="M46.39,9.43l0.29,0.5-0.28.28a2.48,2.48,0,0,0-.76.93,1.66,1.66,0,0,0,.31.85l0.17,0.3L48,15.7l2.87,4.92a1.59,1.59,0,0,0,.56.68,2,2,0,0,0,1.05-.23L53,20.92l0.29,0.5q-1.07.5-2,1T49.2,23.79l-0.29-.5a2,2,0,0,1,.23-0.24,2.75,2.75,0,0,0,.82-1,1.88,1.88,0,0,0-.35-0.91l-0.26-.42-1.77-3.11q-2.76-4.78-3.07-5.28A0.84,0.84,0,0,0,44.12,12a2.78,2.78,0,0,0-1.17.19l-0.4.08-0.29-.5q1.43-.7,2.21-1.15T46.39,9.43Z"/><line class="cls-2" x1="80.64" y1="21.3" x2="80.19" y2="25.63"/><line class="cls-2" x1="86.23" y1="22.18" x2="85.32" y2="26.44"/><line class="cls-2" x1="91.69" y1="23.64" x2="90.34" y2="27.79"/><line class="cls-2" x1="96.96" y1="25.67" x2="95.19" y2="29.65"/><line class="cls-2" x1="102" y1="28.23" x2="99.82" y2="32.01"/><line class="cls-2" x1="106.74" y1="31.31" x2="104.18" y2="34.84"/><line class="cls-2" x1="111.13" y1="34.87" x2="108.22" y2="38.11"/><line class="cls-2" x1="115.13" y1="38.87" x2="111.89" y2="41.78"/><line class="cls-2" x1="118.69" y1="43.26" x2="115.16" y2="45.82"/><line class="cls-2" x1="121.77" y1="48" x2="117.99" y2="50.18"/><line class="cls-2" x1="124.33" y1="53.04" x2="120.35" y2="54.81"/><line class="cls-2" x1="126.36" y1="58.31" x2="122.21" y2="59.66"/><line class="cls-2" x1="127.82" y1="63.77" x2="123.56" y2="64.68"/><line class="cls-2" x1="128.7" y1="69.36" x2="124.37" y2="69.81"/><line class="cls-2" x1="129" y1="75" x2="124.64" y2="75"/><line class="cls-2" x1="128.7" y1="80.64" x2="124.37" y2="80.19"/><line class="cls-2" x1="127.82" y1="86.23" x2="123.56" y2="85.32"/><line class="cls-2" x1="126.36" y1="91.69" x2="122.21" y2="90.34"/><line class="cls-2" x1="124.33" y1="96.96" x2="120.35" y2="95.19"/><line class="cls-2" x1="121.77" y1="102" x2="117.99" y2="99.82"/><line class="cls-2" x1="118.69" y1="106.74" x2="115.16" y2="104.18"/><line class="cls-2" x1="115.13" y1="111.13" x2="111.89" y2="108.22"/><line class="cls-2" x1="111.13" y1="115.13" x2="108.22" y2="111.89"/><line class="cls-2" x1="106.74" y1="118.69" x2="104.18" y2="115.16"/><line class="cls-2" x1="102" y1="121.77" x2="99.82" y2="117.99"/><line class="cls-2" x1="96.96" y1="124.33" x2="95.19" y2="120.35"/><line class="cls-2" x1="91.69" y1="126.36" x2="90.34" y2="122.21"/><line class="cls-2" x1="86.23" y1="127.82" x2="85.32" y2="123.56"/><line class="cls-2" x1="80.64" y1="128.7" x2="80.19" y2="124.37"/><line class="cls-2" x1="75" y1="129" x2="75" y2="124.64"/><line class="cls-2" x1="69.36" y1="128.7" x2="69.81" y2="124.37"/><line class="cls-2" x1="63.77" y1="127.82" x2="64.68" y2="123.56"/><line class="cls-2" x1="58.31" y1="126.36" x2="59.66" y2="122.21"/><line class="cls-2" x1="53.04" y1="124.33" x2="54.81" y2="120.35"/><line class="cls-2" x1="48" y1="121.77" x2="50.18" y2="117.99"/><line class="cls-2" x1="43.26" y1="118.69" x2="45.82" y2="115.16"/><line class="cls-2" x1="38.87" y1="115.13" x2="41.78" y2="111.89"/><line class="cls-2" x1="34.87" y1="111.13" x2="38.11" y2="108.22"/><line class="cls-2" x1="31.31" y1="106.74" x2="34.84" y2="104.18"/><line class="cls-2" x1="28.23" y1="102" x2="32.01" y2="99.82"/><line class="cls-2" x1="25.67" y1="96.96" x2="29.65" y2="95.19"/><line class="cls-2" x1="23.64" y1="91.69" x2="27.79" y2="90.34"/><line class="cls-2" x1="22.18" y1="86.23" x2="26.44" y2="85.32"/><line class="cls-2" x1="21.3" y1="80.64" x2="25.63" y2="80.19"/><line class="cls-2" x1="21" y1="75" x2="25.36" y2="75"/><line class="cls-2" x1="21.3" y1="69.36" x2="25.63" y2="69.81"/><line class="cls-2" x1="22.18" y1="63.77" x2="26.44" y2="64.68"/><line class="cls-2" x1="23.64" y1="58.31" x2="27.79" y2="59.66"/><line class="cls-2" x1="25.67" y1="53.04" x2="29.65" y2="54.81"/><line class="cls-2" x1="28.23" y1="48" x2="32.01" y2="50.18"/><line class="cls-2" x1="31.31" y1="43.26" x2="34.84" y2="45.82"/><line class="cls-2" x1="34.87" y1="38.87" x2="38.11" y2="41.78"/><line class="cls-2" x1="38.87" y1="34.87" x2="41.78" y2="38.11"/><line class="cls-2" x1="43.26" y1="31.31" x2="45.82" y2="34.84"/><line class="cls-2" x1="48" y1="28.23" x2="50.18" y2="32.01"/><line class="cls-2" x1="53.04" y1="25.67" x2="54.81" y2="29.65"/><line class="cls-2" x1="58.31" y1="23.64" x2="59.66" y2="27.79"/><line class="cls-2" x1="63.77" y1="22.18" x2="64.68" y2="26.44"/><line class="cls-2" x1="69.36" y1="21.3" x2="69.81" y2="25.63"/><line class="cls-2" x1="75" y1="21" x2="75" y2="25.36"/></svg>
diff --git a/modules/default/clock/faces/face-006.svg b/modules/default/clock/faces/face-006.svg
index a9eff826..87c52ed5 100644
--- a/modules/default/clock/faces/face-006.svg
+++ b/modules/default/clock/faces/face-006.svg
@@ -1 +1 @@
-<svg id="Hour_Markers_-_Singlets_Gradient" data-name="Hour Markers - Singlets Gradient" xmlns="https://www.w3.org/2000/svg" viewBox="0 0 250 250"><defs><style>.cls-1,.cls-10,.cls-11,.cls-12,.cls-13,.cls-14,.cls-15,.cls-16,.cls-17,.cls-18,.cls-19,.cls-2,.cls-20,.cls-21,.cls-22,.cls-23,.cls-24,.cls-25,.cls-26,.cls-27,.cls-28,.cls-29,.cls-3,.cls-30,.cls-31,.cls-32,.cls-33,.cls-34,.cls-35,.cls-36,.cls-37,.cls-38,.cls-39,.cls-4,.cls-40,.cls-41,.cls-42,.cls-43,.cls-44,.cls-45,.cls-46,.cls-47,.cls-48,.cls-49,.cls-5,.cls-50,.cls-51,.cls-52,.cls-53,.cls-54,.cls-55,.cls-56,.cls-57,.cls-58,.cls-59,.cls-6,.cls-60,.cls-7,.cls-8,.cls-9{fill:none;stroke-linecap:round;stroke-miterlimit:10;}.cls-1,.cls-10,.cls-11,.cls-12,.cls-2,.cls-3,.cls-4,.cls-5,.cls-6,.cls-7,.cls-8,.cls-9{stroke-width:2.99px;}.cls-1{stroke:url(#Gray_Gradient_2);}.cls-2{stroke:url(#Gray_Gradient_2-2);}.cls-3{stroke:url(#Gray_Gradient_2-3);}.cls-4{stroke:url(#Gray_Gradient_2-4);}.cls-5{stroke:url(#Gray_Gradient_2-5);}.cls-6{stroke:url(#Gray_Gradient_2-6);}.cls-7{stroke:url(#Gray_Gradient_2-7);}.cls-8{stroke:url(#Gray_Gradient_2-8);}.cls-9{stroke:url(#Gray_Gradient_2-9);}.cls-10{stroke:url(#Gray_Gradient_2-10);}.cls-11{stroke:url(#Gray_Gradient_2-11);}.cls-12{stroke:url(#Gray_Gradient_2-12);}.cls-13,.cls-14,.cls-15,.cls-16,.cls-17,.cls-18,.cls-19,.cls-20,.cls-21,.cls-22,.cls-23,.cls-24,.cls-25,.cls-26,.cls-27,.cls-28,.cls-29,.cls-30,.cls-31,.cls-32,.cls-33,.cls-34,.cls-35,.cls-36,.cls-37,.cls-38,.cls-39,.cls-40,.cls-41,.cls-42,.cls-43,.cls-44,.cls-45,.cls-46,.cls-47,.cls-48,.cls-49,.cls-50,.cls-51,.cls-52,.cls-53,.cls-54,.cls-55,.cls-56,.cls-57,.cls-58,.cls-59,.cls-60{stroke-width:0.5px;}.cls-13{stroke:url(#Gray_Gradient_2-13);}.cls-14{stroke:url(#Gray_Gradient_2-14);}.cls-15{stroke:url(#Gray_Gradient_2-15);}.cls-16{stroke:url(#Gray_Gradient_2-16);}.cls-17{stroke:url(#Gray_Gradient_2-17);}.cls-18{stroke:url(#Gray_Gradient_2-18);}.cls-19{stroke:url(#Gray_Gradient_2-19);}.cls-20{stroke:url(#Gray_Gradient_2-20);}.cls-21{stroke:url(#Gray_Gradient_2-21);}.cls-22{stroke:url(#Gray_Gradient_2-22);}.cls-23{stroke:url(#Gray_Gradient_2-23);}.cls-24{stroke:url(#Gray_Gradient_2-24);}.cls-25{stroke:url(#Gray_Gradient_2-25);}.cls-26{stroke:url(#Gray_Gradient_2-26);}.cls-27{stroke:url(#Gray_Gradient_2-27);}.cls-28{stroke:url(#Gray_Gradient_2-28);}.cls-29{stroke:url(#Gray_Gradient_2-29);}.cls-30{stroke:url(#Gray_Gradient_2-30);}.cls-31{stroke:url(#Gray_Gradient_2-31);}.cls-32{stroke:url(#Gray_Gradient_2-32);}.cls-33{stroke:url(#Gray_Gradient_2-33);}.cls-34{stroke:url(#Gray_Gradient_2-34);}.cls-35{stroke:url(#Gray_Gradient_2-35);}.cls-36{stroke:url(#Gray_Gradient_2-36);}.cls-37{stroke:url(#Gray_Gradient_2-37);}.cls-38{stroke:url(#Gray_Gradient_2-38);}.cls-39{stroke:url(#Gray_Gradient_2-39);}.cls-40{stroke:url(#Gray_Gradient_2-40);}.cls-41{stroke:url(#Gray_Gradient_2-41);}.cls-42{stroke:url(#Gray_Gradient_2-42);}.cls-43{stroke:url(#Gray_Gradient_2-43);}.cls-44{stroke:url(#Gray_Gradient_2-44);}.cls-45{stroke:url(#Gray_Gradient_2-45);}.cls-46{stroke:url(#Gray_Gradient_2-46);}.cls-47{stroke:url(#Gray_Gradient_2-47);}.cls-48{stroke:url(#Gray_Gradient_2-48);}.cls-49{stroke:url(#Gray_Gradient_2-49);}.cls-50{stroke:url(#Gray_Gradient_2-50);}.cls-51{stroke:url(#Gray_Gradient_2-51);}.cls-52{stroke:url(#Gray_Gradient_2-52);}.cls-53{stroke:url(#Gray_Gradient_2-53);}.cls-54{stroke:url(#Gray_Gradient_2-54);}.cls-55{stroke:url(#Gray_Gradient_2-55);}.cls-56{stroke:url(#Gray_Gradient_2-56);}.cls-57{stroke:url(#Gray_Gradient_2-57);}.cls-58{stroke:url(#Gray_Gradient_2-58);}.cls-59{stroke:url(#Gray_Gradient_2-59);}.cls-60{stroke:url(#Gray_Gradient_2-60);}</style><linearGradient id="Gray_Gradient_2" x1="125" y1="0.01" x2="125" y2="17.94" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fff"/><stop offset="0.03" stop-color="#e2e2e2"/><stop offset="0.1" stop-color="#b3b3b3"/><stop offset="0.17" stop-color="#888"/><stop offset="0.24" stop-color="#636363"/><stop offset="0.32" stop-color="#444"/><stop offset="0.4" stop-color="#2b2b2b"/><stop offset="0.5" stop-color="#181818"/><stop offset="0.61" stop-color="#0a0a0a"/><stop offset="0.75" stop-color="#020202"/><stop offset="1"/></linearGradient><linearGradient id="Gray_Gradient_2-2" x1="187.5" y1="16.75" x2="178.53" y2="32.28" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-3" x1="233.25" y1="62.5" x2="217.72" y2="71.47" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-4" x1="249.99" y1="125" x2="232.06" y2="125" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-5" x1="233.25" y1="187.5" x2="217.72" y2="178.53" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-6" x1="187.5" y1="233.25" x2="178.53" y2="217.72" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-7" x1="125" y1="249.99" x2="125" y2="232.06" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-8" x1="62.5" y1="233.25" x2="71.47" y2="217.72" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-9" x1="16.75" y1="187.5" x2="32.28" y2="178.53" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-10" x1="0.01" y1="125" x2="17.94" y2="125" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-11" x1="16.75" y1="62.5" x2="32.28" y2="71.47" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-12" x1="62.5" y1="16.75" x2="71.47" y2="32.28" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-13" x1="138.01" y1="1.25" x2="136.91" y2="11.71" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-14" x1="150.87" y1="3.29" x2="148.68" y2="13.58" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-15" x1="163.45" y1="6.66" x2="160.2" y2="16.66" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-16" x1="175.61" y1="11.33" x2="171.33" y2="20.94" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-17" x1="198.14" y1="24.33" x2="191.96" y2="32.84" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-18" x1="208.26" y1="32.53" x2="201.22" y2="40.35" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-19" x1="217.47" y1="41.74" x2="209.65" y2="48.78" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-20" x1="225.67" y1="51.86" x2="217.16" y2="58.04" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-21" x1="238.67" y1="74.39" x2="229.06" y2="78.67" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-22" x1="243.34" y1="86.55" x2="233.34" y2="89.8" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-23" x1="246.71" y1="99.13" x2="236.42" y2="101.32" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-24" x1="248.75" y1="111.99" x2="238.29" y2="113.09" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-25" x1="248.75" y1="138.01" x2="238.29" y2="136.91" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-26" x1="246.71" y1="150.87" x2="236.42" y2="148.68" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-27" x1="243.34" y1="163.45" x2="233.34" y2="160.2" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-28" x1="238.67" y1="175.61" x2="229.06" y2="171.33" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-29" x1="225.67" y1="198.14" x2="217.16" y2="191.96" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-30" x1="217.47" y1="208.26" x2="209.65" y2="201.22" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-31" x1="208.26" y1="217.47" x2="201.22" y2="209.65" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-32" x1="198.14" y1="225.67" x2="191.96" y2="217.16" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-33" x1="175.61" y1="238.67" x2="171.33" y2="229.06" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-34" x1="163.45" y1="243.34" x2="160.2" y2="233.34" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-35" x1="150.87" y1="246.71" x2="148.68" y2="236.42" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-36" x1="138.01" y1="248.75" x2="136.91" y2="238.29" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-37" x1="111.99" y1="248.75" x2="113.09" y2="238.29" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-38" x1="99.13" y1="246.71" x2="101.32" y2="236.42" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-39" x1="86.55" y1="243.34" x2="89.8" y2="233.34" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-40" x1="74.39" y1="238.67" x2="78.67" y2="229.06" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-41" x1="51.86" y1="225.67" x2="58.04" y2="217.16" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-42" x1="41.74" y1="217.47" x2="48.78" y2="209.65" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-43" x1="32.53" y1="208.26" x2="40.35" y2="201.22" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-44" x1="24.33" y1="198.14" x2="32.84" y2="191.96" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-45" x1="11.33" y1="175.61" x2="20.94" y2="171.33" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-46" x1="6.66" y1="163.45" x2="16.66" y2="160.2" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-47" x1="3.29" y1="150.87" x2="13.58" y2="148.68" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-48" x1="1.25" y1="138.01" x2="11.71" y2="136.91" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-49" x1="1.25" y1="111.99" x2="11.71" y2="113.09" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-50" x1="3.29" y1="99.13" x2="13.58" y2="101.32" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-51" x1="6.66" y1="86.55" x2="16.66" y2="89.8" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-52" x1="11.33" y1="74.39" x2="20.94" y2="78.67" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-53" x1="24.33" y1="51.86" x2="32.84" y2="58.04" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-54" x1="32.53" y1="41.74" x2="40.35" y2="48.78" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-55" x1="41.74" y1="32.53" x2="48.78" y2="40.35" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-56" x1="51.86" y1="24.33" x2="58.04" y2="32.84" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-57" x1="74.39" y1="11.33" x2="78.67" y2="20.94" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-58" x1="86.55" y1="6.66" x2="89.8" y2="16.66" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-59" x1="99.13" y1="3.29" x2="101.32" y2="13.58" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-60" x1="111.99" y1="1.25" x2="113.09" y2="11.71" xlink:href="#Gray_Gradient_2"/></defs><title>face-006</title><line class="cls-1" x1="125" y1="1.5" x2="125" y2="16.45"/><line class="cls-2" x1="186.75" y1="18.05" x2="179.28" y2="30.99"/><line class="cls-3" x1="231.95" y1="63.25" x2="219.01" y2="70.72"/><line class="cls-4" x1="248.5" y1="125" x2="233.55" y2="125"/><line class="cls-5" x1="231.95" y1="186.75" x2="219.01" y2="179.28"/><line class="cls-6" x1="186.75" y1="231.95" x2="179.28" y2="219.01"/><line class="cls-7" x1="125" y1="248.5" x2="125" y2="233.55"/><line class="cls-8" x1="63.25" y1="231.95" x2="70.72" y2="219.01"/><line class="cls-9" x1="18.05" y1="186.75" x2="30.99" y2="179.28"/><line class="cls-10" x1="1.5" y1="125" x2="16.45" y2="125"/><line class="cls-11" x1="18.05" y1="63.25" x2="30.99" y2="70.72"/><line class="cls-12" x1="63.25" y1="18.05" x2="70.72" y2="30.99"/><line class="cls-13" x1="137.98" y1="1.5" x2="136.93" y2="11.46"/><line class="cls-14" x1="150.82" y1="3.53" x2="148.74" y2="13.33"/><line class="cls-15" x1="163.37" y1="6.9" x2="160.28" y2="16.43"/><line class="cls-16" x1="175.51" y1="11.56" x2="171.43" y2="20.71"/><line class="cls-17" x1="197.99" y1="24.54" x2="192.1" y2="32.64"/><line class="cls-18" x1="208.09" y1="32.72" x2="201.39" y2="40.16"/><line class="cls-19" x1="217.28" y1="41.91" x2="209.84" y2="48.61"/><line class="cls-20" x1="225.46" y1="52.01" x2="217.36" y2="57.9"/><line class="cls-21" x1="238.44" y1="74.49" x2="229.29" y2="78.57"/><line class="cls-22" x1="243.1" y1="86.63" x2="233.57" y2="89.72"/><line class="cls-23" x1="246.47" y1="99.18" x2="236.67" y2="101.26"/><line class="cls-24" x1="248.5" y1="112.02" x2="238.54" y2="113.07"/><line class="cls-25" x1="248.5" y1="137.98" x2="238.54" y2="136.93"/><line class="cls-26" x1="246.47" y1="150.82" x2="236.67" y2="148.74"/><line class="cls-27" x1="243.1" y1="163.37" x2="233.57" y2="160.28"/><line class="cls-28" x1="238.44" y1="175.51" x2="229.29" y2="171.43"/><line class="cls-29" x1="225.46" y1="197.99" x2="217.36" y2="192.1"/><line class="cls-30" x1="217.28" y1="208.09" x2="209.84" y2="201.39"/><line class="cls-31" x1="208.09" y1="217.28" x2="201.39" y2="209.84"/><line class="cls-32" x1="197.99" y1="225.46" x2="192.1" y2="217.36"/><line class="cls-33" x1="175.51" y1="238.44" x2="171.43" y2="229.29"/><line class="cls-34" x1="163.37" y1="243.1" x2="160.28" y2="233.57"/><line class="cls-35" x1="150.82" y1="246.47" x2="148.74" y2="236.67"/><line class="cls-36" x1="137.98" y1="248.5" x2="136.93" y2="238.54"/><line class="cls-37" x1="112.02" y1="248.5" x2="113.07" y2="238.54"/><line class="cls-38" x1="99.18" y1="246.47" x2="101.26" y2="236.67"/><line class="cls-39" x1="86.63" y1="243.1" x2="89.72" y2="233.57"/><line class="cls-40" x1="74.49" y1="238.44" x2="78.57" y2="229.29"/><line class="cls-41" x1="52.01" y1="225.46" x2="57.9" y2="217.36"/><line class="cls-42" x1="41.91" y1="217.28" x2="48.61" y2="209.84"/><line class="cls-43" x1="32.72" y1="208.09" x2="40.16" y2="201.39"/><line class="cls-44" x1="24.54" y1="197.99" x2="32.64" y2="192.1"/><line class="cls-45" x1="11.56" y1="175.51" x2="20.71" y2="171.43"/><line class="cls-46" x1="6.9" y1="163.37" x2="16.43" y2="160.28"/><line class="cls-47" x1="3.53" y1="150.82" x2="13.33" y2="148.74"/><line class="cls-48" x1="1.5" y1="137.98" x2="11.46" y2="136.93"/><line class="cls-49" x1="1.5" y1="112.02" x2="11.46" y2="113.07"/><line class="cls-50" x1="3.53" y1="99.18" x2="13.33" y2="101.26"/><line class="cls-51" x1="6.9" y1="86.63" x2="16.43" y2="89.72"/><line class="cls-52" x1="11.56" y1="74.49" x2="20.71" y2="78.57"/><line class="cls-53" x1="24.54" y1="52.01" x2="32.64" y2="57.9"/><line class="cls-54" x1="32.72" y1="41.91" x2="40.16" y2="48.61"/><line class="cls-55" x1="41.91" y1="32.72" x2="48.61" y2="40.16"/><line class="cls-56" x1="52.01" y1="24.54" x2="57.9" y2="32.64"/><line class="cls-57" x1="74.49" y1="11.56" x2="78.57" y2="20.71"/><line class="cls-58" x1="86.63" y1="6.9" x2="89.72" y2="16.43"/><line class="cls-59" x1="99.18" y1="3.53" x2="101.26" y2="13.33"/><line class="cls-60" x1="112.02" y1="1.5" x2="113.07" y2="11.46"/></svg>
+<svg id="Hour_Markers_-_Singlets_Gradient" data-name="Hour Markers - Singlets Gradient" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 250 250"><defs><style>.cls-1,.cls-10,.cls-11,.cls-12,.cls-13,.cls-14,.cls-15,.cls-16,.cls-17,.cls-18,.cls-19,.cls-2,.cls-20,.cls-21,.cls-22,.cls-23,.cls-24,.cls-25,.cls-26,.cls-27,.cls-28,.cls-29,.cls-3,.cls-30,.cls-31,.cls-32,.cls-33,.cls-34,.cls-35,.cls-36,.cls-37,.cls-38,.cls-39,.cls-4,.cls-40,.cls-41,.cls-42,.cls-43,.cls-44,.cls-45,.cls-46,.cls-47,.cls-48,.cls-49,.cls-5,.cls-50,.cls-51,.cls-52,.cls-53,.cls-54,.cls-55,.cls-56,.cls-57,.cls-58,.cls-59,.cls-6,.cls-60,.cls-7,.cls-8,.cls-9{fill:none;stroke-linecap:round;stroke-miterlimit:10;}.cls-1,.cls-10,.cls-11,.cls-12,.cls-2,.cls-3,.cls-4,.cls-5,.cls-6,.cls-7,.cls-8,.cls-9{stroke-width:2.99px;}.cls-1{stroke:url(#Gray_Gradient_2);}.cls-2{stroke:url(#Gray_Gradient_2-2);}.cls-3{stroke:url(#Gray_Gradient_2-3);}.cls-4{stroke:url(#Gray_Gradient_2-4);}.cls-5{stroke:url(#Gray_Gradient_2-5);}.cls-6{stroke:url(#Gray_Gradient_2-6);}.cls-7{stroke:url(#Gray_Gradient_2-7);}.cls-8{stroke:url(#Gray_Gradient_2-8);}.cls-9{stroke:url(#Gray_Gradient_2-9);}.cls-10{stroke:url(#Gray_Gradient_2-10);}.cls-11{stroke:url(#Gray_Gradient_2-11);}.cls-12{stroke:url(#Gray_Gradient_2-12);}.cls-13,.cls-14,.cls-15,.cls-16,.cls-17,.cls-18,.cls-19,.cls-20,.cls-21,.cls-22,.cls-23,.cls-24,.cls-25,.cls-26,.cls-27,.cls-28,.cls-29,.cls-30,.cls-31,.cls-32,.cls-33,.cls-34,.cls-35,.cls-36,.cls-37,.cls-38,.cls-39,.cls-40,.cls-41,.cls-42,.cls-43,.cls-44,.cls-45,.cls-46,.cls-47,.cls-48,.cls-49,.cls-50,.cls-51,.cls-52,.cls-53,.cls-54,.cls-55,.cls-56,.cls-57,.cls-58,.cls-59,.cls-60{stroke-width:0.5px;}.cls-13{stroke:url(#Gray_Gradient_2-13);}.cls-14{stroke:url(#Gray_Gradient_2-14);}.cls-15{stroke:url(#Gray_Gradient_2-15);}.cls-16{stroke:url(#Gray_Gradient_2-16);}.cls-17{stroke:url(#Gray_Gradient_2-17);}.cls-18{stroke:url(#Gray_Gradient_2-18);}.cls-19{stroke:url(#Gray_Gradient_2-19);}.cls-20{stroke:url(#Gray_Gradient_2-20);}.cls-21{stroke:url(#Gray_Gradient_2-21);}.cls-22{stroke:url(#Gray_Gradient_2-22);}.cls-23{stroke:url(#Gray_Gradient_2-23);}.cls-24{stroke:url(#Gray_Gradient_2-24);}.cls-25{stroke:url(#Gray_Gradient_2-25);}.cls-26{stroke:url(#Gray_Gradient_2-26);}.cls-27{stroke:url(#Gray_Gradient_2-27);}.cls-28{stroke:url(#Gray_Gradient_2-28);}.cls-29{stroke:url(#Gray_Gradient_2-29);}.cls-30{stroke:url(#Gray_Gradient_2-30);}.cls-31{stroke:url(#Gray_Gradient_2-31);}.cls-32{stroke:url(#Gray_Gradient_2-32);}.cls-33{stroke:url(#Gray_Gradient_2-33);}.cls-34{stroke:url(#Gray_Gradient_2-34);}.cls-35{stroke:url(#Gray_Gradient_2-35);}.cls-36{stroke:url(#Gray_Gradient_2-36);}.cls-37{stroke:url(#Gray_Gradient_2-37);}.cls-38{stroke:url(#Gray_Gradient_2-38);}.cls-39{stroke:url(#Gray_Gradient_2-39);}.cls-40{stroke:url(#Gray_Gradient_2-40);}.cls-41{stroke:url(#Gray_Gradient_2-41);}.cls-42{stroke:url(#Gray_Gradient_2-42);}.cls-43{stroke:url(#Gray_Gradient_2-43);}.cls-44{stroke:url(#Gray_Gradient_2-44);}.cls-45{stroke:url(#Gray_Gradient_2-45);}.cls-46{stroke:url(#Gray_Gradient_2-46);}.cls-47{stroke:url(#Gray_Gradient_2-47);}.cls-48{stroke:url(#Gray_Gradient_2-48);}.cls-49{stroke:url(#Gray_Gradient_2-49);}.cls-50{stroke:url(#Gray_Gradient_2-50);}.cls-51{stroke:url(#Gray_Gradient_2-51);}.cls-52{stroke:url(#Gray_Gradient_2-52);}.cls-53{stroke:url(#Gray_Gradient_2-53);}.cls-54{stroke:url(#Gray_Gradient_2-54);}.cls-55{stroke:url(#Gray_Gradient_2-55);}.cls-56{stroke:url(#Gray_Gradient_2-56);}.cls-57{stroke:url(#Gray_Gradient_2-57);}.cls-58{stroke:url(#Gray_Gradient_2-58);}.cls-59{stroke:url(#Gray_Gradient_2-59);}.cls-60{stroke:url(#Gray_Gradient_2-60);}</style><linearGradient id="Gray_Gradient_2" x1="125" y1="0.01" x2="125" y2="17.94" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fff"/><stop offset="0.03" stop-color="#e2e2e2"/><stop offset="0.1" stop-color="#b3b3b3"/><stop offset="0.17" stop-color="#888"/><stop offset="0.24" stop-color="#636363"/><stop offset="0.32" stop-color="#444"/><stop offset="0.4" stop-color="#2b2b2b"/><stop offset="0.5" stop-color="#181818"/><stop offset="0.61" stop-color="#0a0a0a"/><stop offset="0.75" stop-color="#020202"/><stop offset="1"/></linearGradient><linearGradient id="Gray_Gradient_2-2" x1="187.5" y1="16.75" x2="178.53" y2="32.28" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-3" x1="233.25" y1="62.5" x2="217.72" y2="71.47" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-4" x1="249.99" y1="125" x2="232.06" y2="125" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-5" x1="233.25" y1="187.5" x2="217.72" y2="178.53" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-6" x1="187.5" y1="233.25" x2="178.53" y2="217.72" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-7" x1="125" y1="249.99" x2="125" y2="232.06" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-8" x1="62.5" y1="233.25" x2="71.47" y2="217.72" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-9" x1="16.75" y1="187.5" x2="32.28" y2="178.53" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-10" x1="0.01" y1="125" x2="17.94" y2="125" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-11" x1="16.75" y1="62.5" x2="32.28" y2="71.47" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-12" x1="62.5" y1="16.75" x2="71.47" y2="32.28" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-13" x1="138.01" y1="1.25" x2="136.91" y2="11.71" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-14" x1="150.87" y1="3.29" x2="148.68" y2="13.58" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-15" x1="163.45" y1="6.66" x2="160.2" y2="16.66" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-16" x1="175.61" y1="11.33" x2="171.33" y2="20.94" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-17" x1="198.14" y1="24.33" x2="191.96" y2="32.84" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-18" x1="208.26" y1="32.53" x2="201.22" y2="40.35" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-19" x1="217.47" y1="41.74" x2="209.65" y2="48.78" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-20" x1="225.67" y1="51.86" x2="217.16" y2="58.04" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-21" x1="238.67" y1="74.39" x2="229.06" y2="78.67" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-22" x1="243.34" y1="86.55" x2="233.34" y2="89.8" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-23" x1="246.71" y1="99.13" x2="236.42" y2="101.32" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-24" x1="248.75" y1="111.99" x2="238.29" y2="113.09" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-25" x1="248.75" y1="138.01" x2="238.29" y2="136.91" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-26" x1="246.71" y1="150.87" x2="236.42" y2="148.68" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-27" x1="243.34" y1="163.45" x2="233.34" y2="160.2" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-28" x1="238.67" y1="175.61" x2="229.06" y2="171.33" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-29" x1="225.67" y1="198.14" x2="217.16" y2="191.96" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-30" x1="217.47" y1="208.26" x2="209.65" y2="201.22" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-31" x1="208.26" y1="217.47" x2="201.22" y2="209.65" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-32" x1="198.14" y1="225.67" x2="191.96" y2="217.16" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-33" x1="175.61" y1="238.67" x2="171.33" y2="229.06" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-34" x1="163.45" y1="243.34" x2="160.2" y2="233.34" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-35" x1="150.87" y1="246.71" x2="148.68" y2="236.42" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-36" x1="138.01" y1="248.75" x2="136.91" y2="238.29" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-37" x1="111.99" y1="248.75" x2="113.09" y2="238.29" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-38" x1="99.13" y1="246.71" x2="101.32" y2="236.42" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-39" x1="86.55" y1="243.34" x2="89.8" y2="233.34" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-40" x1="74.39" y1="238.67" x2="78.67" y2="229.06" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-41" x1="51.86" y1="225.67" x2="58.04" y2="217.16" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-42" x1="41.74" y1="217.47" x2="48.78" y2="209.65" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-43" x1="32.53" y1="208.26" x2="40.35" y2="201.22" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-44" x1="24.33" y1="198.14" x2="32.84" y2="191.96" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-45" x1="11.33" y1="175.61" x2="20.94" y2="171.33" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-46" x1="6.66" y1="163.45" x2="16.66" y2="160.2" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-47" x1="3.29" y1="150.87" x2="13.58" y2="148.68" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-48" x1="1.25" y1="138.01" x2="11.71" y2="136.91" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-49" x1="1.25" y1="111.99" x2="11.71" y2="113.09" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-50" x1="3.29" y1="99.13" x2="13.58" y2="101.32" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-51" x1="6.66" y1="86.55" x2="16.66" y2="89.8" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-52" x1="11.33" y1="74.39" x2="20.94" y2="78.67" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-53" x1="24.33" y1="51.86" x2="32.84" y2="58.04" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-54" x1="32.53" y1="41.74" x2="40.35" y2="48.78" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-55" x1="41.74" y1="32.53" x2="48.78" y2="40.35" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-56" x1="51.86" y1="24.33" x2="58.04" y2="32.84" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-57" x1="74.39" y1="11.33" x2="78.67" y2="20.94" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-58" x1="86.55" y1="6.66" x2="89.8" y2="16.66" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-59" x1="99.13" y1="3.29" x2="101.32" y2="13.58" xlink:href="#Gray_Gradient_2"/><linearGradient id="Gray_Gradient_2-60" x1="111.99" y1="1.25" x2="113.09" y2="11.71" xlink:href="#Gray_Gradient_2"/></defs><title>face-006</title><line class="cls-1" x1="125" y1="1.5" x2="125" y2="16.45"/><line class="cls-2" x1="186.75" y1="18.05" x2="179.28" y2="30.99"/><line class="cls-3" x1="231.95" y1="63.25" x2="219.01" y2="70.72"/><line class="cls-4" x1="248.5" y1="125" x2="233.55" y2="125"/><line class="cls-5" x1="231.95" y1="186.75" x2="219.01" y2="179.28"/><line class="cls-6" x1="186.75" y1="231.95" x2="179.28" y2="219.01"/><line class="cls-7" x1="125" y1="248.5" x2="125" y2="233.55"/><line class="cls-8" x1="63.25" y1="231.95" x2="70.72" y2="219.01"/><line class="cls-9" x1="18.05" y1="186.75" x2="30.99" y2="179.28"/><line class="cls-10" x1="1.5" y1="125" x2="16.45" y2="125"/><line class="cls-11" x1="18.05" y1="63.25" x2="30.99" y2="70.72"/><line class="cls-12" x1="63.25" y1="18.05" x2="70.72" y2="30.99"/><line class="cls-13" x1="137.98" y1="1.5" x2="136.93" y2="11.46"/><line class="cls-14" x1="150.82" y1="3.53" x2="148.74" y2="13.33"/><line class="cls-15" x1="163.37" y1="6.9" x2="160.28" y2="16.43"/><line class="cls-16" x1="175.51" y1="11.56" x2="171.43" y2="20.71"/><line class="cls-17" x1="197.99" y1="24.54" x2="192.1" y2="32.64"/><line class="cls-18" x1="208.09" y1="32.72" x2="201.39" y2="40.16"/><line class="cls-19" x1="217.28" y1="41.91" x2="209.84" y2="48.61"/><line class="cls-20" x1="225.46" y1="52.01" x2="217.36" y2="57.9"/><line class="cls-21" x1="238.44" y1="74.49" x2="229.29" y2="78.57"/><line class="cls-22" x1="243.1" y1="86.63" x2="233.57" y2="89.72"/><line class="cls-23" x1="246.47" y1="99.18" x2="236.67" y2="101.26"/><line class="cls-24" x1="248.5" y1="112.02" x2="238.54" y2="113.07"/><line class="cls-25" x1="248.5" y1="137.98" x2="238.54" y2="136.93"/><line class="cls-26" x1="246.47" y1="150.82" x2="236.67" y2="148.74"/><line class="cls-27" x1="243.1" y1="163.37" x2="233.57" y2="160.28"/><line class="cls-28" x1="238.44" y1="175.51" x2="229.29" y2="171.43"/><line class="cls-29" x1="225.46" y1="197.99" x2="217.36" y2="192.1"/><line class="cls-30" x1="217.28" y1="208.09" x2="209.84" y2="201.39"/><line class="cls-31" x1="208.09" y1="217.28" x2="201.39" y2="209.84"/><line class="cls-32" x1="197.99" y1="225.46" x2="192.1" y2="217.36"/><line class="cls-33" x1="175.51" y1="238.44" x2="171.43" y2="229.29"/><line class="cls-34" x1="163.37" y1="243.1" x2="160.28" y2="233.57"/><line class="cls-35" x1="150.82" y1="246.47" x2="148.74" y2="236.67"/><line class="cls-36" x1="137.98" y1="248.5" x2="136.93" y2="238.54"/><line class="cls-37" x1="112.02" y1="248.5" x2="113.07" y2="238.54"/><line class="cls-38" x1="99.18" y1="246.47" x2="101.26" y2="236.67"/><line class="cls-39" x1="86.63" y1="243.1" x2="89.72" y2="233.57"/><line class="cls-40" x1="74.49" y1="238.44" x2="78.57" y2="229.29"/><line class="cls-41" x1="52.01" y1="225.46" x2="57.9" y2="217.36"/><line class="cls-42" x1="41.91" y1="217.28" x2="48.61" y2="209.84"/><line class="cls-43" x1="32.72" y1="208.09" x2="40.16" y2="201.39"/><line class="cls-44" x1="24.54" y1="197.99" x2="32.64" y2="192.1"/><line class="cls-45" x1="11.56" y1="175.51" x2="20.71" y2="171.43"/><line class="cls-46" x1="6.9" y1="163.37" x2="16.43" y2="160.28"/><line class="cls-47" x1="3.53" y1="150.82" x2="13.33" y2="148.74"/><line class="cls-48" x1="1.5" y1="137.98" x2="11.46" y2="136.93"/><line class="cls-49" x1="1.5" y1="112.02" x2="11.46" y2="113.07"/><line class="cls-50" x1="3.53" y1="99.18" x2="13.33" y2="101.26"/><line class="cls-51" x1="6.9" y1="86.63" x2="16.43" y2="89.72"/><line class="cls-52" x1="11.56" y1="74.49" x2="20.71" y2="78.57"/><line class="cls-53" x1="24.54" y1="52.01" x2="32.64" y2="57.9"/><line class="cls-54" x1="32.72" y1="41.91" x2="40.16" y2="48.61"/><line class="cls-55" x1="41.91" y1="32.72" x2="48.61" y2="40.16"/><line class="cls-56" x1="52.01" y1="24.54" x2="57.9" y2="32.64"/><line class="cls-57" x1="74.49" y1="11.56" x2="78.57" y2="20.71"/><line class="cls-58" x1="86.63" y1="6.9" x2="89.72" y2="16.43"/><line class="cls-59" x1="99.18" y1="3.53" x2="101.26" y2="13.33"/><line class="cls-60" x1="112.02" y1="1.5" x2="113.07" y2="11.46"/></svg>
diff --git a/modules/default/clock/faces/face-007.svg b/modules/default/clock/faces/face-007.svg
index b0dde834..e557f55f 100644
--- a/modules/default/clock/faces/face-007.svg
+++ b/modules/default/clock/faces/face-007.svg
@@ -1 +1 @@
-<svg id="Hour_Markers_-_Singlets" data-name="Hour Markers - Singlets" xmlns="https://www.w3.org/2000/svg" viewBox="0 0 250 250"><defs><style>.cls-1,.cls-2,.cls-3{fill:none;stroke:#fff;stroke-linecap:round;stroke-miterlimit:10;}.cls-2{stroke-width:0.37px;}.cls-3{stroke-width:0.5px;}.cls-4{fill:#fff;}</style></defs><title>face-007</title><line class="cls-1" x1="125" y1="1.25" x2="125" y2="16.23"/><line class="cls-1" x1="186.87" y1="17.83" x2="179.39" y2="30.8"/><line class="cls-1" x1="232.17" y1="63.12" x2="219.2" y2="70.61"/><line class="cls-1" x1="248.75" y1="125" x2="233.77" y2="125"/><line class="cls-1" x1="232.17" y1="186.87" x2="219.2" y2="179.39"/><line class="cls-1" x1="186.88" y1="232.17" x2="179.39" y2="219.2"/><line class="cls-1" x1="125" y1="248.75" x2="125" y2="233.77"/><line class="cls-1" x1="63.13" y1="232.17" x2="70.61" y2="219.2"/><line class="cls-1" x1="17.83" y1="186.88" x2="30.8" y2="179.39"/><line class="cls-1" x1="1.25" y1="125" x2="16.23" y2="125"/><line class="cls-1" x1="17.83" y1="63.13" x2="30.8" y2="70.61"/><line class="cls-1" x1="63.12" y1="17.83" x2="70.61" y2="30.8"/><line class="cls-2" x1="132.32" y1="55.38" x2="131.73" y2="61"/><line class="cls-2" x1="139.55" y1="56.53" x2="138.38" y2="62.05"/><line class="cls-2" x1="146.63" y1="58.43" x2="144.89" y2="63.8"/><line class="cls-2" x1="153.47" y1="61.05" x2="151.17" y2="66.21"/><line class="cls-2" x1="160" y1="64.38" x2="157.18" y2="69.27"/><line class="cls-2" x1="166.14" y1="68.37" x2="162.83" y2="72.94"/><line class="cls-2" x1="171.84" y1="72.98" x2="168.06" y2="77.18"/><line class="cls-2" x1="177.02" y1="78.16" x2="172.82" y2="81.94"/><line class="cls-2" x1="181.63" y1="83.86" x2="177.06" y2="87.17"/><line class="cls-2" x1="185.62" y1="90" x2="180.73" y2="92.82"/><line class="cls-2" x1="188.95" y1="96.53" x2="183.79" y2="98.83"/><line class="cls-2" x1="191.57" y1="103.37" x2="186.2" y2="105.11"/><line class="cls-2" x1="193.47" y1="110.45" x2="187.95" y2="111.62"/><line class="cls-2" x1="194.62" y1="117.68" x2="189" y2="118.27"/><line class="cls-2" x1="195" y1="125" x2="189.35" y2="125"/><line class="cls-2" x1="194.62" y1="132.32" x2="189" y2="131.73"/><line class="cls-2" x1="193.47" y1="139.55" x2="187.95" y2="138.38"/><line class="cls-2" x1="191.57" y1="146.63" x2="186.2" y2="144.89"/><line class="cls-2" x1="188.95" y1="153.47" x2="183.79" y2="151.17"/><line class="cls-2" x1="185.62" y1="160" x2="180.73" y2="157.18"/><line class="cls-2" x1="181.63" y1="166.14" x2="177.06" y2="162.83"/><line class="cls-2" x1="177.02" y1="171.84" x2="172.82" y2="168.06"/><line class="cls-2" x1="171.84" y1="177.02" x2="168.06" y2="172.82"/><line class="cls-2" x1="166.14" y1="181.63" x2="162.83" y2="177.06"/><line class="cls-2" x1="160" y1="185.62" x2="157.18" y2="180.73"/><line class="cls-2" x1="153.47" y1="188.95" x2="151.17" y2="183.79"/><line class="cls-2" x1="146.63" y1="191.57" x2="144.89" y2="186.2"/><line class="cls-2" x1="139.55" y1="193.47" x2="138.38" y2="187.95"/><line class="cls-2" x1="132.32" y1="194.62" x2="131.73" y2="189"/><line class="cls-2" x1="125" y1="195" x2="125" y2="189.35"/><line class="cls-2" x1="117.68" y1="194.62" x2="118.27" y2="189"/><line class="cls-2" x1="110.45" y1="193.47" x2="111.62" y2="187.95"/><line class="cls-2" x1="103.37" y1="191.57" x2="105.11" y2="186.2"/><line class="cls-2" x1="96.53" y1="188.95" x2="98.83" y2="183.79"/><line class="cls-2" x1="90" y1="185.62" x2="92.82" y2="180.73"/><line class="cls-2" x1="83.86" y1="181.63" x2="87.17" y2="177.06"/><line class="cls-2" x1="78.16" y1="177.02" x2="81.94" y2="172.82"/><line class="cls-2" x1="72.98" y1="171.84" x2="77.18" y2="168.06"/><line class="cls-2" x1="68.37" y1="166.14" x2="72.94" y2="162.83"/><line class="cls-2" x1="64.38" y1="160" x2="69.27" y2="157.18"/><line class="cls-2" x1="61.05" y1="153.47" x2="66.21" y2="151.17"/><line class="cls-2" x1="58.43" y1="146.63" x2="63.8" y2="144.89"/><line class="cls-2" x1="56.53" y1="139.55" x2="62.05" y2="138.38"/><line class="cls-2" x1="55.38" y1="132.32" x2="61" y2="131.73"/><line class="cls-2" x1="55" y1="125" x2="60.65" y2="125"/><line class="cls-2" x1="55.38" y1="117.68" x2="61" y2="118.27"/><line class="cls-2" x1="56.53" y1="110.45" x2="62.05" y2="111.62"/><line class="cls-2" x1="58.43" y1="103.37" x2="63.8" y2="105.11"/><line class="cls-2" x1="61.05" y1="96.53" x2="66.21" y2="98.83"/><line class="cls-2" x1="64.38" y1="90" x2="69.27" y2="92.82"/><line class="cls-2" x1="68.37" y1="83.86" x2="72.94" y2="87.17"/><line class="cls-2" x1="72.98" y1="78.16" x2="77.18" y2="81.94"/><line class="cls-2" x1="78.16" y1="72.98" x2="81.94" y2="77.18"/><line class="cls-2" x1="83.86" y1="68.37" x2="87.17" y2="72.94"/><line class="cls-2" x1="90" y1="64.38" x2="92.82" y2="69.27"/><line class="cls-2" x1="96.53" y1="61.05" x2="98.83" y2="66.21"/><line class="cls-2" x1="103.37" y1="58.43" x2="105.11" y2="63.8"/><line class="cls-2" x1="110.45" y1="56.53" x2="111.62" y2="62.05"/><line class="cls-2" x1="117.68" y1="55.38" x2="118.27" y2="61"/><line class="cls-2" x1="125" y1="50.64" x2="125" y2="60.65"/><line class="cls-2" x1="162.18" y1="60.6" x2="157.18" y2="69.27"/><line class="cls-2" x1="189.4" y1="87.82" x2="180.73" y2="92.82"/><line class="cls-2" x1="199.36" y1="125" x2="189.35" y2="125"/><line class="cls-2" x1="189.4" y1="162.18" x2="180.73" y2="157.18"/><line class="cls-2" x1="162.18" y1="189.4" x2="157.18" y2="180.73"/><line class="cls-2" x1="125" y1="199.36" x2="125" y2="189.35"/><line class="cls-2" x1="87.82" y1="189.4" x2="92.82" y2="180.73"/><line class="cls-2" x1="60.6" y1="162.18" x2="69.27" y2="157.18"/><line class="cls-2" x1="50.64" y1="125" x2="60.65" y2="125"/><line class="cls-2" x1="60.6" y1="87.82" x2="69.27" y2="92.82"/><line class="cls-2" x1="87.82" y1="60.6" x2="92.82" y2="69.27"/><line class="cls-3" x1="138.01" y1="1.25" x2="136.96" y2="11.23"/><line class="cls-3" x1="150.87" y1="3.29" x2="148.78" y2="13.11"/><line class="cls-3" x1="163.45" y1="6.66" x2="160.35" y2="16.21"/><line class="cls-3" x1="175.61" y1="11.33" x2="171.53" y2="20.5"/><line class="cls-3" x1="198.14" y1="24.33" x2="192.24" y2="32.45"/><line class="cls-3" x1="208.26" y1="32.53" x2="201.54" y2="39.99"/><line class="cls-3" x1="217.47" y1="41.74" x2="210.01" y2="48.46"/><line class="cls-3" x1="225.67" y1="51.86" x2="217.55" y2="57.76"/><line class="cls-3" x1="238.67" y1="74.39" x2="229.5" y2="78.47"/><line class="cls-3" x1="243.34" y1="86.55" x2="233.79" y2="89.65"/><line class="cls-3" x1="246.71" y1="99.13" x2="236.89" y2="101.22"/><line class="cls-3" x1="248.75" y1="111.99" x2="238.77" y2="113.04"/><line class="cls-3" x1="248.75" y1="138.01" x2="238.77" y2="136.96"/><line class="cls-3" x1="246.71" y1="150.87" x2="236.89" y2="148.78"/><line class="cls-3" x1="243.34" y1="163.45" x2="233.79" y2="160.35"/><line class="cls-3" x1="238.67" y1="175.61" x2="229.5" y2="171.53"/><line class="cls-3" x1="225.67" y1="198.14" x2="217.55" y2="192.24"/><line class="cls-3" x1="217.47" y1="208.26" x2="210.01" y2="201.54"/><line class="cls-3" x1="208.26" y1="217.47" x2="201.54" y2="210.01"/><line class="cls-3" x1="198.14" y1="225.67" x2="192.24" y2="217.55"/><line class="cls-3" x1="175.61" y1="238.67" x2="171.53" y2="229.5"/><line class="cls-3" x1="163.45" y1="243.34" x2="160.35" y2="233.79"/><line class="cls-3" x1="150.87" y1="246.71" x2="148.78" y2="236.89"/><line class="cls-3" x1="138.01" y1="248.75" x2="136.96" y2="238.77"/><line class="cls-3" x1="111.99" y1="248.75" x2="113.04" y2="238.77"/><line class="cls-3" x1="99.13" y1="246.71" x2="101.22" y2="236.89"/><line class="cls-3" x1="86.55" y1="243.34" x2="89.65" y2="233.79"/><line class="cls-3" x1="74.39" y1="238.67" x2="78.47" y2="229.5"/><line class="cls-3" x1="51.86" y1="225.67" x2="57.76" y2="217.55"/><line class="cls-3" x1="41.74" y1="217.47" x2="48.46" y2="210.01"/><line class="cls-3" x1="32.53" y1="208.26" x2="39.99" y2="201.54"/><line class="cls-3" x1="24.33" y1="198.14" x2="32.45" y2="192.24"/><line class="cls-3" x1="11.33" y1="175.61" x2="20.5" y2="171.53"/><line class="cls-3" x1="6.66" y1="163.45" x2="16.21" y2="160.35"/><line class="cls-3" x1="3.29" y1="150.87" x2="13.11" y2="148.78"/><line class="cls-3" x1="1.25" y1="138.01" x2="11.23" y2="136.96"/><line class="cls-3" x1="1.25" y1="111.99" x2="11.23" y2="113.04"/><line class="cls-3" x1="3.29" y1="99.13" x2="13.11" y2="101.22"/><line class="cls-3" x1="6.66" y1="86.55" x2="16.21" y2="89.65"/><line class="cls-3" x1="11.33" y1="74.39" x2="20.5" y2="78.47"/><line class="cls-3" x1="24.33" y1="51.86" x2="32.45" y2="57.76"/><line class="cls-3" x1="32.53" y1="41.74" x2="39.99" y2="48.46"/><line class="cls-3" x1="41.74" y1="32.53" x2="48.46" y2="39.99"/><line class="cls-3" x1="51.86" y1="24.33" x2="57.76" y2="32.45"/><line class="cls-3" x1="74.39" y1="11.33" x2="78.47" y2="20.5"/><line class="cls-3" x1="86.55" y1="6.66" x2="89.65" y2="16.21"/><line class="cls-3" x1="99.13" y1="3.29" x2="101.22" y2="13.11"/><line class="cls-3" x1="111.99" y1="1.25" x2="113.04" y2="11.23"/><path class="cls-4" d="M119.08,21.34V20.86q1.3-.71,1.86-1.05a6.4,6.4,0,0,0,.65-0.47l0.19,0.19q-0.15,2.61-.15,6.5,0,3.36,0,3.81a4.28,4.28,0,0,0,.11,1.13,0.39,0.39,0,0,0,.13.18l1,0.37V32q-1.36-.1-2-0.1t-1.68.1V31.52a8.28,8.28,0,0,0,1.05-.4,0.43,0.43,0,0,0,.14-0.18,6,6,0,0,0,.09-1.13q0-.33,0-3.52V21.94a1.57,1.57,0,0,0-.1-0.66,0.32,0.32,0,0,0-.3-0.16A5.51,5.51,0,0,0,119.08,21.34Z"/><path class="cls-4" d="M125.73,22.72h-0.47q0.2-1.05.32-2.17a4.2,4.2,0,0,1,1.1-.92,2.33,2.33,0,0,1,1.13-.3,2.14,2.14,0,0,1,1.27.43A2.6,2.6,0,0,1,130,21a4.63,4.63,0,0,1,.3,1.71,5.43,5.43,0,0,1-.23,1.6,9.12,9.12,0,0,1-1,2.11q-0.68,1.13-2.85,4.25H129a1.36,1.36,0,0,0,.79-0.16,2.32,2.32,0,0,0,.46-0.88l0.08-.19h0.5Q130.28,31.1,130,32q-1.32-.1-2.39-0.1t-2.91.1V31.5q2-2.79,2.85-4.16a11.48,11.48,0,0,0,1.21-2.53,5.33,5.33,0,0,0,.25-1.65,3.08,3.08,0,0,0-.42-1.77,1.28,1.28,0,0,0-1.09-.61,1.43,1.43,0,0,0-1.08.52A4.21,4.21,0,0,0,125.73,22.72Z"/><path class="cls-4" d="M222,120.89h-0.44q0.21-1,.35-1.94a3.54,3.54,0,0,1,1-.67,2.38,2.38,0,0,1,1-.22,1.94,1.94,0,0,1,1.11.33,2,2,0,0,1,.73.93,3.24,3.24,0,0,1,.25,1.24,3.73,3.73,0,0,1-1.29,2.78,2.25,2.25,0,0,1,1.11.81,3.87,3.87,0,0,1,.63,2.31,5.05,5.05,0,0,1-1,3.2,3.19,3.19,0,0,1-2.61,1.34,3.65,3.65,0,0,1-1.72-.45q0.19-1.12.28-2.29h0.4a3.15,3.15,0,0,0,.63,1.43,1.29,1.29,0,0,0,1,.41,1.67,1.67,0,0,0,1.4-.77,3.47,3.47,0,0,0,.56-2.07,3.29,3.29,0,0,0-.59-2.06,2,2,0,0,0-1.68-.77h-0.22v-0.62a3.26,3.26,0,0,0,1.61-1.15,2.72,2.72,0,0,0,.46-1.52,2,2,0,0,0-.36-1.26,1.17,1.17,0,0,0-1-.47,1.28,1.28,0,0,0-.94.4A3.06,3.06,0,0,0,222,120.89Z"/><path class="cls-4" d="M127.19,216.79l0.15,0.69a8.47,8.47,0,0,0-2,1.49,6.72,6.72,0,0,0-1.25,1.84,9.3,9.3,0,0,0-.59,1.92,11,11,0,0,1,1.3-1.2,1.26,1.26,0,0,1,.69-0.19,2.09,2.09,0,0,1,1.79,1,4.8,4.8,0,0,1,.7,2.75,6.51,6.51,0,0,1-.8,3.2,2.42,2.42,0,0,1-4.34.19A6.2,6.2,0,0,1,122,225a9.92,9.92,0,0,1,1.13-4.71A7.59,7.59,0,0,1,127.19,216.79ZM126.84,226a7,7,0,0,0-.2-1.46,3.24,3.24,0,0,0-.63-1.4,1.29,1.29,0,0,0-1-.52,1.35,1.35,0,0,0-.88.35,2,2,0,0,0-.6.86,4,4,0,0,0-.18,1.32,6,6,0,0,0,.67,3,1.46,1.46,0,0,0,1.21.88,1.31,1.31,0,0,0,1.21-.92A5.25,5.25,0,0,0,126.84,226Z"/><path class="cls-4" d="M24.23,131.07l-0.12-.71A6.63,6.63,0,0,0,26,129a7.33,7.33,0,0,0,1.35-2,10.86,10.86,0,0,0,.69-2.22,6.66,6.66,0,0,1-1.21,1.3,1.6,1.6,0,0,1-.92.34,2.05,2.05,0,0,1-1.69-1,4.81,4.81,0,0,1-.72-2.79,5.49,5.49,0,0,1,.9-3.26,2.63,2.63,0,0,1,2.19-1.26,2.41,2.41,0,0,1,2.06,1.15,5.9,5.9,0,0,1,.79,3.36,11.58,11.58,0,0,1-.59,3.6,7.8,7.8,0,0,1-1.68,3A8.42,8.42,0,0,1,24.23,131.07Zm0.4-9.45a5.06,5.06,0,0,0,.54,2.62,1.54,1.54,0,0,0,1.3.87,1.43,1.43,0,0,0,1.17-.73,3.35,3.35,0,0,0,.51-1.94,5.74,5.74,0,0,0-.54-2.58,1.59,1.59,0,0,0-1.37-1.08,1.36,1.36,0,0,0-1.13.74A3.87,3.87,0,0,0,24.63,121.62Z"/></svg>
+<svg id="Hour_Markers_-_Singlets" data-name="Hour Markers - Singlets" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 250 250"><defs><style>.cls-1,.cls-2,.cls-3{fill:none;stroke:#fff;stroke-linecap:round;stroke-miterlimit:10;}.cls-2{stroke-width:0.37px;}.cls-3{stroke-width:0.5px;}.cls-4{fill:#fff;}</style></defs><title>face-007</title><line class="cls-1" x1="125" y1="1.25" x2="125" y2="16.23"/><line class="cls-1" x1="186.87" y1="17.83" x2="179.39" y2="30.8"/><line class="cls-1" x1="232.17" y1="63.12" x2="219.2" y2="70.61"/><line class="cls-1" x1="248.75" y1="125" x2="233.77" y2="125"/><line class="cls-1" x1="232.17" y1="186.87" x2="219.2" y2="179.39"/><line class="cls-1" x1="186.88" y1="232.17" x2="179.39" y2="219.2"/><line class="cls-1" x1="125" y1="248.75" x2="125" y2="233.77"/><line class="cls-1" x1="63.13" y1="232.17" x2="70.61" y2="219.2"/><line class="cls-1" x1="17.83" y1="186.88" x2="30.8" y2="179.39"/><line class="cls-1" x1="1.25" y1="125" x2="16.23" y2="125"/><line class="cls-1" x1="17.83" y1="63.13" x2="30.8" y2="70.61"/><line class="cls-1" x1="63.12" y1="17.83" x2="70.61" y2="30.8"/><line class="cls-2" x1="132.32" y1="55.38" x2="131.73" y2="61"/><line class="cls-2" x1="139.55" y1="56.53" x2="138.38" y2="62.05"/><line class="cls-2" x1="146.63" y1="58.43" x2="144.89" y2="63.8"/><line class="cls-2" x1="153.47" y1="61.05" x2="151.17" y2="66.21"/><line class="cls-2" x1="160" y1="64.38" x2="157.18" y2="69.27"/><line class="cls-2" x1="166.14" y1="68.37" x2="162.83" y2="72.94"/><line class="cls-2" x1="171.84" y1="72.98" x2="168.06" y2="77.18"/><line class="cls-2" x1="177.02" y1="78.16" x2="172.82" y2="81.94"/><line class="cls-2" x1="181.63" y1="83.86" x2="177.06" y2="87.17"/><line class="cls-2" x1="185.62" y1="90" x2="180.73" y2="92.82"/><line class="cls-2" x1="188.95" y1="96.53" x2="183.79" y2="98.83"/><line class="cls-2" x1="191.57" y1="103.37" x2="186.2" y2="105.11"/><line class="cls-2" x1="193.47" y1="110.45" x2="187.95" y2="111.62"/><line class="cls-2" x1="194.62" y1="117.68" x2="189" y2="118.27"/><line class="cls-2" x1="195" y1="125" x2="189.35" y2="125"/><line class="cls-2" x1="194.62" y1="132.32" x2="189" y2="131.73"/><line class="cls-2" x1="193.47" y1="139.55" x2="187.95" y2="138.38"/><line class="cls-2" x1="191.57" y1="146.63" x2="186.2" y2="144.89"/><line class="cls-2" x1="188.95" y1="153.47" x2="183.79" y2="151.17"/><line class="cls-2" x1="185.62" y1="160" x2="180.73" y2="157.18"/><line class="cls-2" x1="181.63" y1="166.14" x2="177.06" y2="162.83"/><line class="cls-2" x1="177.02" y1="171.84" x2="172.82" y2="168.06"/><line class="cls-2" x1="171.84" y1="177.02" x2="168.06" y2="172.82"/><line class="cls-2" x1="166.14" y1="181.63" x2="162.83" y2="177.06"/><line class="cls-2" x1="160" y1="185.62" x2="157.18" y2="180.73"/><line class="cls-2" x1="153.47" y1="188.95" x2="151.17" y2="183.79"/><line class="cls-2" x1="146.63" y1="191.57" x2="144.89" y2="186.2"/><line class="cls-2" x1="139.55" y1="193.47" x2="138.38" y2="187.95"/><line class="cls-2" x1="132.32" y1="194.62" x2="131.73" y2="189"/><line class="cls-2" x1="125" y1="195" x2="125" y2="189.35"/><line class="cls-2" x1="117.68" y1="194.62" x2="118.27" y2="189"/><line class="cls-2" x1="110.45" y1="193.47" x2="111.62" y2="187.95"/><line class="cls-2" x1="103.37" y1="191.57" x2="105.11" y2="186.2"/><line class="cls-2" x1="96.53" y1="188.95" x2="98.83" y2="183.79"/><line class="cls-2" x1="90" y1="185.62" x2="92.82" y2="180.73"/><line class="cls-2" x1="83.86" y1="181.63" x2="87.17" y2="177.06"/><line class="cls-2" x1="78.16" y1="177.02" x2="81.94" y2="172.82"/><line class="cls-2" x1="72.98" y1="171.84" x2="77.18" y2="168.06"/><line class="cls-2" x1="68.37" y1="166.14" x2="72.94" y2="162.83"/><line class="cls-2" x1="64.38" y1="160" x2="69.27" y2="157.18"/><line class="cls-2" x1="61.05" y1="153.47" x2="66.21" y2="151.17"/><line class="cls-2" x1="58.43" y1="146.63" x2="63.8" y2="144.89"/><line class="cls-2" x1="56.53" y1="139.55" x2="62.05" y2="138.38"/><line class="cls-2" x1="55.38" y1="132.32" x2="61" y2="131.73"/><line class="cls-2" x1="55" y1="125" x2="60.65" y2="125"/><line class="cls-2" x1="55.38" y1="117.68" x2="61" y2="118.27"/><line class="cls-2" x1="56.53" y1="110.45" x2="62.05" y2="111.62"/><line class="cls-2" x1="58.43" y1="103.37" x2="63.8" y2="105.11"/><line class="cls-2" x1="61.05" y1="96.53" x2="66.21" y2="98.83"/><line class="cls-2" x1="64.38" y1="90" x2="69.27" y2="92.82"/><line class="cls-2" x1="68.37" y1="83.86" x2="72.94" y2="87.17"/><line class="cls-2" x1="72.98" y1="78.16" x2="77.18" y2="81.94"/><line class="cls-2" x1="78.16" y1="72.98" x2="81.94" y2="77.18"/><line class="cls-2" x1="83.86" y1="68.37" x2="87.17" y2="72.94"/><line class="cls-2" x1="90" y1="64.38" x2="92.82" y2="69.27"/><line class="cls-2" x1="96.53" y1="61.05" x2="98.83" y2="66.21"/><line class="cls-2" x1="103.37" y1="58.43" x2="105.11" y2="63.8"/><line class="cls-2" x1="110.45" y1="56.53" x2="111.62" y2="62.05"/><line class="cls-2" x1="117.68" y1="55.38" x2="118.27" y2="61"/><line class="cls-2" x1="125" y1="50.64" x2="125" y2="60.65"/><line class="cls-2" x1="162.18" y1="60.6" x2="157.18" y2="69.27"/><line class="cls-2" x1="189.4" y1="87.82" x2="180.73" y2="92.82"/><line class="cls-2" x1="199.36" y1="125" x2="189.35" y2="125"/><line class="cls-2" x1="189.4" y1="162.18" x2="180.73" y2="157.18"/><line class="cls-2" x1="162.18" y1="189.4" x2="157.18" y2="180.73"/><line class="cls-2" x1="125" y1="199.36" x2="125" y2="189.35"/><line class="cls-2" x1="87.82" y1="189.4" x2="92.82" y2="180.73"/><line class="cls-2" x1="60.6" y1="162.18" x2="69.27" y2="157.18"/><line class="cls-2" x1="50.64" y1="125" x2="60.65" y2="125"/><line class="cls-2" x1="60.6" y1="87.82" x2="69.27" y2="92.82"/><line class="cls-2" x1="87.82" y1="60.6" x2="92.82" y2="69.27"/><line class="cls-3" x1="138.01" y1="1.25" x2="136.96" y2="11.23"/><line class="cls-3" x1="150.87" y1="3.29" x2="148.78" y2="13.11"/><line class="cls-3" x1="163.45" y1="6.66" x2="160.35" y2="16.21"/><line class="cls-3" x1="175.61" y1="11.33" x2="171.53" y2="20.5"/><line class="cls-3" x1="198.14" y1="24.33" x2="192.24" y2="32.45"/><line class="cls-3" x1="208.26" y1="32.53" x2="201.54" y2="39.99"/><line class="cls-3" x1="217.47" y1="41.74" x2="210.01" y2="48.46"/><line class="cls-3" x1="225.67" y1="51.86" x2="217.55" y2="57.76"/><line class="cls-3" x1="238.67" y1="74.39" x2="229.5" y2="78.47"/><line class="cls-3" x1="243.34" y1="86.55" x2="233.79" y2="89.65"/><line class="cls-3" x1="246.71" y1="99.13" x2="236.89" y2="101.22"/><line class="cls-3" x1="248.75" y1="111.99" x2="238.77" y2="113.04"/><line class="cls-3" x1="248.75" y1="138.01" x2="238.77" y2="136.96"/><line class="cls-3" x1="246.71" y1="150.87" x2="236.89" y2="148.78"/><line class="cls-3" x1="243.34" y1="163.45" x2="233.79" y2="160.35"/><line class="cls-3" x1="238.67" y1="175.61" x2="229.5" y2="171.53"/><line class="cls-3" x1="225.67" y1="198.14" x2="217.55" y2="192.24"/><line class="cls-3" x1="217.47" y1="208.26" x2="210.01" y2="201.54"/><line class="cls-3" x1="208.26" y1="217.47" x2="201.54" y2="210.01"/><line class="cls-3" x1="198.14" y1="225.67" x2="192.24" y2="217.55"/><line class="cls-3" x1="175.61" y1="238.67" x2="171.53" y2="229.5"/><line class="cls-3" x1="163.45" y1="243.34" x2="160.35" y2="233.79"/><line class="cls-3" x1="150.87" y1="246.71" x2="148.78" y2="236.89"/><line class="cls-3" x1="138.01" y1="248.75" x2="136.96" y2="238.77"/><line class="cls-3" x1="111.99" y1="248.75" x2="113.04" y2="238.77"/><line class="cls-3" x1="99.13" y1="246.71" x2="101.22" y2="236.89"/><line class="cls-3" x1="86.55" y1="243.34" x2="89.65" y2="233.79"/><line class="cls-3" x1="74.39" y1="238.67" x2="78.47" y2="229.5"/><line class="cls-3" x1="51.86" y1="225.67" x2="57.76" y2="217.55"/><line class="cls-3" x1="41.74" y1="217.47" x2="48.46" y2="210.01"/><line class="cls-3" x1="32.53" y1="208.26" x2="39.99" y2="201.54"/><line class="cls-3" x1="24.33" y1="198.14" x2="32.45" y2="192.24"/><line class="cls-3" x1="11.33" y1="175.61" x2="20.5" y2="171.53"/><line class="cls-3" x1="6.66" y1="163.45" x2="16.21" y2="160.35"/><line class="cls-3" x1="3.29" y1="150.87" x2="13.11" y2="148.78"/><line class="cls-3" x1="1.25" y1="138.01" x2="11.23" y2="136.96"/><line class="cls-3" x1="1.25" y1="111.99" x2="11.23" y2="113.04"/><line class="cls-3" x1="3.29" y1="99.13" x2="13.11" y2="101.22"/><line class="cls-3" x1="6.66" y1="86.55" x2="16.21" y2="89.65"/><line class="cls-3" x1="11.33" y1="74.39" x2="20.5" y2="78.47"/><line class="cls-3" x1="24.33" y1="51.86" x2="32.45" y2="57.76"/><line class="cls-3" x1="32.53" y1="41.74" x2="39.99" y2="48.46"/><line class="cls-3" x1="41.74" y1="32.53" x2="48.46" y2="39.99"/><line class="cls-3" x1="51.86" y1="24.33" x2="57.76" y2="32.45"/><line class="cls-3" x1="74.39" y1="11.33" x2="78.47" y2="20.5"/><line class="cls-3" x1="86.55" y1="6.66" x2="89.65" y2="16.21"/><line class="cls-3" x1="99.13" y1="3.29" x2="101.22" y2="13.11"/><line class="cls-3" x1="111.99" y1="1.25" x2="113.04" y2="11.23"/><path class="cls-4" d="M119.08,21.34V20.86q1.3-.71,1.86-1.05a6.4,6.4,0,0,0,.65-0.47l0.19,0.19q-0.15,2.61-.15,6.5,0,3.36,0,3.81a4.28,4.28,0,0,0,.11,1.13,0.39,0.39,0,0,0,.13.18l1,0.37V32q-1.36-.1-2-0.1t-1.68.1V31.52a8.28,8.28,0,0,0,1.05-.4,0.43,0.43,0,0,0,.14-0.18,6,6,0,0,0,.09-1.13q0-.33,0-3.52V21.94a1.57,1.57,0,0,0-.1-0.66,0.32,0.32,0,0,0-.3-0.16A5.51,5.51,0,0,0,119.08,21.34Z"/><path class="cls-4" d="M125.73,22.72h-0.47q0.2-1.05.32-2.17a4.2,4.2,0,0,1,1.1-.92,2.33,2.33,0,0,1,1.13-.3,2.14,2.14,0,0,1,1.27.43A2.6,2.6,0,0,1,130,21a4.63,4.63,0,0,1,.3,1.71,5.43,5.43,0,0,1-.23,1.6,9.12,9.12,0,0,1-1,2.11q-0.68,1.13-2.85,4.25H129a1.36,1.36,0,0,0,.79-0.16,2.32,2.32,0,0,0,.46-0.88l0.08-.19h0.5Q130.28,31.1,130,32q-1.32-.1-2.39-0.1t-2.91.1V31.5q2-2.79,2.85-4.16a11.48,11.48,0,0,0,1.21-2.53,5.33,5.33,0,0,0,.25-1.65,3.08,3.08,0,0,0-.42-1.77,1.28,1.28,0,0,0-1.09-.61,1.43,1.43,0,0,0-1.08.52A4.21,4.21,0,0,0,125.73,22.72Z"/><path class="cls-4" d="M222,120.89h-0.44q0.21-1,.35-1.94a3.54,3.54,0,0,1,1-.67,2.38,2.38,0,0,1,1-.22,1.94,1.94,0,0,1,1.11.33,2,2,0,0,1,.73.93,3.24,3.24,0,0,1,.25,1.24,3.73,3.73,0,0,1-1.29,2.78,2.25,2.25,0,0,1,1.11.81,3.87,3.87,0,0,1,.63,2.31,5.05,5.05,0,0,1-1,3.2,3.19,3.19,0,0,1-2.61,1.34,3.65,3.65,0,0,1-1.72-.45q0.19-1.12.28-2.29h0.4a3.15,3.15,0,0,0,.63,1.43,1.29,1.29,0,0,0,1,.41,1.67,1.67,0,0,0,1.4-.77,3.47,3.47,0,0,0,.56-2.07,3.29,3.29,0,0,0-.59-2.06,2,2,0,0,0-1.68-.77h-0.22v-0.62a3.26,3.26,0,0,0,1.61-1.15,2.72,2.72,0,0,0,.46-1.52,2,2,0,0,0-.36-1.26,1.17,1.17,0,0,0-1-.47,1.28,1.28,0,0,0-.94.4A3.06,3.06,0,0,0,222,120.89Z"/><path class="cls-4" d="M127.19,216.79l0.15,0.69a8.47,8.47,0,0,0-2,1.49,6.72,6.72,0,0,0-1.25,1.84,9.3,9.3,0,0,0-.59,1.92,11,11,0,0,1,1.3-1.2,1.26,1.26,0,0,1,.69-0.19,2.09,2.09,0,0,1,1.79,1,4.8,4.8,0,0,1,.7,2.75,6.51,6.51,0,0,1-.8,3.2,2.42,2.42,0,0,1-4.34.19A6.2,6.2,0,0,1,122,225a9.92,9.92,0,0,1,1.13-4.71A7.59,7.59,0,0,1,127.19,216.79ZM126.84,226a7,7,0,0,0-.2-1.46,3.24,3.24,0,0,0-.63-1.4,1.29,1.29,0,0,0-1-.52,1.35,1.35,0,0,0-.88.35,2,2,0,0,0-.6.86,4,4,0,0,0-.18,1.32,6,6,0,0,0,.67,3,1.46,1.46,0,0,0,1.21.88,1.31,1.31,0,0,0,1.21-.92A5.25,5.25,0,0,0,126.84,226Z"/><path class="cls-4" d="M24.23,131.07l-0.12-.71A6.63,6.63,0,0,0,26,129a7.33,7.33,0,0,0,1.35-2,10.86,10.86,0,0,0,.69-2.22,6.66,6.66,0,0,1-1.21,1.3,1.6,1.6,0,0,1-.92.34,2.05,2.05,0,0,1-1.69-1,4.81,4.81,0,0,1-.72-2.79,5.49,5.49,0,0,1,.9-3.26,2.63,2.63,0,0,1,2.19-1.26,2.41,2.41,0,0,1,2.06,1.15,5.9,5.9,0,0,1,.79,3.36,11.58,11.58,0,0,1-.59,3.6,7.8,7.8,0,0,1-1.68,3A8.42,8.42,0,0,1,24.23,131.07Zm0.4-9.45a5.06,5.06,0,0,0,.54,2.62,1.54,1.54,0,0,0,1.3.87,1.43,1.43,0,0,0,1.17-.73,3.35,3.35,0,0,0,.51-1.94,5.74,5.74,0,0,0-.54-2.58,1.59,1.59,0,0,0-1.37-1.08,1.36,1.36,0,0,0-1.13.74A3.87,3.87,0,0,0,24.63,121.62Z"/></svg>
diff --git a/modules/default/clock/faces/face-008.svg b/modules/default/clock/faces/face-008.svg
index 551ea7df..6fadb396 100644
--- a/modules/default/clock/faces/face-008.svg
+++ b/modules/default/clock/faces/face-008.svg
@@ -1 +1 @@
-<svg id="Minute_Markers_-_No_Hours" data-name="Minute Markers - No Hours" xmlns="https://www.w3.org/2000/svg" viewBox="0 0 250 250"><defs><style>.cls-1,.cls-2{fill:none;stroke:#fff;stroke-linecap:round;stroke-miterlimit:10;}.cls-1{stroke-width:0.5px;}.cls-3{fill:#fff;}</style></defs><title>face-008</title><line class="cls-1" x1="138.01" y1="1.25" x2="136.96" y2="11.23"/><line class="cls-1" x1="150.87" y1="3.29" x2="148.78" y2="13.11"/><line class="cls-1" x1="163.45" y1="6.66" x2="160.35" y2="16.21"/><line class="cls-1" x1="175.61" y1="11.33" x2="171.53" y2="20.5"/><line class="cls-1" x1="198.14" y1="24.33" x2="192.24" y2="32.45"/><line class="cls-1" x1="208.26" y1="32.53" x2="201.54" y2="39.99"/><line class="cls-1" x1="217.47" y1="41.74" x2="210.01" y2="48.46"/><line class="cls-1" x1="225.67" y1="51.86" x2="217.55" y2="57.76"/><line class="cls-1" x1="238.67" y1="74.39" x2="229.5" y2="78.47"/><line class="cls-1" x1="243.34" y1="86.55" x2="233.79" y2="89.65"/><line class="cls-1" x1="246.71" y1="99.13" x2="236.89" y2="101.22"/><line class="cls-1" x1="248.75" y1="111.99" x2="238.77" y2="113.04"/><line class="cls-1" x1="248.75" y1="138.01" x2="238.77" y2="136.96"/><line class="cls-1" x1="246.71" y1="150.87" x2="236.89" y2="148.78"/><line class="cls-1" x1="243.34" y1="163.45" x2="233.79" y2="160.35"/><line class="cls-1" x1="238.67" y1="175.61" x2="229.5" y2="171.53"/><line class="cls-1" x1="225.67" y1="198.14" x2="217.55" y2="192.24"/><line class="cls-1" x1="217.47" y1="208.26" x2="210.01" y2="201.54"/><line class="cls-1" x1="208.26" y1="217.47" x2="201.54" y2="210.01"/><line class="cls-1" x1="198.14" y1="225.67" x2="192.24" y2="217.55"/><line class="cls-1" x1="175.61" y1="238.67" x2="171.53" y2="229.5"/><line class="cls-1" x1="163.45" y1="243.34" x2="160.35" y2="233.79"/><line class="cls-1" x1="150.87" y1="246.71" x2="148.78" y2="236.89"/><line class="cls-1" x1="138.01" y1="248.75" x2="136.96" y2="238.77"/><line class="cls-1" x1="111.99" y1="248.75" x2="113.04" y2="238.77"/><line class="cls-1" x1="99.13" y1="246.71" x2="101.22" y2="236.89"/><line class="cls-1" x1="86.55" y1="243.34" x2="89.65" y2="233.79"/><line class="cls-1" x1="74.39" y1="238.67" x2="78.47" y2="229.5"/><line class="cls-1" x1="51.86" y1="225.67" x2="57.76" y2="217.55"/><line class="cls-1" x1="41.74" y1="217.47" x2="48.46" y2="210.01"/><line class="cls-1" x1="32.53" y1="208.26" x2="39.99" y2="201.54"/><line class="cls-1" x1="24.33" y1="198.14" x2="32.45" y2="192.24"/><line class="cls-1" x1="11.33" y1="175.61" x2="20.5" y2="171.53"/><line class="cls-1" x1="6.66" y1="163.45" x2="16.21" y2="160.35"/><line class="cls-1" x1="3.29" y1="150.87" x2="13.11" y2="148.78"/><line class="cls-1" x1="1.25" y1="138.01" x2="11.23" y2="136.96"/><line class="cls-1" x1="1.25" y1="111.99" x2="11.23" y2="113.04"/><line class="cls-1" x1="3.29" y1="99.13" x2="13.11" y2="101.22"/><line class="cls-1" x1="6.66" y1="86.55" x2="16.21" y2="89.65"/><line class="cls-1" x1="11.33" y1="74.39" x2="20.5" y2="78.47"/><line class="cls-1" x1="24.33" y1="51.86" x2="32.45" y2="57.76"/><line class="cls-1" x1="32.53" y1="41.74" x2="39.99" y2="48.46"/><line class="cls-1" x1="41.74" y1="32.53" x2="48.46" y2="39.99"/><line class="cls-1" x1="51.86" y1="24.33" x2="57.76" y2="32.45"/><line class="cls-1" x1="74.39" y1="11.33" x2="78.47" y2="20.5"/><line class="cls-1" x1="86.55" y1="6.66" x2="89.65" y2="16.21"/><line class="cls-1" x1="99.13" y1="3.29" x2="101.22" y2="13.11"/><line class="cls-1" x1="111.99" y1="1.25" x2="113.04" y2="11.23"/><line class="cls-2" x1="125" y1="1.25" x2="125" y2="16.23"/><line class="cls-2" x1="186.87" y1="17.83" x2="179.39" y2="30.8"/><line class="cls-2" x1="232.17" y1="63.12" x2="219.2" y2="70.61"/><line class="cls-2" x1="248.75" y1="125" x2="233.77" y2="125"/><line class="cls-2" x1="232.17" y1="186.87" x2="219.2" y2="179.39"/><line class="cls-2" x1="186.88" y1="232.17" x2="179.39" y2="219.2"/><line class="cls-2" x1="125" y1="248.75" x2="125" y2="233.77"/><line class="cls-2" x1="63.13" y1="232.17" x2="70.61" y2="219.2"/><line class="cls-2" x1="17.83" y1="186.88" x2="30.8" y2="179.39"/><line class="cls-2" x1="1.25" y1="125" x2="16.23" y2="125"/><line class="cls-2" x1="17.83" y1="63.13" x2="30.8" y2="70.61"/><line class="cls-2" x1="63.12" y1="17.83" x2="70.61" y2="30.8"/><path class="cls-3" d="M119.08,21.34V20.86q1.3-.71,1.86-1.05a6.4,6.4,0,0,0,.65-0.47l0.19,0.19q-0.15,2.61-.15,6.5,0,3.36,0,3.81a4.28,4.28,0,0,0,.11,1.13,0.39,0.39,0,0,0,.13.18l1,0.37V32q-1.36-.1-2-0.1t-1.68.1V31.52a8.28,8.28,0,0,0,1.05-.4,0.43,0.43,0,0,0,.14-0.18,6,6,0,0,0,.09-1.13q0-.33,0-3.52V21.94a1.57,1.57,0,0,0-.1-0.66,0.32,0.32,0,0,0-.3-0.16A5.51,5.51,0,0,0,119.08,21.34Z"/><path class="cls-3" d="M125.73,22.72h-0.47q0.2-1.05.32-2.17a4.2,4.2,0,0,1,1.1-.92,2.33,2.33,0,0,1,1.13-.3,2.14,2.14,0,0,1,1.27.43A2.6,2.6,0,0,1,130,21a4.63,4.63,0,0,1,.3,1.71,5.43,5.43,0,0,1-.23,1.6,9.12,9.12,0,0,1-1,2.11q-0.68,1.13-2.85,4.25H129a1.36,1.36,0,0,0,.79-0.16,2.32,2.32,0,0,0,.46-0.88l0.08-.19h0.5Q130.28,31.1,130,32q-1.32-.1-2.39-0.1t-2.91.1V31.5q2-2.79,2.85-4.16a11.48,11.48,0,0,0,1.21-2.53,5.33,5.33,0,0,0,.25-1.65,3.08,3.08,0,0,0-.42-1.77,1.28,1.28,0,0,0-1.09-.61,1.43,1.43,0,0,0-1.08.52A4.21,4.21,0,0,0,125.73,22.72Z"/><path class="cls-3" d="M222,120.89h-0.44q0.21-1,.35-1.94a3.54,3.54,0,0,1,1-.67,2.38,2.38,0,0,1,1-.22,1.94,1.94,0,0,1,1.11.33,2,2,0,0,1,.73.93,3.24,3.24,0,0,1,.25,1.24,3.73,3.73,0,0,1-1.29,2.78,2.25,2.25,0,0,1,1.11.81,3.87,3.87,0,0,1,.63,2.31,5.05,5.05,0,0,1-1,3.2,3.19,3.19,0,0,1-2.61,1.34,3.65,3.65,0,0,1-1.72-.45q0.19-1.12.28-2.29h0.4a3.15,3.15,0,0,0,.63,1.43,1.29,1.29,0,0,0,1,.41,1.67,1.67,0,0,0,1.4-.77,3.47,3.47,0,0,0,.56-2.07,3.29,3.29,0,0,0-.59-2.06,2,2,0,0,0-1.68-.77h-0.22v-0.62a3.26,3.26,0,0,0,1.61-1.15,2.72,2.72,0,0,0,.46-1.52,2,2,0,0,0-.36-1.26,1.17,1.17,0,0,0-1-.47,1.28,1.28,0,0,0-.94.4A3.06,3.06,0,0,0,222,120.89Z"/><path class="cls-3" d="M127.19,216.79l0.15,0.69a8.47,8.47,0,0,0-2,1.49,6.72,6.72,0,0,0-1.25,1.84,9.3,9.3,0,0,0-.59,1.92,11,11,0,0,1,1.3-1.2,1.26,1.26,0,0,1,.69-0.19,2.09,2.09,0,0,1,1.79,1,4.8,4.8,0,0,1,.7,2.75,6.51,6.51,0,0,1-.8,3.2,2.42,2.42,0,0,1-4.34.19A6.2,6.2,0,0,1,122,225a9.92,9.92,0,0,1,1.13-4.71A7.59,7.59,0,0,1,127.19,216.79ZM126.84,226a7,7,0,0,0-.2-1.46,3.24,3.24,0,0,0-.63-1.4,1.29,1.29,0,0,0-1-.52,1.35,1.35,0,0,0-.88.35,2,2,0,0,0-.6.86,4,4,0,0,0-.18,1.32,6,6,0,0,0,.67,3,1.46,1.46,0,0,0,1.21.88,1.31,1.31,0,0,0,1.21-.92A5.25,5.25,0,0,0,126.84,226Z"/><path class="cls-3" d="M24.23,131.07l-0.12-.71A6.63,6.63,0,0,0,26,129a7.33,7.33,0,0,0,1.35-2,10.86,10.86,0,0,0,.69-2.22,6.66,6.66,0,0,1-1.21,1.3,1.6,1.6,0,0,1-.92.34,2.05,2.05,0,0,1-1.69-1,4.81,4.81,0,0,1-.72-2.79,5.49,5.49,0,0,1,.9-3.26,2.63,2.63,0,0,1,2.19-1.26,2.41,2.41,0,0,1,2.06,1.15,5.9,5.9,0,0,1,.79,3.36,11.58,11.58,0,0,1-.59,3.6,7.8,7.8,0,0,1-1.68,3A8.42,8.42,0,0,1,24.23,131.07Zm0.4-9.45a5.06,5.06,0,0,0,.54,2.62,1.54,1.54,0,0,0,1.3.87,1.43,1.43,0,0,0,1.17-.73,3.35,3.35,0,0,0,.51-1.94,5.74,5.74,0,0,0-.54-2.58,1.59,1.59,0,0,0-1.37-1.08,1.36,1.36,0,0,0-1.13.74A3.87,3.87,0,0,0,24.63,121.62Z"/></svg>
+<svg id="Minute_Markers_-_No_Hours" data-name="Minute Markers - No Hours" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 250 250"><defs><style>.cls-1,.cls-2{fill:none;stroke:#fff;stroke-linecap:round;stroke-miterlimit:10;}.cls-1{stroke-width:0.5px;}.cls-3{fill:#fff;}</style></defs><title>face-008</title><line class="cls-1" x1="138.01" y1="1.25" x2="136.96" y2="11.23"/><line class="cls-1" x1="150.87" y1="3.29" x2="148.78" y2="13.11"/><line class="cls-1" x1="163.45" y1="6.66" x2="160.35" y2="16.21"/><line class="cls-1" x1="175.61" y1="11.33" x2="171.53" y2="20.5"/><line class="cls-1" x1="198.14" y1="24.33" x2="192.24" y2="32.45"/><line class="cls-1" x1="208.26" y1="32.53" x2="201.54" y2="39.99"/><line class="cls-1" x1="217.47" y1="41.74" x2="210.01" y2="48.46"/><line class="cls-1" x1="225.67" y1="51.86" x2="217.55" y2="57.76"/><line class="cls-1" x1="238.67" y1="74.39" x2="229.5" y2="78.47"/><line class="cls-1" x1="243.34" y1="86.55" x2="233.79" y2="89.65"/><line class="cls-1" x1="246.71" y1="99.13" x2="236.89" y2="101.22"/><line class="cls-1" x1="248.75" y1="111.99" x2="238.77" y2="113.04"/><line class="cls-1" x1="248.75" y1="138.01" x2="238.77" y2="136.96"/><line class="cls-1" x1="246.71" y1="150.87" x2="236.89" y2="148.78"/><line class="cls-1" x1="243.34" y1="163.45" x2="233.79" y2="160.35"/><line class="cls-1" x1="238.67" y1="175.61" x2="229.5" y2="171.53"/><line class="cls-1" x1="225.67" y1="198.14" x2="217.55" y2="192.24"/><line class="cls-1" x1="217.47" y1="208.26" x2="210.01" y2="201.54"/><line class="cls-1" x1="208.26" y1="217.47" x2="201.54" y2="210.01"/><line class="cls-1" x1="198.14" y1="225.67" x2="192.24" y2="217.55"/><line class="cls-1" x1="175.61" y1="238.67" x2="171.53" y2="229.5"/><line class="cls-1" x1="163.45" y1="243.34" x2="160.35" y2="233.79"/><line class="cls-1" x1="150.87" y1="246.71" x2="148.78" y2="236.89"/><line class="cls-1" x1="138.01" y1="248.75" x2="136.96" y2="238.77"/><line class="cls-1" x1="111.99" y1="248.75" x2="113.04" y2="238.77"/><line class="cls-1" x1="99.13" y1="246.71" x2="101.22" y2="236.89"/><line class="cls-1" x1="86.55" y1="243.34" x2="89.65" y2="233.79"/><line class="cls-1" x1="74.39" y1="238.67" x2="78.47" y2="229.5"/><line class="cls-1" x1="51.86" y1="225.67" x2="57.76" y2="217.55"/><line class="cls-1" x1="41.74" y1="217.47" x2="48.46" y2="210.01"/><line class="cls-1" x1="32.53" y1="208.26" x2="39.99" y2="201.54"/><line class="cls-1" x1="24.33" y1="198.14" x2="32.45" y2="192.24"/><line class="cls-1" x1="11.33" y1="175.61" x2="20.5" y2="171.53"/><line class="cls-1" x1="6.66" y1="163.45" x2="16.21" y2="160.35"/><line class="cls-1" x1="3.29" y1="150.87" x2="13.11" y2="148.78"/><line class="cls-1" x1="1.25" y1="138.01" x2="11.23" y2="136.96"/><line class="cls-1" x1="1.25" y1="111.99" x2="11.23" y2="113.04"/><line class="cls-1" x1="3.29" y1="99.13" x2="13.11" y2="101.22"/><line class="cls-1" x1="6.66" y1="86.55" x2="16.21" y2="89.65"/><line class="cls-1" x1="11.33" y1="74.39" x2="20.5" y2="78.47"/><line class="cls-1" x1="24.33" y1="51.86" x2="32.45" y2="57.76"/><line class="cls-1" x1="32.53" y1="41.74" x2="39.99" y2="48.46"/><line class="cls-1" x1="41.74" y1="32.53" x2="48.46" y2="39.99"/><line class="cls-1" x1="51.86" y1="24.33" x2="57.76" y2="32.45"/><line class="cls-1" x1="74.39" y1="11.33" x2="78.47" y2="20.5"/><line class="cls-1" x1="86.55" y1="6.66" x2="89.65" y2="16.21"/><line class="cls-1" x1="99.13" y1="3.29" x2="101.22" y2="13.11"/><line class="cls-1" x1="111.99" y1="1.25" x2="113.04" y2="11.23"/><line class="cls-2" x1="125" y1="1.25" x2="125" y2="16.23"/><line class="cls-2" x1="186.87" y1="17.83" x2="179.39" y2="30.8"/><line class="cls-2" x1="232.17" y1="63.12" x2="219.2" y2="70.61"/><line class="cls-2" x1="248.75" y1="125" x2="233.77" y2="125"/><line class="cls-2" x1="232.17" y1="186.87" x2="219.2" y2="179.39"/><line class="cls-2" x1="186.88" y1="232.17" x2="179.39" y2="219.2"/><line class="cls-2" x1="125" y1="248.75" x2="125" y2="233.77"/><line class="cls-2" x1="63.13" y1="232.17" x2="70.61" y2="219.2"/><line class="cls-2" x1="17.83" y1="186.88" x2="30.8" y2="179.39"/><line class="cls-2" x1="1.25" y1="125" x2="16.23" y2="125"/><line class="cls-2" x1="17.83" y1="63.13" x2="30.8" y2="70.61"/><line class="cls-2" x1="63.12" y1="17.83" x2="70.61" y2="30.8"/><path class="cls-3" d="M119.08,21.34V20.86q1.3-.71,1.86-1.05a6.4,6.4,0,0,0,.65-0.47l0.19,0.19q-0.15,2.61-.15,6.5,0,3.36,0,3.81a4.28,4.28,0,0,0,.11,1.13,0.39,0.39,0,0,0,.13.18l1,0.37V32q-1.36-.1-2-0.1t-1.68.1V31.52a8.28,8.28,0,0,0,1.05-.4,0.43,0.43,0,0,0,.14-0.18,6,6,0,0,0,.09-1.13q0-.33,0-3.52V21.94a1.57,1.57,0,0,0-.1-0.66,0.32,0.32,0,0,0-.3-0.16A5.51,5.51,0,0,0,119.08,21.34Z"/><path class="cls-3" d="M125.73,22.72h-0.47q0.2-1.05.32-2.17a4.2,4.2,0,0,1,1.1-.92,2.33,2.33,0,0,1,1.13-.3,2.14,2.14,0,0,1,1.27.43A2.6,2.6,0,0,1,130,21a4.63,4.63,0,0,1,.3,1.71,5.43,5.43,0,0,1-.23,1.6,9.12,9.12,0,0,1-1,2.11q-0.68,1.13-2.85,4.25H129a1.36,1.36,0,0,0,.79-0.16,2.32,2.32,0,0,0,.46-0.88l0.08-.19h0.5Q130.28,31.1,130,32q-1.32-.1-2.39-0.1t-2.91.1V31.5q2-2.79,2.85-4.16a11.48,11.48,0,0,0,1.21-2.53,5.33,5.33,0,0,0,.25-1.65,3.08,3.08,0,0,0-.42-1.77,1.28,1.28,0,0,0-1.09-.61,1.43,1.43,0,0,0-1.08.52A4.21,4.21,0,0,0,125.73,22.72Z"/><path class="cls-3" d="M222,120.89h-0.44q0.21-1,.35-1.94a3.54,3.54,0,0,1,1-.67,2.38,2.38,0,0,1,1-.22,1.94,1.94,0,0,1,1.11.33,2,2,0,0,1,.73.93,3.24,3.24,0,0,1,.25,1.24,3.73,3.73,0,0,1-1.29,2.78,2.25,2.25,0,0,1,1.11.81,3.87,3.87,0,0,1,.63,2.31,5.05,5.05,0,0,1-1,3.2,3.19,3.19,0,0,1-2.61,1.34,3.65,3.65,0,0,1-1.72-.45q0.19-1.12.28-2.29h0.4a3.15,3.15,0,0,0,.63,1.43,1.29,1.29,0,0,0,1,.41,1.67,1.67,0,0,0,1.4-.77,3.47,3.47,0,0,0,.56-2.07,3.29,3.29,0,0,0-.59-2.06,2,2,0,0,0-1.68-.77h-0.22v-0.62a3.26,3.26,0,0,0,1.61-1.15,2.72,2.72,0,0,0,.46-1.52,2,2,0,0,0-.36-1.26,1.17,1.17,0,0,0-1-.47,1.28,1.28,0,0,0-.94.4A3.06,3.06,0,0,0,222,120.89Z"/><path class="cls-3" d="M127.19,216.79l0.15,0.69a8.47,8.47,0,0,0-2,1.49,6.72,6.72,0,0,0-1.25,1.84,9.3,9.3,0,0,0-.59,1.92,11,11,0,0,1,1.3-1.2,1.26,1.26,0,0,1,.69-0.19,2.09,2.09,0,0,1,1.79,1,4.8,4.8,0,0,1,.7,2.75,6.51,6.51,0,0,1-.8,3.2,2.42,2.42,0,0,1-4.34.19A6.2,6.2,0,0,1,122,225a9.92,9.92,0,0,1,1.13-4.71A7.59,7.59,0,0,1,127.19,216.79ZM126.84,226a7,7,0,0,0-.2-1.46,3.24,3.24,0,0,0-.63-1.4,1.29,1.29,0,0,0-1-.52,1.35,1.35,0,0,0-.88.35,2,2,0,0,0-.6.86,4,4,0,0,0-.18,1.32,6,6,0,0,0,.67,3,1.46,1.46,0,0,0,1.21.88,1.31,1.31,0,0,0,1.21-.92A5.25,5.25,0,0,0,126.84,226Z"/><path class="cls-3" d="M24.23,131.07l-0.12-.71A6.63,6.63,0,0,0,26,129a7.33,7.33,0,0,0,1.35-2,10.86,10.86,0,0,0,.69-2.22,6.66,6.66,0,0,1-1.21,1.3,1.6,1.6,0,0,1-.92.34,2.05,2.05,0,0,1-1.69-1,4.81,4.81,0,0,1-.72-2.79,5.49,5.49,0,0,1,.9-3.26,2.63,2.63,0,0,1,2.19-1.26,2.41,2.41,0,0,1,2.06,1.15,5.9,5.9,0,0,1,.79,3.36,11.58,11.58,0,0,1-.59,3.6,7.8,7.8,0,0,1-1.68,3A8.42,8.42,0,0,1,24.23,131.07Zm0.4-9.45a5.06,5.06,0,0,0,.54,2.62,1.54,1.54,0,0,0,1.3.87,1.43,1.43,0,0,0,1.17-.73,3.35,3.35,0,0,0,.51-1.94,5.74,5.74,0,0,0-.54-2.58,1.59,1.59,0,0,0-1.37-1.08,1.36,1.36,0,0,0-1.13.74A3.87,3.87,0,0,0,24.63,121.62Z"/></svg>
diff --git a/modules/default/clock/faces/face-009.svg b/modules/default/clock/faces/face-009.svg
index cd3720f2..bd207e09 100644
--- a/modules/default/clock/faces/face-009.svg
+++ b/modules/default/clock/faces/face-009.svg
@@ -1 +1 @@
-<svg id="Roman_Outer_Ring" data-name="Roman Outer Ring" xmlns="https://www.w3.org/2000/svg" viewBox="0 0 250 250"><defs><style>.cls-1,.cls-3{fill:none;stroke:#fff;stroke-miterlimit:10;}.cls-2{fill:#fff;}.cls-3{stroke-linecap:round;stroke-width:0.47px;}</style></defs><title>face-009</title><circle class="cls-1" cx="125" cy="125" r="90"/><path class="cls-2" d="M125,1.25A123.75,123.75,0,0,1,212.5,212.5a123.75,123.75,0,0,1-175-175A122.94,122.94,0,0,1,125,1.25m0-1A124.75,124.75,0,1,0,249.75,125,124.75,124.75,0,0,0,125,.25h0Z"/><path class="cls-2" d="M107.26,7.42v-1q1.9,0.18,3.5.18t4.06-.18v1a5.71,5.71,0,0,0-1.78.72,0.45,0.45,0,0,0-.16.34,3.84,3.84,0,0,0,.4,1.14q1.7,3.58,2.9,5.7,2-3.4,3.51-6.35A2.29,2.29,0,0,0,120,8.28,0.42,0.42,0,0,0,119.81,8a7,7,0,0,0-1.59-.55v-1q2,0.18,3.21.18a28.13,28.13,0,0,0,3-.18v1a5.83,5.83,0,0,0-2.08.85,11,11,0,0,0-1.69,2.36q-2.17,3.74-3.56,6.4,1,2.22,2.69,5.42l2.48,4.75a2.21,2.21,0,0,0,.49.52,8,8,0,0,0,1.91.85v1q-2.16-.18-3.46-0.18t-3.8.18v-1a10.33,10.33,0,0,0,1.73-.7,0.5,0.5,0,0,0,.13-0.37,3.07,3.07,0,0,0-.34-1.12q-1.75-3.7-3.34-6.62-1.47,2.39-3.65,6.58a3.81,3.81,0,0,0-.45,1.14,0.65,0.65,0,0,0,.18.46,3.84,3.84,0,0,0,1.28.52l0.35,0.11v1q-1.78-.18-3.42-0.18a19.92,19.92,0,0,0-2.78.18v-1a5,5,0,0,0,1.9-.85,17.32,17.32,0,0,0,2-2.94q2.58-4.5,3.73-6.74-1.14-2.41-3.64-7.21a11.2,11.2,0,0,0-1.49-2.33A8.22,8.22,0,0,0,107.26,7.42Z"/><path class="cls-2" d="M133.79,6.46v1l-0.63.18a4.13,4.13,0,0,0-1.88.71A2.78,2.78,0,0,0,131,9.79v0.57L131,16.9l0,9.5a2.65,2.65,0,0,0,.25,1.45,3.37,3.37,0,0,0,1.71.54q0.28,0,.82.2v1q-2-.18-3.78-0.18t-4.12.18v-1a3.41,3.41,0,0,1,.54-0.16,4.56,4.56,0,0,0,2-.69,3.1,3.1,0,0,0,.25-1.6l0-.81,0-6q0-9.2,0-10.18a1.39,1.39,0,0,0-.26-0.83,4.61,4.61,0,0,0-1.84-.7l-0.64-.21v-1q2.65,0.18,4.14.18Q131.68,6.64,133.79,6.46Z"/><path class="cls-2" d="M142.92,6.46v1l-0.63.18a4.13,4.13,0,0,0-1.88.71,2.78,2.78,0,0,0-.26,1.49v0.57l-0.06,6.54,0,9.5a2.65,2.65,0,0,0,.25,1.45,3.37,3.37,0,0,0,1.71.54q0.28,0,.82.2v1q-2-.18-3.78-0.18t-4.12.18v-1a3.46,3.46,0,0,1,.54-0.16,4.56,4.56,0,0,0,2-.69,3.1,3.1,0,0,0,.25-1.6l0-.81,0-6q0-9.2,0-10.18a1.39,1.39,0,0,0-.26-0.83,4.61,4.61,0,0,0-1.84-.7L135,7.42v-1q2.65,0.18,4.14.18Q140.8,6.64,142.92,6.46Z"/><path class="cls-2" d="M187.77,24.35l-0.48.83L186.66,25a4.13,4.13,0,0,0-2-.33,2.77,2.77,0,0,0-1,1.16l-0.28.49L180.1,32l-4.72,8.24a2.66,2.66,0,0,0-.51,1.38,3.37,3.37,0,0,0,1.22,1.32q0.22,0.18.61,0.58l-0.48.83q-1.61-1.14-3.19-2t-3.66-1.91l0.48-.83a3.53,3.53,0,0,1,.55.13,4.57,4.57,0,0,0,2.06.39,3.11,3.11,0,0,0,1-1.26l0.38-.72,3-5.15q4.6-8,5.06-8.83a1.39,1.39,0,0,0,.19-0.85,4.6,4.6,0,0,0-1.24-1.53l-0.45-.5,0.48-.83q2.21,1.48,3.5,2.23T187.77,24.35Z"/><path class="cls-2" d="M227.38,65.29l-0.83.48-0.47-.46A4.13,4.13,0,0,0,224.53,64a2.78,2.78,0,0,0-1.42.52l-0.49.28-5.69,3.22-8.21,4.78a2.65,2.65,0,0,0-1.13.94,3.35,3.35,0,0,0,.39,1.75q0.1,0.27.24,0.81l-0.83.48q-0.83-1.79-1.74-3.36T203.45,70l0.83-.48a3.62,3.62,0,0,1,.41.38,4.57,4.57,0,0,0,1.59,1.37,3.1,3.1,0,0,0,1.51-.58l0.69-.43,5.19-3q8-4.6,8.8-5.12a1.4,1.4,0,0,0,.59-0.64,4.6,4.6,0,0,0-.31-1.94q-0.05-.22-0.14-0.66l0.83-.48q1.17,2.39,1.92,3.68T227.38,65.29Z"/><path class="cls-2" d="M231.95,73.19l-0.83.48-0.47-.46a4.12,4.12,0,0,0-1.55-1.27,2.77,2.77,0,0,0-1.42.52l-0.49.28L221.49,76l-8.21,4.78a2.65,2.65,0,0,0-1.13.94,3.37,3.37,0,0,0,.39,1.75q0.1,0.27.24,0.81l-0.83.48q-0.83-1.79-1.74-3.36T208,77.87l0.83-.48a3.6,3.6,0,0,1,.41.38,4.57,4.57,0,0,0,1.59,1.37,3.12,3.12,0,0,0,1.51-.58l0.69-.43,5.19-3q8-4.6,8.8-5.12a1.39,1.39,0,0,0,.59-0.64,4.6,4.6,0,0,0-.31-1.94c0-.15-0.08-0.37-0.14-0.66l0.83-.48q1.17,2.39,1.92,3.68T231.95,73.19Z"/><path class="cls-2" d="M243.54,119.87h-1q-0.13-.43-0.18-0.63a4.14,4.14,0,0,0-.71-1.88,2.78,2.78,0,0,0-1.49-.26h-0.57L233.1,117l-9.5,0a2.64,2.64,0,0,0-1.45.25,3.36,3.36,0,0,0-.54,1.71q0,0.28-.2.82h-1q0.18-2,.18-3.78T220.47,112h1a3.55,3.55,0,0,1,.16.54,4.57,4.57,0,0,0,.69,2,3.11,3.11,0,0,0,1.6.25l0.81,0,6,0q9.2,0,10.18,0a1.39,1.39,0,0,0,.83-0.26,4.58,4.58,0,0,0,.7-1.84q0.07-.22.21-0.64h1q-0.18,2.65-.18,4.14Q243.36,117.75,243.54,119.87Z"/><path class="cls-2" d="M243.54,129h-1c-0.09-.28-0.15-0.5-0.18-0.63a4.13,4.13,0,0,0-.71-1.88,2.77,2.77,0,0,0-1.49-.26h-0.57l-6.54-.06-9.5,0a2.65,2.65,0,0,0-1.45.25,3.36,3.36,0,0,0-.54,1.71q0,0.28-.2.82h-1q0.18-2,.18-3.78t-0.18-4.12h1a3.55,3.55,0,0,1,.16.54,4.57,4.57,0,0,0,.69,2,3.11,3.11,0,0,0,1.6.25l0.81,0,6,0q9.2,0,10.18,0a1.39,1.39,0,0,0,.83-0.26,4.58,4.58,0,0,0,.7-1.84q0.07-.22.21-0.64h1q-0.18,2.65-.18,4.14Q243.36,126.88,243.54,129Z"/><path class="cls-2" d="M243.54,138.11h-1c-0.09-.28-0.15-0.5-0.18-0.63a4.13,4.13,0,0,0-.71-1.88,2.77,2.77,0,0,0-1.49-.26h-0.57l-6.54-.06-9.5,0a2.65,2.65,0,0,0-1.45.25,3.36,3.36,0,0,0-.54,1.71q0,0.28-.2.82h-1q0.18-2,.18-3.78t-0.18-4.12h1a3.59,3.59,0,0,1,.16.54,4.57,4.57,0,0,0,.69,2,3.11,3.11,0,0,0,1.6.25l0.81,0,6,0q9.2,0,10.18,0a1.39,1.39,0,0,0,.83-0.26,4.59,4.59,0,0,0,.7-1.84q0.07-.22.21-0.64h1q-0.18,2.65-.18,4.14Q243.36,136,243.54,138.11Z"/><path class="cls-2" d="M230.08,180.18l-0.83-.48c0.07-.29.12-0.5,0.16-0.64a4.13,4.13,0,0,0,.33-2,2.78,2.78,0,0,0-1.16-1l-0.49-.29-5.63-3.32-8.24-4.72a2.63,2.63,0,0,0-1.38-.51,3.36,3.36,0,0,0-1.32,1.22q-0.18.22-.58,0.61l-0.83-.48q1.14-1.61,2-3.18t1.91-3.66l0.83,0.48a3.52,3.52,0,0,1-.13.55,4.57,4.57,0,0,0-.39,2.06,3.12,3.12,0,0,0,1.26,1l0.72,0.39,5.15,3q8,4.6,8.83,5.06a1.39,1.39,0,0,0,.85.19,4.6,4.6,0,0,0,1.52-1.24l0.51-.45,0.83,0.48q-1.48,2.21-2.22,3.5T230.08,180.18Z"/><path class="cls-2" d="M204.74,176.94l0.4-.7q6.16,1.72,14,3.64,6.56,1.59,7.27,1.69a1.9,1.9,0,0,0,.8,0,8.11,8.11,0,0,0,1.62-1.16l0.83,0.48q-1.47,2.19-1.89,2.91-0.59,1-1.58,3.09l-0.83-.48q0-.23.06-0.34a4.18,4.18,0,0,0,.16-1.53,0.79,0.79,0,0,0-.37-0.46,1.91,1.91,0,0,0-.33-0.15q-1.14-.4-7-1.94l-8.52-2.25q3.73,3.89,7,7.06,4.07,4,4.54,4.37l0.18,0.13a0.7,0.7,0,0,0,.53.09,6.23,6.23,0,0,0,1.59-1.13l0.79,0.46-0.48.74q-1.05,1.56-1.32,2a20.74,20.74,0,0,0-1.08,2.23l-0.79-.46a4.94,4.94,0,0,0,.14-1.78,3.89,3.89,0,0,0-.91-1.34q-1.57-1.77-9.59-9.86Z"/><path class="cls-2" d="M172,207.58l0.7-.4q4.47,4.57,10.33,10.16,4.88,4.65,5.45,5.1a1.89,1.89,0,0,0,.72.36,8.12,8.12,0,0,0,2-.2l0.48,0.83q-2.37,1.16-3.09,1.58-1,.59-2.91,1.89l-0.48-.83,0.23-.26a4.17,4.17,0,0,0,.91-1.25,0.79,0.79,0,0,0-.09-0.58,2,2,0,0,0-.21-0.29q-0.78-.92-5.1-5.19l-6.26-6.21q1.28,5.23,2.52,9.61,1.53,5.48,1.75,6.05a1.28,1.28,0,0,0,.09.21,0.71,0.71,0,0,0,.41.34,6.21,6.21,0,0,0,1.95-.19l0.46,0.79-0.78.4q-1.69.83-2.16,1.1a20.5,20.5,0,0,0-2.05,1.39l-0.46-.79a5,5,0,0,0,1-1.47,3.89,3.89,0,0,0-.12-1.61q-0.48-2.32-3.38-13.34Z"/><path class="cls-2" d="M129,220h0.8q1.58,6.2,3.87,14,1.9,6.47,2.17,7.14a1.89,1.89,0,0,0,.44.67,8.12,8.12,0,0,0,1.82.82v1q-2.64-.18-3.46-0.18-1.18,0-3.46.18v-1l0.33-.11a4.19,4.19,0,0,0,1.41-.63,0.79,0.79,0,0,0,.21-0.54,2,2,0,0,0,0-.36q-0.22-1.19-1.83-7l-2.31-8.51q-1.5,5.17-2.62,9.58-1.42,5.51-1.51,6.12a1.27,1.27,0,0,0,0,.23,0.71,0.71,0,0,0,.18.5,6.21,6.21,0,0,0,1.78.81v0.91l-0.88,0q-1.88-.13-2.41-0.13a20.51,20.51,0,0,0-2.48.18v-0.91a5,5,0,0,0,1.61-.77,3.9,3.9,0,0,0,.71-1.46q0.74-2.24,3.74-13.24Z"/><path class="cls-2" d="M112.29,243.54v-1l0.63-.18a4.14,4.14,0,0,0,1.88-.71,2.78,2.78,0,0,0,.26-1.49v-0.57l0.06-6.54,0-9.5a2.64,2.64,0,0,0-.25-1.45,3.36,3.36,0,0,0-1.71-.54q-0.28,0-.82-0.2v-1q2,0.18,3.78.18t4.12-.18v1a3.55,3.55,0,0,1-.54.16,4.57,4.57,0,0,0-2,.69,3.11,3.11,0,0,0-.25,1.6l0,0.81,0,6q0,9.2,0,10.18a1.39,1.39,0,0,0,.26.83,4.58,4.58,0,0,0,1.84.7l0.64,0.21v1q-2.65-.18-4.14-0.18Q114.41,243.36,112.29,243.54Z"/><path class="cls-2" d="M85,211.55l0.7,0.4Q84,218.11,82,226q-1.59,6.56-1.69,7.27a1.88,1.88,0,0,0,0,.8,8.06,8.06,0,0,0,1.16,1.62l-0.48.83q-2.19-1.47-2.91-1.89-1-.59-3.09-1.58l0.48-.83,0.34,0.07a4.22,4.22,0,0,0,1.53.16,0.79,0.79,0,0,0,.46-0.37,1.91,1.91,0,0,0,.15-0.33q0.4-1.14,1.94-7l2.25-8.53q-3.89,3.73-7.06,7-4,4.07-4.37,4.54a1.22,1.22,0,0,0-.13.18,0.71,0.71,0,0,0-.09.53A6.23,6.23,0,0,0,71.7,230l-0.46.79-0.74-.48q-1.56-1.05-2-1.32a20.6,20.6,0,0,0-2.24-1.08l0.46-.79a4.94,4.94,0,0,0,1.78.14,3.89,3.89,0,0,0,1.34-.91q1.77-1.57,9.86-9.59Z"/><path class="cls-2" d="M58.73,223.6l0.48-.83,0.64,0.16a4.13,4.13,0,0,0,2,.33,2.78,2.78,0,0,0,1-1.16l0.28-.49L66.4,216l4.72-8.24a2.66,2.66,0,0,0,.51-1.38A3.38,3.38,0,0,0,70.41,205q-0.22-.18-0.61-0.58l0.48-.83q1.61,1.14,3.18,2t3.66,1.91l-0.48.83a3.53,3.53,0,0,1-.55-0.13,4.57,4.57,0,0,0-2.06-.39,3.1,3.1,0,0,0-1,1.26l-0.39.72-3,5.15q-4.6,8-5.06,8.83a1.4,1.4,0,0,0-.19.85,4.62,4.62,0,0,0,1.24,1.53l0.45,0.5-0.48.83q-2.21-1.48-3.5-2.23T58.73,223.6Z"/><path class="cls-2" d="M50.83,219l0.48-.83,0.64,0.16a4.14,4.14,0,0,0,2,.33,2.78,2.78,0,0,0,1-1.16l0.28-.49,3.32-5.63,4.72-8.24a2.66,2.66,0,0,0,.51-1.38,3.36,3.36,0,0,0-1.22-1.32q-0.22-.18-0.61-0.58l0.48-.83q1.61,1.14,3.18,2T69.22,203l-0.48.83a3.48,3.48,0,0,1-.55-0.13,4.56,4.56,0,0,0-2.06-.39,3.1,3.1,0,0,0-1,1.26l-0.39.72-3,5.15q-4.6,8-5.06,8.83a1.39,1.39,0,0,0-.19.85,4.6,4.6,0,0,0,1.24,1.53l0.45,0.5-0.48.83q-2.21-1.48-3.5-2.23T50.83,219Z"/><path class="cls-2" d="M49.32,183.91l0.4,0.7q-4.57,4.47-10.16,10.33-4.65,4.88-5.1,5.45a1.89,1.89,0,0,0-.36.72,8.09,8.09,0,0,0,.2,2l-0.83.48q-1.16-2.37-1.58-3.09-0.59-1-1.89-2.91l0.83-.48,0.26,0.23a4.18,4.18,0,0,0,1.25.91,0.78,0.78,0,0,0,.58-0.09,1.88,1.88,0,0,0,.29-0.21q0.92-.78,5.19-5.1l6.21-6.26q-5.23,1.29-9.61,2.52-5.48,1.53-6.05,1.75l-0.21.09a0.71,0.71,0,0,0-.35.41,6.19,6.19,0,0,0,.19,1.95l-0.79.46-0.4-.79q-0.83-1.69-1.09-2.15a20.39,20.39,0,0,0-1.39-2.06l0.79-.46a5,5,0,0,0,1.47,1,3.9,3.9,0,0,0,1.61-.12q2.32-.48,13.33-3.37Z"/><path class="cls-2" d="M20.56,181.22l0.83-.48,0.47,0.46a4.13,4.13,0,0,0,1.55,1.27,2.77,2.77,0,0,0,1.42-.52l0.49-.29L31,178.45l8.21-4.78a2.64,2.64,0,0,0,1.13-.94A3.35,3.35,0,0,0,40,171c-0.06-.18-0.15-0.45-0.24-0.81l0.83-.48q0.83,1.79,1.74,3.36t2.22,3.48l-0.83.48a3.5,3.5,0,0,1-.41-0.38,4.58,4.58,0,0,0-1.59-1.37,3.09,3.09,0,0,0-1.51.58l-0.69.43-5.19,3q-8,4.6-8.8,5.12a1.4,1.4,0,0,0-.59.64,4.61,4.61,0,0,0,.31,1.94c0,0.15.08,0.37,0.14,0.66l-0.83.48q-1.17-2.39-1.92-3.67T20.56,181.22Z"/><path class="cls-2" d="M16,173.32l0.83-.48,0.47,0.46a4.11,4.11,0,0,0,1.55,1.27,2.76,2.76,0,0,0,1.42-.52l0.49-.29,5.69-3.21,8.21-4.78a2.66,2.66,0,0,0,1.13-.94,3.37,3.37,0,0,0-.39-1.75q-0.1-.27-0.24-0.81l0.83-.48q0.83,1.79,1.74,3.36t2.22,3.48l-0.83.48a3.51,3.51,0,0,1-.41-0.38,4.56,4.56,0,0,0-1.59-1.37,3.11,3.11,0,0,0-1.51.58l-0.69.43-5.19,3q-8,4.6-8.8,5.12a1.39,1.39,0,0,0-.59.64,4.6,4.6,0,0,0,.31,1.94c0,0.15.08,0.37,0.14,0.66l-0.83.48q-1.17-2.38-1.92-3.67T16,173.32Z"/><path class="cls-2" d="M11.44,165.42l0.83-.48,0.47,0.46a4.13,4.13,0,0,0,1.55,1.27,2.77,2.77,0,0,0,1.42-.52l0.49-.29,5.69-3.22,8.21-4.78a2.64,2.64,0,0,0,1.13-.94,3.35,3.35,0,0,0-.39-1.75c-0.06-.18-0.15-0.45-0.24-0.81l0.83-.48q0.83,1.79,1.74,3.36t2.22,3.48l-0.83.48a3.58,3.58,0,0,1-.41-0.38,4.58,4.58,0,0,0-1.59-1.37A3.1,3.1,0,0,0,31,160l-0.69.43-5.19,3q-8,4.6-8.8,5.12a1.4,1.4,0,0,0-.59.64,4.61,4.61,0,0,0,.31,1.94q0.05,0.22.14,0.66l-0.83.48q-1.17-2.39-1.92-3.67Q12.65,167.16,11.44,165.42Z"/><path class="cls-2" d="M6.46,130.38h1c0.09,0.28.15,0.5,0.18,0.63a4.13,4.13,0,0,0,.71,1.88,2.78,2.78,0,0,0,1.49.26h0.57l6.54,0.06,9.5,0a2.65,2.65,0,0,0,1.45-.25,3.37,3.37,0,0,0,.54-1.71q0-.28.2-0.82h1q-0.18,2-.18,3.78t0.18,4.12h-1a3.46,3.46,0,0,1-.16-0.54,4.56,4.56,0,0,0-.69-2,3.1,3.1,0,0,0-1.6-.25l-0.81,0-6,0q-9.2,0-10.18,0a1.39,1.39,0,0,0-.83.26,4.61,4.61,0,0,0-.7,1.84q-0.06.22-.21,0.64h-1q0.18-2.65.18-4.14Q6.64,132.49,6.46,130.38Z"/><path class="cls-2" d="M7.42,129.06h-1q0.18-1.9.18-3.5T6.46,121.5h1a5.71,5.71,0,0,0,.72,1.78,0.45,0.45,0,0,0,.34.16,3.84,3.84,0,0,0,1.14-.4q3.58-1.7,5.7-2.9-3.4-2-6.35-3.51a2.29,2.29,0,0,0-.68-0.27,0.42,0.42,0,0,0-.31.16,7,7,0,0,0-.55,1.59h-1q0.18-2,.18-3.21a28.13,28.13,0,0,0-.18-3h1A5.83,5.83,0,0,0,8.27,114a11,11,0,0,0,2.36,1.69q3.74,2.17,6.4,3.56,2.22-1,5.42-2.69l4.75-2.48a2.21,2.21,0,0,0,.52-0.49,8,8,0,0,0,.85-1.91h1q-0.18,2.16-.18,3.46t0.18,3.8h-1a10.33,10.33,0,0,0-.7-1.73,0.5,0.5,0,0,0-.37-0.13,3.07,3.07,0,0,0-1.12.34q-3.7,1.75-6.62,3.34,2.39,1.47,6.58,3.65a3.81,3.81,0,0,0,1.14.45,0.65,0.65,0,0,0,.46-0.18,3.84,3.84,0,0,0,.52-1.28c0-.08.06-0.2,0.11-0.35h1q-0.18,1.78-.18,3.42a19.92,19.92,0,0,0,.18,2.78h-1a5,5,0,0,0-.85-1.9,17.32,17.32,0,0,0-2.94-2q-4.5-2.58-6.74-3.73-2.41,1.14-7.21,3.64a11.27,11.27,0,0,0-2.33,1.49A8.25,8.25,0,0,0,7.42,129.06Z"/><path class="cls-2" d="M18.92,73.69l-0.83-.48q1.11-1.56,1.91-2.94t1.88-3.61l0.83,0.48a5.74,5.74,0,0,0-.27,1.9,0.45,0.45,0,0,0,.22.31,3.85,3.85,0,0,0,1.19.22q4,0.31,6.39.34-2-3.41-3.75-6.22A2.31,2.31,0,0,0,26,63.12a0.42,0.42,0,0,0-.35,0,7,7,0,0,0-1.27,1.1l-0.83-.48Q24.75,62,25.32,61a28.1,28.1,0,0,0,1.32-2.65l0.83,0.48a5.83,5.83,0,0,0-.3,2.22,11,11,0,0,0,1.2,2.64q2.15,3.75,3.77,6.28,2.44,0.21,6,.38l5.35,0.23a2.22,2.22,0,0,0,.69-0.16,8,8,0,0,0,1.69-1.24l0.83,0.48q-1.23,1.78-1.89,2.91T43.12,76l-0.83-.48a10.43,10.43,0,0,0,.26-1.85,0.5,0.5,0,0,0-.26-0.3,3.07,3.07,0,0,0-1.14-.27q-4.08-.34-7.4-0.41,1.33,2.47,3.87,6.45a3.78,3.78,0,0,0,.76,1,0.65,0.65,0,0,0,.49.07A3.83,3.83,0,0,0,40,79.32l0.28-.25,0.83,0.48Q40,81,39.2,82.43A19.91,19.91,0,0,0,38,84.92l-0.83-.48a5,5,0,0,0,.21-2.07,17.37,17.37,0,0,0-1.55-3.19q-2.61-4.48-4-6.6-2.66-.22-8.06-0.45a11.22,11.22,0,0,0-2.76.12A8.17,8.17,0,0,0,18.92,73.69Z"/><path class="cls-2" d="M54.81,29.82L54.33,29q1.74-.8,3.12-1.6t3.43-2.19L61.36,26a5.76,5.76,0,0,0-1.18,1.51,0.45,0.45,0,0,0,0,.38,3.84,3.84,0,0,0,.92.78q3.27,2.25,5.37,3.49,0-3.94-.14-7.26a2.27,2.27,0,0,0-.11-0.73A0.42,0.42,0,0,0,66,24a7,7,0,0,0-1.65.31l-0.48-.83q1.86-.87,2.87-1.45a28,28,0,0,0,2.47-1.63l0.48,0.83A5.82,5.82,0,0,0,68.26,23,11,11,0,0,0,68,25.92q0,4.32.12,7.32,2,1.41,5,3.35l4.52,2.87a2.22,2.22,0,0,0,.68.21,8,8,0,0,0,2.08-.22l0.48,0.83q-2,.92-3.09,1.58t-3.21,2.06l-0.48-.83a10.42,10.42,0,0,0,1.15-1.47,0.5,0.5,0,0,0-.07-0.39,3.06,3.06,0,0,0-.86-0.8q-3.36-2.33-6.2-4.06-0.08,2.8.12,7.52a3.83,3.83,0,0,0,.18,1.21,0.65,0.65,0,0,0,.39.31,3.83,3.83,0,0,0,1.37-.19l0.36-.08L71.06,46q-1.63.73-3.05,1.56a19.91,19.91,0,0,0-2.31,1.54l-0.48-.83a5,5,0,0,0,1.22-1.69A17.42,17.42,0,0,0,66.69,43q0-5.18-.14-7.7-2.19-1.52-6.76-4.42a11.2,11.2,0,0,0-2.46-1.28A8.18,8.18,0,0,0,54.81,29.82Z"/><path class="cls-2" d="M77.31,15.72l0.48,0.83L77.33,17a4.15,4.15,0,0,0-1.27,1.55A2.78,2.78,0,0,0,76.58,20l0.28,0.49,3.22,5.69,4.78,8.21a2.64,2.64,0,0,0,.94,1.13,3.35,3.35,0,0,0,1.75-.39q0.27-.1.8-0.24l0.48,0.83q-1.79.83-3.36,1.74T82,39.66l-0.48-.83a3.66,3.66,0,0,1,.38-0.41,4.57,4.57,0,0,0,1.37-1.59,3.11,3.11,0,0,0-.58-1.51l-0.43-.69-3-5.19q-4.6-8-5.12-8.8a1.38,1.38,0,0,0-.64-0.59,4.58,4.58,0,0,0-1.94.31l-0.66.14-0.48-.83q2.38-1.17,3.67-1.92T77.31,15.72Z"/><line class="cls-3" x1="134.41" y1="35.49" x2="133.65" y2="42.71"/><line class="cls-3" x1="143.71" y1="36.97" x2="142.2" y2="44.07"/><line class="cls-3" x1="152.81" y1="39.4" x2="150.57" y2="46.31"/><line class="cls-3" x1="161.61" y1="42.78" x2="158.65" y2="49.41"/><line class="cls-3" x1="170" y1="47.06" x2="166.37" y2="53.35"/><line class="cls-3" x1="177.9" y1="52.19" x2="173.63" y2="58.06"/><line class="cls-3" x1="185.22" y1="58.12" x2="180.36" y2="63.51"/><line class="cls-3" x1="191.88" y1="64.78" x2="186.49" y2="69.64"/><line class="cls-3" x1="197.81" y1="72.1" x2="191.94" y2="76.37"/><line class="cls-3" x1="202.94" y1="80" x2="196.65" y2="83.63"/><line class="cls-3" x1="207.22" y1="88.39" x2="200.59" y2="91.35"/><line class="cls-3" x1="210.6" y1="97.19" x2="203.69" y2="99.43"/><line class="cls-3" x1="213.03" y1="106.29" x2="205.93" y2="107.8"/><line class="cls-3" x1="214.51" y1="115.59" x2="207.29" y2="116.35"/><line class="cls-3" x1="215" y1="125" x2="207.74" y2="125"/><line class="cls-3" x1="214.51" y1="134.41" x2="207.29" y2="133.65"/><line class="cls-3" x1="213.03" y1="143.71" x2="205.93" y2="142.2"/><line class="cls-3" x1="210.6" y1="152.81" x2="203.69" y2="150.57"/><line class="cls-3" x1="207.22" y1="161.61" x2="200.59" y2="158.65"/><line class="cls-3" x1="202.94" y1="170" x2="196.65" y2="166.37"/><line class="cls-3" x1="197.81" y1="177.9" x2="191.94" y2="173.63"/><line class="cls-3" x1="191.88" y1="185.22" x2="186.49" y2="180.36"/><line class="cls-3" x1="185.22" y1="191.88" x2="180.36" y2="186.49"/><line class="cls-3" x1="177.9" y1="197.81" x2="173.63" y2="191.94"/><line class="cls-3" x1="170" y1="202.94" x2="166.37" y2="196.65"/><line class="cls-3" x1="161.61" y1="207.22" x2="158.65" y2="200.59"/><line class="cls-3" x1="152.81" y1="210.6" x2="150.57" y2="203.69"/><line class="cls-3" x1="143.71" y1="213.03" x2="142.2" y2="205.93"/><line class="cls-3" x1="134.41" y1="214.51" x2="133.65" y2="207.29"/><line class="cls-3" x1="125" y1="215" x2="125" y2="207.74"/><line class="cls-3" x1="115.59" y1="214.51" x2="116.35" y2="207.29"/><line class="cls-3" x1="106.29" y1="213.03" x2="107.8" y2="205.93"/><line class="cls-3" x1="97.19" y1="210.6" x2="99.43" y2="203.69"/><line class="cls-3" x1="88.39" y1="207.22" x2="91.35" y2="200.59"/><line class="cls-3" x1="80" y1="202.94" x2="83.63" y2="196.65"/><line class="cls-3" x1="72.1" y1="197.81" x2="76.37" y2="191.94"/><line class="cls-3" x1="64.78" y1="191.88" x2="69.64" y2="186.49"/><line class="cls-3" x1="58.12" y1="185.22" x2="63.51" y2="180.36"/><line class="cls-3" x1="52.19" y1="177.9" x2="58.06" y2="173.63"/><line class="cls-3" x1="47.06" y1="170" x2="53.35" y2="166.37"/><line class="cls-3" x1="42.78" y1="161.61" x2="49.41" y2="158.65"/><line class="cls-3" x1="39.4" y1="152.81" x2="46.31" y2="150.57"/><line class="cls-3" x1="36.97" y1="143.71" x2="44.07" y2="142.2"/><line class="cls-3" x1="35.49" y1="134.41" x2="42.71" y2="133.65"/><line class="cls-3" x1="35" y1="125" x2="42.26" y2="125"/><line class="cls-3" x1="35.49" y1="115.59" x2="42.71" y2="116.35"/><line class="cls-3" x1="36.97" y1="106.29" x2="44.07" y2="107.8"/><line class="cls-3" x1="39.4" y1="97.19" x2="46.31" y2="99.43"/><line class="cls-3" x1="42.78" y1="88.39" x2="49.41" y2="91.35"/><line class="cls-3" x1="47.06" y1="80" x2="53.35" y2="83.63"/><line class="cls-3" x1="52.19" y1="72.1" x2="58.06" y2="76.37"/><line class="cls-3" x1="58.12" y1="64.78" x2="63.51" y2="69.64"/><line class="cls-3" x1="64.78" y1="58.12" x2="69.64" y2="63.51"/><line class="cls-3" x1="72.1" y1="52.19" x2="76.37" y2="58.06"/><line class="cls-3" x1="80" y1="47.06" x2="83.63" y2="53.35"/><line class="cls-3" x1="88.39" y1="42.78" x2="91.35" y2="49.41"/><line class="cls-3" x1="97.19" y1="39.4" x2="99.43" y2="46.31"/><line class="cls-3" x1="106.29" y1="36.97" x2="107.8" y2="44.07"/><line class="cls-3" x1="115.59" y1="35.49" x2="116.35" y2="42.71"/><line class="cls-3" x1="125" y1="35" x2="125" y2="42.26"/></svg>
+<svg id="Roman_Outer_Ring" data-name="Roman Outer Ring" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 250 250"><defs><style>.cls-1,.cls-3{fill:none;stroke:#fff;stroke-miterlimit:10;}.cls-2{fill:#fff;}.cls-3{stroke-linecap:round;stroke-width:0.47px;}</style></defs><title>face-009</title><circle class="cls-1" cx="125" cy="125" r="90"/><path class="cls-2" d="M125,1.25A123.75,123.75,0,0,1,212.5,212.5a123.75,123.75,0,0,1-175-175A122.94,122.94,0,0,1,125,1.25m0-1A124.75,124.75,0,1,0,249.75,125,124.75,124.75,0,0,0,125,.25h0Z"/><path class="cls-2" d="M107.26,7.42v-1q1.9,0.18,3.5.18t4.06-.18v1a5.71,5.71,0,0,0-1.78.72,0.45,0.45,0,0,0-.16.34,3.84,3.84,0,0,0,.4,1.14q1.7,3.58,2.9,5.7,2-3.4,3.51-6.35A2.29,2.29,0,0,0,120,8.28,0.42,0.42,0,0,0,119.81,8a7,7,0,0,0-1.59-.55v-1q2,0.18,3.21.18a28.13,28.13,0,0,0,3-.18v1a5.83,5.83,0,0,0-2.08.85,11,11,0,0,0-1.69,2.36q-2.17,3.74-3.56,6.4,1,2.22,2.69,5.42l2.48,4.75a2.21,2.21,0,0,0,.49.52,8,8,0,0,0,1.91.85v1q-2.16-.18-3.46-0.18t-3.8.18v-1a10.33,10.33,0,0,0,1.73-.7,0.5,0.5,0,0,0,.13-0.37,3.07,3.07,0,0,0-.34-1.12q-1.75-3.7-3.34-6.62-1.47,2.39-3.65,6.58a3.81,3.81,0,0,0-.45,1.14,0.65,0.65,0,0,0,.18.46,3.84,3.84,0,0,0,1.28.52l0.35,0.11v1q-1.78-.18-3.42-0.18a19.92,19.92,0,0,0-2.78.18v-1a5,5,0,0,0,1.9-.85,17.32,17.32,0,0,0,2-2.94q2.58-4.5,3.73-6.74-1.14-2.41-3.64-7.21a11.2,11.2,0,0,0-1.49-2.33A8.22,8.22,0,0,0,107.26,7.42Z"/><path class="cls-2" d="M133.79,6.46v1l-0.63.18a4.13,4.13,0,0,0-1.88.71A2.78,2.78,0,0,0,131,9.79v0.57L131,16.9l0,9.5a2.65,2.65,0,0,0,.25,1.45,3.37,3.37,0,0,0,1.71.54q0.28,0,.82.2v1q-2-.18-3.78-0.18t-4.12.18v-1a3.41,3.41,0,0,1,.54-0.16,4.56,4.56,0,0,0,2-.69,3.1,3.1,0,0,0,.25-1.6l0-.81,0-6q0-9.2,0-10.18a1.39,1.39,0,0,0-.26-0.83,4.61,4.61,0,0,0-1.84-.7l-0.64-.21v-1q2.65,0.18,4.14.18Q131.68,6.64,133.79,6.46Z"/><path class="cls-2" d="M142.92,6.46v1l-0.63.18a4.13,4.13,0,0,0-1.88.71,2.78,2.78,0,0,0-.26,1.49v0.57l-0.06,6.54,0,9.5a2.65,2.65,0,0,0,.25,1.45,3.37,3.37,0,0,0,1.71.54q0.28,0,.82.2v1q-2-.18-3.78-0.18t-4.12.18v-1a3.46,3.46,0,0,1,.54-0.16,4.56,4.56,0,0,0,2-.69,3.1,3.1,0,0,0,.25-1.6l0-.81,0-6q0-9.2,0-10.18a1.39,1.39,0,0,0-.26-0.83,4.61,4.61,0,0,0-1.84-.7L135,7.42v-1q2.65,0.18,4.14.18Q140.8,6.64,142.92,6.46Z"/><path class="cls-2" d="M187.77,24.35l-0.48.83L186.66,25a4.13,4.13,0,0,0-2-.33,2.77,2.77,0,0,0-1,1.16l-0.28.49L180.1,32l-4.72,8.24a2.66,2.66,0,0,0-.51,1.38,3.37,3.37,0,0,0,1.22,1.32q0.22,0.18.61,0.58l-0.48.83q-1.61-1.14-3.19-2t-3.66-1.91l0.48-.83a3.53,3.53,0,0,1,.55.13,4.57,4.57,0,0,0,2.06.39,3.11,3.11,0,0,0,1-1.26l0.38-.72,3-5.15q4.6-8,5.06-8.83a1.39,1.39,0,0,0,.19-0.85,4.6,4.6,0,0,0-1.24-1.53l-0.45-.5,0.48-.83q2.21,1.48,3.5,2.23T187.77,24.35Z"/><path class="cls-2" d="M227.38,65.29l-0.83.48-0.47-.46A4.13,4.13,0,0,0,224.53,64a2.78,2.78,0,0,0-1.42.52l-0.49.28-5.69,3.22-8.21,4.78a2.65,2.65,0,0,0-1.13.94,3.35,3.35,0,0,0,.39,1.75q0.1,0.27.24,0.81l-0.83.48q-0.83-1.79-1.74-3.36T203.45,70l0.83-.48a3.62,3.62,0,0,1,.41.38,4.57,4.57,0,0,0,1.59,1.37,3.1,3.1,0,0,0,1.51-.58l0.69-.43,5.19-3q8-4.6,8.8-5.12a1.4,1.4,0,0,0,.59-0.64,4.6,4.6,0,0,0-.31-1.94q-0.05-.22-0.14-0.66l0.83-.48q1.17,2.39,1.92,3.68T227.38,65.29Z"/><path class="cls-2" d="M231.95,73.19l-0.83.48-0.47-.46a4.12,4.12,0,0,0-1.55-1.27,2.77,2.77,0,0,0-1.42.52l-0.49.28L221.49,76l-8.21,4.78a2.65,2.65,0,0,0-1.13.94,3.37,3.37,0,0,0,.39,1.75q0.1,0.27.24,0.81l-0.83.48q-0.83-1.79-1.74-3.36T208,77.87l0.83-.48a3.6,3.6,0,0,1,.41.38,4.57,4.57,0,0,0,1.59,1.37,3.12,3.12,0,0,0,1.51-.58l0.69-.43,5.19-3q8-4.6,8.8-5.12a1.39,1.39,0,0,0,.59-0.64,4.6,4.6,0,0,0-.31-1.94c0-.15-0.08-0.37-0.14-0.66l0.83-.48q1.17,2.39,1.92,3.68T231.95,73.19Z"/><path class="cls-2" d="M243.54,119.87h-1q-0.13-.43-0.18-0.63a4.14,4.14,0,0,0-.71-1.88,2.78,2.78,0,0,0-1.49-.26h-0.57L233.1,117l-9.5,0a2.64,2.64,0,0,0-1.45.25,3.36,3.36,0,0,0-.54,1.71q0,0.28-.2.82h-1q0.18-2,.18-3.78T220.47,112h1a3.55,3.55,0,0,1,.16.54,4.57,4.57,0,0,0,.69,2,3.11,3.11,0,0,0,1.6.25l0.81,0,6,0q9.2,0,10.18,0a1.39,1.39,0,0,0,.83-0.26,4.58,4.58,0,0,0,.7-1.84q0.07-.22.21-0.64h1q-0.18,2.65-.18,4.14Q243.36,117.75,243.54,119.87Z"/><path class="cls-2" d="M243.54,129h-1c-0.09-.28-0.15-0.5-0.18-0.63a4.13,4.13,0,0,0-.71-1.88,2.77,2.77,0,0,0-1.49-.26h-0.57l-6.54-.06-9.5,0a2.65,2.65,0,0,0-1.45.25,3.36,3.36,0,0,0-.54,1.71q0,0.28-.2.82h-1q0.18-2,.18-3.78t-0.18-4.12h1a3.55,3.55,0,0,1,.16.54,4.57,4.57,0,0,0,.69,2,3.11,3.11,0,0,0,1.6.25l0.81,0,6,0q9.2,0,10.18,0a1.39,1.39,0,0,0,.83-0.26,4.58,4.58,0,0,0,.7-1.84q0.07-.22.21-0.64h1q-0.18,2.65-.18,4.14Q243.36,126.88,243.54,129Z"/><path class="cls-2" d="M243.54,138.11h-1c-0.09-.28-0.15-0.5-0.18-0.63a4.13,4.13,0,0,0-.71-1.88,2.77,2.77,0,0,0-1.49-.26h-0.57l-6.54-.06-9.5,0a2.65,2.65,0,0,0-1.45.25,3.36,3.36,0,0,0-.54,1.71q0,0.28-.2.82h-1q0.18-2,.18-3.78t-0.18-4.12h1a3.59,3.59,0,0,1,.16.54,4.57,4.57,0,0,0,.69,2,3.11,3.11,0,0,0,1.6.25l0.81,0,6,0q9.2,0,10.18,0a1.39,1.39,0,0,0,.83-0.26,4.59,4.59,0,0,0,.7-1.84q0.07-.22.21-0.64h1q-0.18,2.65-.18,4.14Q243.36,136,243.54,138.11Z"/><path class="cls-2" d="M230.08,180.18l-0.83-.48c0.07-.29.12-0.5,0.16-0.64a4.13,4.13,0,0,0,.33-2,2.78,2.78,0,0,0-1.16-1l-0.49-.29-5.63-3.32-8.24-4.72a2.63,2.63,0,0,0-1.38-.51,3.36,3.36,0,0,0-1.32,1.22q-0.18.22-.58,0.61l-0.83-.48q1.14-1.61,2-3.18t1.91-3.66l0.83,0.48a3.52,3.52,0,0,1-.13.55,4.57,4.57,0,0,0-.39,2.06,3.12,3.12,0,0,0,1.26,1l0.72,0.39,5.15,3q8,4.6,8.83,5.06a1.39,1.39,0,0,0,.85.19,4.6,4.6,0,0,0,1.52-1.24l0.51-.45,0.83,0.48q-1.48,2.21-2.22,3.5T230.08,180.18Z"/><path class="cls-2" d="M204.74,176.94l0.4-.7q6.16,1.72,14,3.64,6.56,1.59,7.27,1.69a1.9,1.9,0,0,0,.8,0,8.11,8.11,0,0,0,1.62-1.16l0.83,0.48q-1.47,2.19-1.89,2.91-0.59,1-1.58,3.09l-0.83-.48q0-.23.06-0.34a4.18,4.18,0,0,0,.16-1.53,0.79,0.79,0,0,0-.37-0.46,1.91,1.91,0,0,0-.33-0.15q-1.14-.4-7-1.94l-8.52-2.25q3.73,3.89,7,7.06,4.07,4,4.54,4.37l0.18,0.13a0.7,0.7,0,0,0,.53.09,6.23,6.23,0,0,0,1.59-1.13l0.79,0.46-0.48.74q-1.05,1.56-1.32,2a20.74,20.74,0,0,0-1.08,2.23l-0.79-.46a4.94,4.94,0,0,0,.14-1.78,3.89,3.89,0,0,0-.91-1.34q-1.57-1.77-9.59-9.86Z"/><path class="cls-2" d="M172,207.58l0.7-.4q4.47,4.57,10.33,10.16,4.88,4.65,5.45,5.1a1.89,1.89,0,0,0,.72.36,8.12,8.12,0,0,0,2-.2l0.48,0.83q-2.37,1.16-3.09,1.58-1,.59-2.91,1.89l-0.48-.83,0.23-.26a4.17,4.17,0,0,0,.91-1.25,0.79,0.79,0,0,0-.09-0.58,2,2,0,0,0-.21-0.29q-0.78-.92-5.1-5.19l-6.26-6.21q1.28,5.23,2.52,9.61,1.53,5.48,1.75,6.05a1.28,1.28,0,0,0,.09.21,0.71,0.71,0,0,0,.41.34,6.21,6.21,0,0,0,1.95-.19l0.46,0.79-0.78.4q-1.69.83-2.16,1.1a20.5,20.5,0,0,0-2.05,1.39l-0.46-.79a5,5,0,0,0,1-1.47,3.89,3.89,0,0,0-.12-1.61q-0.48-2.32-3.38-13.34Z"/><path class="cls-2" d="M129,220h0.8q1.58,6.2,3.87,14,1.9,6.47,2.17,7.14a1.89,1.89,0,0,0,.44.67,8.12,8.12,0,0,0,1.82.82v1q-2.64-.18-3.46-0.18-1.18,0-3.46.18v-1l0.33-.11a4.19,4.19,0,0,0,1.41-.63,0.79,0.79,0,0,0,.21-0.54,2,2,0,0,0,0-.36q-0.22-1.19-1.83-7l-2.31-8.51q-1.5,5.17-2.62,9.58-1.42,5.51-1.51,6.12a1.27,1.27,0,0,0,0,.23,0.71,0.71,0,0,0,.18.5,6.21,6.21,0,0,0,1.78.81v0.91l-0.88,0q-1.88-.13-2.41-0.13a20.51,20.51,0,0,0-2.48.18v-0.91a5,5,0,0,0,1.61-.77,3.9,3.9,0,0,0,.71-1.46q0.74-2.24,3.74-13.24Z"/><path class="cls-2" d="M112.29,243.54v-1l0.63-.18a4.14,4.14,0,0,0,1.88-.71,2.78,2.78,0,0,0,.26-1.49v-0.57l0.06-6.54,0-9.5a2.64,2.64,0,0,0-.25-1.45,3.36,3.36,0,0,0-1.71-.54q-0.28,0-.82-0.2v-1q2,0.18,3.78.18t4.12-.18v1a3.55,3.55,0,0,1-.54.16,4.57,4.57,0,0,0-2,.69,3.11,3.11,0,0,0-.25,1.6l0,0.81,0,6q0,9.2,0,10.18a1.39,1.39,0,0,0,.26.83,4.58,4.58,0,0,0,1.84.7l0.64,0.21v1q-2.65-.18-4.14-0.18Q114.41,243.36,112.29,243.54Z"/><path class="cls-2" d="M85,211.55l0.7,0.4Q84,218.11,82,226q-1.59,6.56-1.69,7.27a1.88,1.88,0,0,0,0,.8,8.06,8.06,0,0,0,1.16,1.62l-0.48.83q-2.19-1.47-2.91-1.89-1-.59-3.09-1.58l0.48-.83,0.34,0.07a4.22,4.22,0,0,0,1.53.16,0.79,0.79,0,0,0,.46-0.37,1.91,1.91,0,0,0,.15-0.33q0.4-1.14,1.94-7l2.25-8.53q-3.89,3.73-7.06,7-4,4.07-4.37,4.54a1.22,1.22,0,0,0-.13.18,0.71,0.71,0,0,0-.09.53A6.23,6.23,0,0,0,71.7,230l-0.46.79-0.74-.48q-1.56-1.05-2-1.32a20.6,20.6,0,0,0-2.24-1.08l0.46-.79a4.94,4.94,0,0,0,1.78.14,3.89,3.89,0,0,0,1.34-.91q1.77-1.57,9.86-9.59Z"/><path class="cls-2" d="M58.73,223.6l0.48-.83,0.64,0.16a4.13,4.13,0,0,0,2,.33,2.78,2.78,0,0,0,1-1.16l0.28-.49L66.4,216l4.72-8.24a2.66,2.66,0,0,0,.51-1.38A3.38,3.38,0,0,0,70.41,205q-0.22-.18-0.61-0.58l0.48-.83q1.61,1.14,3.18,2t3.66,1.91l-0.48.83a3.53,3.53,0,0,1-.55-0.13,4.57,4.57,0,0,0-2.06-.39,3.1,3.1,0,0,0-1,1.26l-0.39.72-3,5.15q-4.6,8-5.06,8.83a1.4,1.4,0,0,0-.19.85,4.62,4.62,0,0,0,1.24,1.53l0.45,0.5-0.48.83q-2.21-1.48-3.5-2.23T58.73,223.6Z"/><path class="cls-2" d="M50.83,219l0.48-.83,0.64,0.16a4.14,4.14,0,0,0,2,.33,2.78,2.78,0,0,0,1-1.16l0.28-.49,3.32-5.63,4.72-8.24a2.66,2.66,0,0,0,.51-1.38,3.36,3.36,0,0,0-1.22-1.32q-0.22-.18-0.61-0.58l0.48-.83q1.61,1.14,3.18,2T69.22,203l-0.48.83a3.48,3.48,0,0,1-.55-0.13,4.56,4.56,0,0,0-2.06-.39,3.1,3.1,0,0,0-1,1.26l-0.39.72-3,5.15q-4.6,8-5.06,8.83a1.39,1.39,0,0,0-.19.85,4.6,4.6,0,0,0,1.24,1.53l0.45,0.5-0.48.83q-2.21-1.48-3.5-2.23T50.83,219Z"/><path class="cls-2" d="M49.32,183.91l0.4,0.7q-4.57,4.47-10.16,10.33-4.65,4.88-5.1,5.45a1.89,1.89,0,0,0-.36.72,8.09,8.09,0,0,0,.2,2l-0.83.48q-1.16-2.37-1.58-3.09-0.59-1-1.89-2.91l0.83-.48,0.26,0.23a4.18,4.18,0,0,0,1.25.91,0.78,0.78,0,0,0,.58-0.09,1.88,1.88,0,0,0,.29-0.21q0.92-.78,5.19-5.1l6.21-6.26q-5.23,1.29-9.61,2.52-5.48,1.53-6.05,1.75l-0.21.09a0.71,0.71,0,0,0-.35.41,6.19,6.19,0,0,0,.19,1.95l-0.79.46-0.4-.79q-0.83-1.69-1.09-2.15a20.39,20.39,0,0,0-1.39-2.06l0.79-.46a5,5,0,0,0,1.47,1,3.9,3.9,0,0,0,1.61-.12q2.32-.48,13.33-3.37Z"/><path class="cls-2" d="M20.56,181.22l0.83-.48,0.47,0.46a4.13,4.13,0,0,0,1.55,1.27,2.77,2.77,0,0,0,1.42-.52l0.49-.29L31,178.45l8.21-4.78a2.64,2.64,0,0,0,1.13-.94A3.35,3.35,0,0,0,40,171c-0.06-.18-0.15-0.45-0.24-0.81l0.83-.48q0.83,1.79,1.74,3.36t2.22,3.48l-0.83.48a3.5,3.5,0,0,1-.41-0.38,4.58,4.58,0,0,0-1.59-1.37,3.09,3.09,0,0,0-1.51.58l-0.69.43-5.19,3q-8,4.6-8.8,5.12a1.4,1.4,0,0,0-.59.64,4.61,4.61,0,0,0,.31,1.94c0,0.15.08,0.37,0.14,0.66l-0.83.48q-1.17-2.39-1.92-3.67T20.56,181.22Z"/><path class="cls-2" d="M16,173.32l0.83-.48,0.47,0.46a4.11,4.11,0,0,0,1.55,1.27,2.76,2.76,0,0,0,1.42-.52l0.49-.29,5.69-3.21,8.21-4.78a2.66,2.66,0,0,0,1.13-.94,3.37,3.37,0,0,0-.39-1.75q-0.1-.27-0.24-0.81l0.83-.48q0.83,1.79,1.74,3.36t2.22,3.48l-0.83.48a3.51,3.51,0,0,1-.41-0.38,4.56,4.56,0,0,0-1.59-1.37,3.11,3.11,0,0,0-1.51.58l-0.69.43-5.19,3q-8,4.6-8.8,5.12a1.39,1.39,0,0,0-.59.64,4.6,4.6,0,0,0,.31,1.94c0,0.15.08,0.37,0.14,0.66l-0.83.48q-1.17-2.38-1.92-3.67T16,173.32Z"/><path class="cls-2" d="M11.44,165.42l0.83-.48,0.47,0.46a4.13,4.13,0,0,0,1.55,1.27,2.77,2.77,0,0,0,1.42-.52l0.49-.29,5.69-3.22,8.21-4.78a2.64,2.64,0,0,0,1.13-.94,3.35,3.35,0,0,0-.39-1.75c-0.06-.18-0.15-0.45-0.24-0.81l0.83-.48q0.83,1.79,1.74,3.36t2.22,3.48l-0.83.48a3.58,3.58,0,0,1-.41-0.38,4.58,4.58,0,0,0-1.59-1.37A3.1,3.1,0,0,0,31,160l-0.69.43-5.19,3q-8,4.6-8.8,5.12a1.4,1.4,0,0,0-.59.64,4.61,4.61,0,0,0,.31,1.94q0.05,0.22.14,0.66l-0.83.48q-1.17-2.39-1.92-3.67Q12.65,167.16,11.44,165.42Z"/><path class="cls-2" d="M6.46,130.38h1c0.09,0.28.15,0.5,0.18,0.63a4.13,4.13,0,0,0,.71,1.88,2.78,2.78,0,0,0,1.49.26h0.57l6.54,0.06,9.5,0a2.65,2.65,0,0,0,1.45-.25,3.37,3.37,0,0,0,.54-1.71q0-.28.2-0.82h1q-0.18,2-.18,3.78t0.18,4.12h-1a3.46,3.46,0,0,1-.16-0.54,4.56,4.56,0,0,0-.69-2,3.1,3.1,0,0,0-1.6-.25l-0.81,0-6,0q-9.2,0-10.18,0a1.39,1.39,0,0,0-.83.26,4.61,4.61,0,0,0-.7,1.84q-0.06.22-.21,0.64h-1q0.18-2.65.18-4.14Q6.64,132.49,6.46,130.38Z"/><path class="cls-2" d="M7.42,129.06h-1q0.18-1.9.18-3.5T6.46,121.5h1a5.71,5.71,0,0,0,.72,1.78,0.45,0.45,0,0,0,.34.16,3.84,3.84,0,0,0,1.14-.4q3.58-1.7,5.7-2.9-3.4-2-6.35-3.51a2.29,2.29,0,0,0-.68-0.27,0.42,0.42,0,0,0-.31.16,7,7,0,0,0-.55,1.59h-1q0.18-2,.18-3.21a28.13,28.13,0,0,0-.18-3h1A5.83,5.83,0,0,0,8.27,114a11,11,0,0,0,2.36,1.69q3.74,2.17,6.4,3.56,2.22-1,5.42-2.69l4.75-2.48a2.21,2.21,0,0,0,.52-0.49,8,8,0,0,0,.85-1.91h1q-0.18,2.16-.18,3.46t0.18,3.8h-1a10.33,10.33,0,0,0-.7-1.73,0.5,0.5,0,0,0-.37-0.13,3.07,3.07,0,0,0-1.12.34q-3.7,1.75-6.62,3.34,2.39,1.47,6.58,3.65a3.81,3.81,0,0,0,1.14.45,0.65,0.65,0,0,0,.46-0.18,3.84,3.84,0,0,0,.52-1.28c0-.08.06-0.2,0.11-0.35h1q-0.18,1.78-.18,3.42a19.92,19.92,0,0,0,.18,2.78h-1a5,5,0,0,0-.85-1.9,17.32,17.32,0,0,0-2.94-2q-4.5-2.58-6.74-3.73-2.41,1.14-7.21,3.64a11.27,11.27,0,0,0-2.33,1.49A8.25,8.25,0,0,0,7.42,129.06Z"/><path class="cls-2" d="M18.92,73.69l-0.83-.48q1.11-1.56,1.91-2.94t1.88-3.61l0.83,0.48a5.74,5.74,0,0,0-.27,1.9,0.45,0.45,0,0,0,.22.31,3.85,3.85,0,0,0,1.19.22q4,0.31,6.39.34-2-3.41-3.75-6.22A2.31,2.31,0,0,0,26,63.12a0.42,0.42,0,0,0-.35,0,7,7,0,0,0-1.27,1.1l-0.83-.48Q24.75,62,25.32,61a28.1,28.1,0,0,0,1.32-2.65l0.83,0.48a5.83,5.83,0,0,0-.3,2.22,11,11,0,0,0,1.2,2.64q2.15,3.75,3.77,6.28,2.44,0.21,6,.38l5.35,0.23a2.22,2.22,0,0,0,.69-0.16,8,8,0,0,0,1.69-1.24l0.83,0.48q-1.23,1.78-1.89,2.91T43.12,76l-0.83-.48a10.43,10.43,0,0,0,.26-1.85,0.5,0.5,0,0,0-.26-0.3,3.07,3.07,0,0,0-1.14-.27q-4.08-.34-7.4-0.41,1.33,2.47,3.87,6.45a3.78,3.78,0,0,0,.76,1,0.65,0.65,0,0,0,.49.07A3.83,3.83,0,0,0,40,79.32l0.28-.25,0.83,0.48Q40,81,39.2,82.43A19.91,19.91,0,0,0,38,84.92l-0.83-.48a5,5,0,0,0,.21-2.07,17.37,17.37,0,0,0-1.55-3.19q-2.61-4.48-4-6.6-2.66-.22-8.06-0.45a11.22,11.22,0,0,0-2.76.12A8.17,8.17,0,0,0,18.92,73.69Z"/><path class="cls-2" d="M54.81,29.82L54.33,29q1.74-.8,3.12-1.6t3.43-2.19L61.36,26a5.76,5.76,0,0,0-1.18,1.51,0.45,0.45,0,0,0,0,.38,3.84,3.84,0,0,0,.92.78q3.27,2.25,5.37,3.49,0-3.94-.14-7.26a2.27,2.27,0,0,0-.11-0.73A0.42,0.42,0,0,0,66,24a7,7,0,0,0-1.65.31l-0.48-.83q1.86-.87,2.87-1.45a28,28,0,0,0,2.47-1.63l0.48,0.83A5.82,5.82,0,0,0,68.26,23,11,11,0,0,0,68,25.92q0,4.32.12,7.32,2,1.41,5,3.35l4.52,2.87a2.22,2.22,0,0,0,.68.21,8,8,0,0,0,2.08-.22l0.48,0.83q-2,.92-3.09,1.58t-3.21,2.06l-0.48-.83a10.42,10.42,0,0,0,1.15-1.47,0.5,0.5,0,0,0-.07-0.39,3.06,3.06,0,0,0-.86-0.8q-3.36-2.33-6.2-4.06-0.08,2.8.12,7.52a3.83,3.83,0,0,0,.18,1.21,0.65,0.65,0,0,0,.39.31,3.83,3.83,0,0,0,1.37-.19l0.36-.08L71.06,46q-1.63.73-3.05,1.56a19.91,19.91,0,0,0-2.31,1.54l-0.48-.83a5,5,0,0,0,1.22-1.69A17.42,17.42,0,0,0,66.69,43q0-5.18-.14-7.7-2.19-1.52-6.76-4.42a11.2,11.2,0,0,0-2.46-1.28A8.18,8.18,0,0,0,54.81,29.82Z"/><path class="cls-2" d="M77.31,15.72l0.48,0.83L77.33,17a4.15,4.15,0,0,0-1.27,1.55A2.78,2.78,0,0,0,76.58,20l0.28,0.49,3.22,5.69,4.78,8.21a2.64,2.64,0,0,0,.94,1.13,3.35,3.35,0,0,0,1.75-.39q0.27-.1.8-0.24l0.48,0.83q-1.79.83-3.36,1.74T82,39.66l-0.48-.83a3.66,3.66,0,0,1,.38-0.41,4.57,4.57,0,0,0,1.37-1.59,3.11,3.11,0,0,0-.58-1.51l-0.43-.69-3-5.19q-4.6-8-5.12-8.8a1.38,1.38,0,0,0-.64-0.59,4.58,4.58,0,0,0-1.94.31l-0.66.14-0.48-.83q2.38-1.17,3.67-1.92T77.31,15.72Z"/><line class="cls-3" x1="134.41" y1="35.49" x2="133.65" y2="42.71"/><line class="cls-3" x1="143.71" y1="36.97" x2="142.2" y2="44.07"/><line class="cls-3" x1="152.81" y1="39.4" x2="150.57" y2="46.31"/><line class="cls-3" x1="161.61" y1="42.78" x2="158.65" y2="49.41"/><line class="cls-3" x1="170" y1="47.06" x2="166.37" y2="53.35"/><line class="cls-3" x1="177.9" y1="52.19" x2="173.63" y2="58.06"/><line class="cls-3" x1="185.22" y1="58.12" x2="180.36" y2="63.51"/><line class="cls-3" x1="191.88" y1="64.78" x2="186.49" y2="69.64"/><line class="cls-3" x1="197.81" y1="72.1" x2="191.94" y2="76.37"/><line class="cls-3" x1="202.94" y1="80" x2="196.65" y2="83.63"/><line class="cls-3" x1="207.22" y1="88.39" x2="200.59" y2="91.35"/><line class="cls-3" x1="210.6" y1="97.19" x2="203.69" y2="99.43"/><line class="cls-3" x1="213.03" y1="106.29" x2="205.93" y2="107.8"/><line class="cls-3" x1="214.51" y1="115.59" x2="207.29" y2="116.35"/><line class="cls-3" x1="215" y1="125" x2="207.74" y2="125"/><line class="cls-3" x1="214.51" y1="134.41" x2="207.29" y2="133.65"/><line class="cls-3" x1="213.03" y1="143.71" x2="205.93" y2="142.2"/><line class="cls-3" x1="210.6" y1="152.81" x2="203.69" y2="150.57"/><line class="cls-3" x1="207.22" y1="161.61" x2="200.59" y2="158.65"/><line class="cls-3" x1="202.94" y1="170" x2="196.65" y2="166.37"/><line class="cls-3" x1="197.81" y1="177.9" x2="191.94" y2="173.63"/><line class="cls-3" x1="191.88" y1="185.22" x2="186.49" y2="180.36"/><line class="cls-3" x1="185.22" y1="191.88" x2="180.36" y2="186.49"/><line class="cls-3" x1="177.9" y1="197.81" x2="173.63" y2="191.94"/><line class="cls-3" x1="170" y1="202.94" x2="166.37" y2="196.65"/><line class="cls-3" x1="161.61" y1="207.22" x2="158.65" y2="200.59"/><line class="cls-3" x1="152.81" y1="210.6" x2="150.57" y2="203.69"/><line class="cls-3" x1="143.71" y1="213.03" x2="142.2" y2="205.93"/><line class="cls-3" x1="134.41" y1="214.51" x2="133.65" y2="207.29"/><line class="cls-3" x1="125" y1="215" x2="125" y2="207.74"/><line class="cls-3" x1="115.59" y1="214.51" x2="116.35" y2="207.29"/><line class="cls-3" x1="106.29" y1="213.03" x2="107.8" y2="205.93"/><line class="cls-3" x1="97.19" y1="210.6" x2="99.43" y2="203.69"/><line class="cls-3" x1="88.39" y1="207.22" x2="91.35" y2="200.59"/><line class="cls-3" x1="80" y1="202.94" x2="83.63" y2="196.65"/><line class="cls-3" x1="72.1" y1="197.81" x2="76.37" y2="191.94"/><line class="cls-3" x1="64.78" y1="191.88" x2="69.64" y2="186.49"/><line class="cls-3" x1="58.12" y1="185.22" x2="63.51" y2="180.36"/><line class="cls-3" x1="52.19" y1="177.9" x2="58.06" y2="173.63"/><line class="cls-3" x1="47.06" y1="170" x2="53.35" y2="166.37"/><line class="cls-3" x1="42.78" y1="161.61" x2="49.41" y2="158.65"/><line class="cls-3" x1="39.4" y1="152.81" x2="46.31" y2="150.57"/><line class="cls-3" x1="36.97" y1="143.71" x2="44.07" y2="142.2"/><line class="cls-3" x1="35.49" y1="134.41" x2="42.71" y2="133.65"/><line class="cls-3" x1="35" y1="125" x2="42.26" y2="125"/><line class="cls-3" x1="35.49" y1="115.59" x2="42.71" y2="116.35"/><line class="cls-3" x1="36.97" y1="106.29" x2="44.07" y2="107.8"/><line class="cls-3" x1="39.4" y1="97.19" x2="46.31" y2="99.43"/><line class="cls-3" x1="42.78" y1="88.39" x2="49.41" y2="91.35"/><line class="cls-3" x1="47.06" y1="80" x2="53.35" y2="83.63"/><line class="cls-3" x1="52.19" y1="72.1" x2="58.06" y2="76.37"/><line class="cls-3" x1="58.12" y1="64.78" x2="63.51" y2="69.64"/><line class="cls-3" x1="64.78" y1="58.12" x2="69.64" y2="63.51"/><line class="cls-3" x1="72.1" y1="52.19" x2="76.37" y2="58.06"/><line class="cls-3" x1="80" y1="47.06" x2="83.63" y2="53.35"/><line class="cls-3" x1="88.39" y1="42.78" x2="91.35" y2="49.41"/><line class="cls-3" x1="97.19" y1="39.4" x2="99.43" y2="46.31"/><line class="cls-3" x1="106.29" y1="36.97" x2="107.8" y2="44.07"/><line class="cls-3" x1="115.59" y1="35.49" x2="116.35" y2="42.71"/><line class="cls-3" x1="125" y1="35" x2="125" y2="42.26"/></svg>
diff --git a/modules/default/clock/faces/face-010.svg b/modules/default/clock/faces/face-010.svg
index d0af3acb..8c5e5848 100644
--- a/modules/default/clock/faces/face-010.svg
+++ b/modules/default/clock/faces/face-010.svg
@@ -1 +1 @@
-<svg id="Dots_Small" data-name="Dots Small" xmlns="https://www.w3.org/2000/svg" viewBox="0 0 250 250"><defs><style>.cls-1{fill:#fff;}</style></defs><title>face-010</title><circle class="cls-1" cx="134.86" cy="31.94" r="1" transform="translate(89 162.73) rotate(-84)"/><circle class="cls-1" cx="144.54" cy="33.48" r="1" transform="translate(81.74 167.9) rotate(-78)"/><circle class="cls-1" cx="154" cy="36.02" r="1" transform="translate(72.15 171.35) rotate(-72)"/><circle class="cls-1" cx="163.14" cy="39.54" r="1" transform="translate(60.66 172.49) rotate(-66)"/><circle class="cls-1" cx="171.86" cy="44" r="1" transform="translate(47.83 170.84) rotate(-60)"/><circle class="cls-1" cx="180.07" cy="49.34" r="1" transform="translate(34.31 166.02) rotate(-54)"/><circle class="cls-1" cx="187.68" cy="55.51" r="1" transform="translate(20.85 157.84) rotate(-48)"/><circle class="cls-1" cx="194.6" cy="62.44" r="1" transform="translate(8.2 146.25) rotate(-42)"/><circle class="cls-1" cx="200.76" cy="70.06" r="1" transform="matrix(0.81, -0.59, 0.59, 0.81, -2.84, 131.38)"/><circle class="cls-1" cx="206.09" cy="78.28" r="1" transform="translate(-11.53 113.53) rotate(-30)"/><circle class="cls-1" cx="210.53" cy="87.01" r="1" transform="translate(-17.19 93.15) rotate(-24)"/><circle class="cls-1" cx="214.03" cy="96.16" r="1" transform="translate(-19.24 70.84) rotate(-18)"/><circle class="cls-1" cx="216.56" cy="105.62" r="1" transform="translate(-17.23 47.33) rotate(-12)"/><circle class="cls-1" cx="218.08" cy="115.3" r="1" transform="translate(-10.86 23.43) rotate(-6)"/><circle class="cls-1" cx="218.58" cy="125.08" r="1"/><circle class="cls-1" cx="218.06" cy="134.86" r="1" transform="translate(61.14 337.64) rotate(-84)"/><circle class="cls-1" cx="216.52" cy="144.54" r="1" transform="translate(30.12 326.28) rotate(-78)"/><circle class="cls-1" cx="213.98" cy="154" r="1" transform="translate(1.39 309.91) rotate(-72)"/><circle class="cls-1" cx="210.46" cy="163.14" r="1" transform="translate(-24.18 289.05) rotate(-66)"/><circle class="cls-1" cx="206" cy="171.86" r="1" transform="translate(-45.84 264.34) rotate(-60)"/><circle class="cls-1" cx="200.66" cy="180.07" r="1" transform="translate(-62.97 236.57) rotate(-54)"/><circle class="cls-1" cx="194.49" cy="187.68" r="1" transform="translate(-75.12 206.63) rotate(-48)"/><circle class="cls-1" cx="187.56" cy="194.6" r="1" transform="translate(-82.04 175.48) rotate(-42)"/><circle class="cls-1" cx="179.94" cy="200.76" r="1" transform="translate(-83.64 144.11) rotate(-36)"/><circle class="cls-1" cx="171.72" cy="206.09" r="1" transform="translate(-80.04 113.47) rotate(-30)"/><circle class="cls-1" cx="162.99" cy="210.53" r="1" transform="translate(-71.54 84.49) rotate(-24)"/><circle class="cls-1" cx="153.84" cy="214.03" r="1" transform="translate(-58.61 58.01) rotate(-18)"/><circle class="cls-1" cx="144.38" cy="216.56" r="1" transform="translate(-41.87 34.75) rotate(-12)"/><circle class="cls-1" cx="134.7" cy="218.08" r="1" transform="translate(-22.06 15.27) rotate(-6)"/><circle class="cls-1" cx="124.92" cy="218.58" r="1"/><circle class="cls-1" cx="115.14" cy="218.06" r="1" transform="translate(-113.77 309.77) rotate(-84)"/><circle class="cls-1" cx="105.46" cy="216.52" r="1" transform="matrix(0.21, -0.98, 0.98, 0.21, -128.25, 274.66)"/><circle class="cls-1" cx="96" cy="213.98" r="1" transform="translate(-137.17 239.16) rotate(-72)"/><circle class="cls-1" cx="86.86" cy="210.46" r="1" transform="translate(-140.73 204.21) rotate(-66)"/><circle class="cls-1" cx="78.14" cy="206" r="1" transform="translate(-139.34 170.67) rotate(-60)"/><circle class="cls-1" cx="69.93" cy="200.66" r="1" transform="translate(-133.51 139.29) rotate(-54)"/><circle class="cls-1" cx="62.32" cy="194.49" r="1" transform="translate(-123.92 110.66) rotate(-48)"/><circle class="cls-1" cx="55.4" cy="187.56" r="1" transform="translate(-111.27 85.24) rotate(-42)"/><circle class="cls-1" cx="49.24" cy="179.94" r="1" transform="translate(-96.36 63.31) rotate(-36)"/><circle class="cls-1" cx="43.91" cy="171.72" r="1" transform="translate(-79.98 44.96) rotate(-30)"/><circle class="cls-1" cx="39.47" cy="162.99" r="1" transform="translate(-62.88 30.15) rotate(-24)"/><circle class="cls-1" cx="35.97" cy="153.84" r="1" transform="translate(-45.78 18.65) rotate(-18)"/><circle class="cls-1" cx="33.44" cy="144.38" r="1" transform="translate(-29.29 10.11) rotate(-12)"/><circle class="cls-1" cx="31.92" cy="134.7" r="1" transform="translate(-13.91 4.07) rotate(-6)"/><circle class="cls-1" cx="31.42" cy="124.92" r="1"/><circle class="cls-1" cx="31.94" cy="115.14" r="1" transform="translate(-85.9 134.86) rotate(-84)"/><circle class="cls-1" cx="33.48" cy="105.46" r="1" transform="translate(-76.64 116.28) rotate(-78)"/><circle class="cls-1" cx="36.02" cy="96" r="1" transform="translate(-66.41 100.6) rotate(-72)"/><circle class="cls-1" cx="39.54" cy="86.86" r="1" transform="translate(-55.89 87.65) rotate(-66)"/><circle class="cls-1" cx="44" cy="78.14" r="1" transform="translate(-45.67 77.17) rotate(-60)"/><circle class="cls-1" cx="49.34" cy="69.93" r="1" transform="translate(-36.23 68.74) rotate(-54)"/><circle class="cls-1" cx="55.51" cy="62.32" r="1" transform="translate(-27.95 61.87) rotate(-48)"/><circle class="cls-1" cx="62.44" cy="55.4" r="1" transform="translate(-21.03 56.01) rotate(-42)"/><circle class="cls-1" cx="70.06" cy="49.24" r="1" transform="translate(-15.56 50.58) rotate(-36)"/><circle class="cls-1" cx="78.28" cy="43.91" r="1" transform="matrix(0.87, -0.5, 0.5, 0.87, -11.47, 45.02)"/><circle class="cls-1" cx="87.01" cy="39.47" r="1" transform="translate(-8.53 38.8) rotate(-24)"/><circle class="cls-1" cx="96.16" cy="35.97" r="1" transform="translate(-6.41 31.48) rotate(-18)"/><circle class="cls-1" cx="105.62" cy="33.44" r="1" transform="translate(-4.65 22.69) rotate(-12)"/><circle class="cls-1" cx="115.3" cy="31.92" r="1" transform="translate(-2.7 12.23) rotate(-6)"/><circle class="cls-1" cx="125.08" cy="31.42" r="1"/><circle class="cls-1" cx="171.86" cy="44" r="2.5" transform="translate(47.83 170.84) rotate(-60)"/><circle class="cls-1" cx="206.09" cy="78.28" r="2.5" transform="translate(-11.53 113.53) rotate(-30)"/><circle class="cls-1" cx="218.58" cy="125.08" r="2.5"/><circle class="cls-1" cx="206" cy="171.86" r="2.5" transform="translate(-45.84 264.34) rotate(-60)"/><circle class="cls-1" cx="171.72" cy="206.09" r="2.5" transform="translate(-80.04 113.47) rotate(-30)"/><circle class="cls-1" cx="124.92" cy="218.58" r="2.5"/><circle class="cls-1" cx="78.14" cy="206" r="2.5" transform="translate(-139.34 170.67) rotate(-60)"/><circle class="cls-1" cx="43.91" cy="171.72" r="2.5" transform="translate(-79.98 44.96) rotate(-30)"/><circle class="cls-1" cx="31.42" cy="124.92" r="2.5"/><circle class="cls-1" cx="44" cy="78.14" r="2.5" transform="translate(-45.67 77.17) rotate(-60)"/><circle class="cls-1" cx="78.28" cy="43.91" r="2.5" transform="translate(-11.47 45.02) rotate(-30)"/><circle class="cls-1" cx="125.08" cy="31.42" r="2.5"/><path class="cls-1" d="M125,1.5a123.5,123.5,0,0,1,87.33,210.83A123.5,123.5,0,0,1,37.67,37.67,122.7,122.7,0,0,1,125,1.5m0-1A124.5,124.5,0,1,0,249.5,125,124.5,124.5,0,0,0,125,.5h0Z"/><path class="cls-1" d="M120.24,20.44h-2.1V6.5h-2.07v-1a2.51,2.51,0,0,0,2.43-1.64h1.74V20.44Z"/><path class="cls-1" d="M132.84,20.34h-9.67a14.87,14.87,0,0,1,.23-2.81,4.69,4.69,0,0,1,.73-1.79,6.14,6.14,0,0,1,1.5-1.42q0.66-.46,1.45-0.94l1.24-.75c0.3-.18.62-0.38,1-0.62a4.13,4.13,0,0,0,.77-0.67,4.08,4.08,0,0,0,.5-0.77,3.4,3.4,0,0,0,.33-1A9.47,9.47,0,0,0,131,8.14q0-.48,0-0.75c0-.18,0-0.38,0-0.62a2.16,2.16,0,0,0-.11-0.53,3.43,3.43,0,0,0-.2-0.4,0.84,0.84,0,0,0-.32-0.33,3.84,3.84,0,0,0-.48-0.21,2.62,2.62,0,0,0-.66-0.15,8.74,8.74,0,0,0-.87,0,9.89,9.89,0,0,0-1.46.08,2.19,2.19,0,0,0-.94.38,1.64,1.64,0,0,0-.59.82A6.16,6.16,0,0,0,125,7.84l-1.66-.39q0-.1,0-0.3a3.11,3.11,0,0,1,1.2-2.75,6.24,6.24,0,0,1,3.56-.83,14.76,14.76,0,0,1,1.58.07,6.19,6.19,0,0,1,1.24.26,2.75,2.75,0,0,1,1,.52,3,3,0,0,1,.66.84,4,4,0,0,1,.39,1.22A10.37,10.37,0,0,1,133,8.14a7.76,7.76,0,0,1-.37,2.59,4.45,4.45,0,0,1-1.07,1.72,8.75,8.75,0,0,1-1.92,1.33l-0.77.44-0.73.41-0.64.38a6.31,6.31,0,0,0-.59.39l-0.49.4a2.77,2.77,0,0,0-.44.45q-0.15.21-.33,0.5a2.52,2.52,0,0,0-.27.59,5.29,5.29,0,0,0-.15.67,5.71,5.71,0,0,0-.07.78h7.64v1.53Z"/><path class="cls-1" d="M183.06,35.62H181V21.68h-2.07v-1A2.51,2.51,0,0,0,181.32,19h1.74V35.62Z"/><path class="cls-1" d="M227.74,77h-9.67a14.87,14.87,0,0,1,.23-2.81,4.69,4.69,0,0,1,.73-1.79,6.16,6.16,0,0,1,1.5-1.42Q221.2,70.52,222,70l1.24-.75c0.3-.18.62-0.38,1-0.62a4.13,4.13,0,0,0,.77-0.67,4.08,4.08,0,0,0,.5-0.77,3.4,3.4,0,0,0,.33-1,9.34,9.34,0,0,0,.09-1.38q0-.48,0-0.75t0-.62a2.12,2.12,0,0,0-.11-0.53,3.41,3.41,0,0,0-.2-0.4,0.84,0.84,0,0,0-.33-0.33,3.89,3.89,0,0,0-.48-0.21,2.63,2.63,0,0,0-.66-0.15,8.72,8.72,0,0,0-.87,0,9.88,9.88,0,0,0-1.46.08,2.18,2.18,0,0,0-.94.38,1.64,1.64,0,0,0-.59.82,6.13,6.13,0,0,0-.26,1.44l-1.66-.39a2.86,2.86,0,0,1,0-.3,3.11,3.11,0,0,1,1.2-2.75,6.24,6.24,0,0,1,3.56-.83,14.77,14.77,0,0,1,1.58.07,6.19,6.19,0,0,1,1.24.26,2.76,2.76,0,0,1,1,.52,2.94,2.94,0,0,1,.66.84,3.94,3.94,0,0,1,.39,1.22,10.37,10.37,0,0,1,.12,1.66,7.76,7.76,0,0,1-.37,2.59,4.43,4.43,0,0,1-1.07,1.72,8.75,8.75,0,0,1-1.92,1.33l-0.77.44-0.73.41-0.64.38a6.44,6.44,0,0,0-.59.39l-0.49.4a2.73,2.73,0,0,0-.44.45q-0.15.21-.33,0.5a2.52,2.52,0,0,0-.27.59,5.38,5.38,0,0,0-.15.67,5.78,5.78,0,0,0-.07.78h7.64V77Z"/><path class="cls-1" d="M243.25,129.08a7.47,7.47,0,0,1-.25,2,4,4,0,0,1-.68,1.41,3,3,0,0,1-1.15.87,5.93,5.93,0,0,1-1.55.44,13.63,13.63,0,0,1-2,.12,13.37,13.37,0,0,1-2-.13,4.65,4.65,0,0,1-1.46-.47,2.15,2.15,0,0,1-1-1,3.58,3.58,0,0,1-.31-1.58q0-.44,0-0.71l1.79-.26c0,0.09,0,.21,0,0.38s0,0.31,0,.44,0,0.26,0,.38a1.25,1.25,0,0,0,.79,1.08,6.44,6.44,0,0,0,2.31.3q0.86,0,1.39,0a2.48,2.48,0,0,0,.92-0.21,2.53,2.53,0,0,0,.57-0.34,1.23,1.23,0,0,0,.28-0.64,4.85,4.85,0,0,0,.12-0.86q0-.37,0-1.27v0a5.86,5.86,0,0,0-.16-1.5,3.28,3.28,0,0,0-.37-0.9,1.29,1.29,0,0,0-.85-0.47,7.34,7.34,0,0,0-1.15-.17q-0.51,0-1.72,0h-0.07l-0.09-1.59h1.8a4.49,4.49,0,0,0,1.23-.18,2.52,2.52,0,0,0,.75-0.36,1.22,1.22,0,0,0,.38-0.73,5.8,5.8,0,0,0,.14-0.92q0-.4,0-1.33v-0.19a4.3,4.3,0,0,0-.1-1.05,1.28,1.28,0,0,0-.44-0.66,2,2,0,0,0-.94-0.38,10.57,10.57,0,0,0-1.65-.1,7,7,0,0,0-2.36.27,1.1,1.1,0,0,0-.71,1l-0.1,1.22-1.73-.34v-0.31a6.3,6.3,0,0,1,.11-1.31,2.54,2.54,0,0,1,.41-0.94,1.92,1.92,0,0,1,.87-0.66,6.33,6.33,0,0,1,1.45-.35,18.42,18.42,0,0,1,2.19-.15,5.94,5.94,0,0,1,3.81,1,3.9,3.9,0,0,1,1.2,3.18,7.4,7.4,0,0,1-.2,1.8,4,4,0,0,1-.45,1.18,2.37,2.37,0,0,1-.62.66,2.45,2.45,0,0,1-.58.33,3.65,3.65,0,0,1-.44.12h-0.08l0.3,0.06a2.43,2.43,0,0,1,.4.15,2.21,2.21,0,0,1,.48.28,3.39,3.39,0,0,1,.46.46,2.74,2.74,0,0,1,.43.69,4.85,4.85,0,0,1,.29,1A7.25,7.25,0,0,1,243.25,129.08Z"/><path class="cls-1" d="M228.34,186.08h-1.56v4.37h-2.07v-4.36h-7v-1.68l5.8-10.57h3.24v10.77h1.56v1.47ZM224.71,175l-0.57,1.15-0.52,1L221,182.46l-0.55,1.09-0.54,1.06h4.81V175Z"/><path class="cls-1" d="M187.18,226.8a13.7,13.7,0,0,1-.12,1.94,5,5,0,0,1-.4,1.42,2.76,2.76,0,0,1-1.77,1.57,6.63,6.63,0,0,1-1.46.31,18.57,18.57,0,0,1-1.91.08q-0.67,0-1.19,0t-1.05-.12a4.26,4.26,0,0,1-.92-0.25,3.71,3.71,0,0,1-.73-0.41,2,2,0,0,1-.57-0.61,3.15,3.15,0,0,1-.34-0.86,4.77,4.77,0,0,1-.12-1.14c0-.07,0-0.19,0-0.35s0-.29,0-0.38l1.69-.24q0.06,0.66.11,1a3.49,3.49,0,0,0,.19.71,1.17,1.17,0,0,0,.32.5,1.83,1.83,0,0,0,.55.28,3.24,3.24,0,0,0,.83.16q0.47,0,1.21,0a8.56,8.56,0,0,0,1.64-.13,3.74,3.74,0,0,0,1.07-.35,1.54,1.54,0,0,0,.6-0.59,2.37,2.37,0,0,0,.28-0.76,5.52,5.52,0,0,0,.07-0.94q0-.23,0-0.78t0-.85q0-.58,0-0.89a6.06,6.06,0,0,0-.06-0.68,2,2,0,0,0-.13-0.55,1.84,1.84,0,0,0-.25-0.38,0.88,0.88,0,0,0-.4-0.29,6.11,6.11,0,0,0-.6-0.16,4.46,4.46,0,0,0-.82-0.1l-1.09,0H181c-0.2,0-.43,0-0.67.06a1.93,1.93,0,0,0-.59.16,2.54,2.54,0,0,0-.45.3,1.31,1.31,0,0,0-.36.47,2.68,2.68,0,0,0-.2.69l-2-.15v-9.21h9.44V217H179l-0.36,6.38a5.87,5.87,0,0,1,.32-0.68,3.12,3.12,0,0,1,.43-0.57,2.14,2.14,0,0,1,.64-0.48,3.89,3.89,0,0,1,.93-0.29,6.89,6.89,0,0,1,1.31-.11,11.37,11.37,0,0,1,1.83.13,4,4,0,0,1,1.33.44,3.14,3.14,0,0,1,.89.72,3,3,0,0,1,.54,1.06,7.39,7.39,0,0,1,.27,1.38Q187.18,225.76,187.18,226.8Z"/><path class="cls-1" d="M130.75,241.65a18.38,18.38,0,0,1-.09,1.95,6.27,6.27,0,0,1-.33,1.47,3.14,3.14,0,0,1-.61,1.06,3,3,0,0,1-1,.68,5,5,0,0,1-1.39.38,14.37,14.37,0,0,1-1.88.11,19.56,19.56,0,0,1-2.35-.12,4.55,4.55,0,0,1-1.63-.49,3.45,3.45,0,0,1-1.06-.85,3.58,3.58,0,0,1-.59-1.42,11.49,11.49,0,0,1-.27-1.95q-0.06-1-.06-2.7,0-3.67.1-4.78a5.86,5.86,0,0,1,1-3.28,4.74,4.74,0,0,1,3.42-1.36q0.54,0,1.15,0c0.5,0,.93,0,1.28,0a10.78,10.78,0,0,1,1.1.12,3.68,3.68,0,0,1,1,.26,2.91,2.91,0,0,1,.7.45,1.62,1.62,0,0,1,.47.7,3,3,0,0,1,.15,1q0,0.21-.09,1.11-1,.1-1.79.24c0-.34,0-0.58,0-0.74a5.29,5.29,0,0,0,0-.55,1.58,1.58,0,0,0-.09-0.43,1.34,1.34,0,0,0-.21-0.29,0.63,0.63,0,0,0-.31-0.21l-0.48-.1a4.13,4.13,0,0,0-.65-0.06h-0.87a6.79,6.79,0,0,0-2.73.45,1.75,1.75,0,0,0-.82,1.53q-0.11,2.51-.16,4.54a3.62,3.62,0,0,1,.77-1,3.3,3.3,0,0,1,1.19-.63,5.87,5.87,0,0,1,1.78-.24c0.53,0,1,0,1.39,0a9.2,9.2,0,0,1,1.14.15,4.13,4.13,0,0,1,.94.29,3.33,3.33,0,0,1,.72.46,2.29,2.29,0,0,1,.54.66,4.64,4.64,0,0,1,.36.91,6.11,6.11,0,0,1,.22,1.18C130.72,240.61,130.75,241.1,130.75,241.65Zm-2,1.74q0-3.13,0-3.47a1.42,1.42,0,0,0-.77-1.33,7.52,7.52,0,0,0-2.72-.36,13.41,13.41,0,0,0-1.51.07,2.95,2.95,0,0,0-1.64.67,1.14,1.14,0,0,0-.32.62,4.77,4.77,0,0,0-.12.73q0,0.31,0,.94,0,0.35,0,.92c0,0.38,0,.65,0,0.81a6.72,6.72,0,0,0,.06,1,2.41,2.41,0,0,0,.26.76,1.33,1.33,0,0,0,.59.57,3.94,3.94,0,0,0,1.06.31,9.68,9.68,0,0,0,1.64.12q0.72,0,1.24,0a9,9,0,0,0,.91-0.12,1.84,1.84,0,0,0,.63-0.23,2.06,2.06,0,0,0,.4-0.31,1,1,0,0,0,.22-0.44,3.29,3.29,0,0,0,.1-0.54C128.71,243.9,128.71,243.67,128.71,243.39Z"/><path class="cls-1" d="M72.3,214.38v1.91q-3.37,8.73-5,14.7H65.23q2.07-7.06,5.18-14.9H64v-1.7H72.3Z"/><path class="cls-1" d="M27.08,190.67h0a16.53,16.53,0,0,1-2.1-.11,6.11,6.11,0,0,1-1.54-.4,2.54,2.54,0,0,1-1.08-.8,3.61,3.61,0,0,1-.59-1.28,7.55,7.55,0,0,1-.2-1.88,6.76,6.76,0,0,1,.51-2.91,4.45,4.45,0,0,1,1.53-1.74q-1.22-.9-1.22-3.74a4.1,4.1,0,0,1,1.09-3.27,5.56,5.56,0,0,1,3.58-.92,5.56,5.56,0,0,1,3.58.92,4.1,4.1,0,0,1,1.09,3.27q0,2.85-1.22,3.74a4.45,4.45,0,0,1,1.53,1.74,6.76,6.76,0,0,1,.51,2.91,7.57,7.57,0,0,1-.2,1.88,3.61,3.61,0,0,1-.59,1.28,2.54,2.54,0,0,1-1.08.8,6.11,6.11,0,0,1-1.54.4A16.53,16.53,0,0,1,27.08,190.67Zm0-8.15h-1l-0.81.05a1.88,1.88,0,0,0-.66.14l-0.44.26a0.78,0.78,0,0,0-.33.44,5.7,5.7,0,0,0-.15.64,5.1,5.1,0,0,0-.07.9q0,0.38,0,1t0,0.91a3.52,3.52,0,0,0,.07.75,1.64,1.64,0,0,0,.27.59,1.35,1.35,0,0,0,.59.45,4.43,4.43,0,0,0,1,.26,12.19,12.19,0,0,0,3.13,0,4.43,4.43,0,0,0,1-.26,1.35,1.35,0,0,0,.59-0.45,1.64,1.64,0,0,0,.27-0.59,3.52,3.52,0,0,0,.07-0.75q0-.27,0-0.91t0-1a5.1,5.1,0,0,0-.07-0.9,5.6,5.6,0,0,0-.15-0.64A0.78,0.78,0,0,0,30,183l-0.44-.26a1.89,1.89,0,0,0-.66-0.14l-0.81-.05h-1Zm0-7.25H26.22a4.57,4.57,0,0,0-.67.07,4.18,4.18,0,0,0-.5.11,0.81,0.81,0,0,0-.33.21,1,1,0,0,0-.22.3,1.84,1.84,0,0,0-.12.44,3.76,3.76,0,0,0-.06.56c0,0.18,0,.43,0,0.74q0,2.66.86,3.21H29q0.86-.55.86-3.21c0-.31,0-0.56,0-0.74a3.76,3.76,0,0,0-.06-0.56A1.84,1.84,0,0,0,29.7,176a1.05,1.05,0,0,0-.22-0.3,0.81,0.81,0,0,0-.33-0.21,4.22,4.22,0,0,0-.5-0.11,4.57,4.57,0,0,0-.67-0.07H27.08Z"/><path class="cls-1" d="M17.14,124.39q0,3.88-.1,5a5.65,5.65,0,0,1-1,3.11,4.21,4.21,0,0,1-3,1.24,14.62,14.62,0,0,1-1.49.07h-1.1q-0.44,0-1-.06a7.1,7.1,0,0,1-1-.14,4.78,4.78,0,0,1-.8-0.26,1.8,1.8,0,0,1-1-1,2.1,2.1,0,0,1-.16-0.83,7.59,7.59,0,0,1,.1-1.23q0.91-.1,1.78-0.24,0,0.44,0,.66a4.19,4.19,0,0,0,.05.52,1.39,1.39,0,0,0,.12.43,1.53,1.53,0,0,0,.23.3,0.8,0.8,0,0,0,.37.23l0.55,0.13a4.56,4.56,0,0,0,.76.09l1,0a14.51,14.51,0,0,0,1.64-.11,2.63,2.63,0,0,0,1-.31,1.19,1.19,0,0,0,.53-0.58,3.81,3.81,0,0,0,.21-1q0.11-2.58.16-4.67a3.77,3.77,0,0,1-3.64,1.86,17.84,17.84,0,0,1-1.81-.08,6.66,6.66,0,0,1-1.38-.29,2.88,2.88,0,0,1-1-.55,2.85,2.85,0,0,1-.67-0.92,4.63,4.63,0,0,1-.39-1.34A13.11,13.11,0,0,1,6,122.59a17.11,17.11,0,0,1,.1-2,6.07,6.07,0,0,1,.35-1.48,3.21,3.21,0,0,1,.63-1,2.82,2.82,0,0,1,1-.66A5.44,5.44,0,0,1,9.46,117a14,14,0,0,1,1.82-.1,18.67,18.67,0,0,1,2.31.12,4.43,4.43,0,0,1,1.6.49,3.42,3.42,0,0,1,1,.85,3.58,3.58,0,0,1,.58,1.41,11.65,11.65,0,0,1,.27,1.93Q17.14,122.73,17.14,124.39Zm-2.07-2.68q0-.75,0-1.09a5,5,0,0,0-.12-0.81,1.16,1.16,0,0,0-.31-0.64,3.09,3.09,0,0,0-.6-0.38,2.7,2.7,0,0,0-1-.26q-0.59-.06-1.48-0.06a9.51,9.51,0,0,0-2.21.19,1.69,1.69,0,0,0-1,.55,2.07,2.07,0,0,0-.29,1.09q0,1.68,0,2.54t0,1.09a3.76,3.76,0,0,0,.13.78,1,1,0,0,0,.32.58,3,3,0,0,0,.62.33,3.13,3.13,0,0,0,1,.22q0.58,0,1.47.06a6.1,6.1,0,0,0,2.64-.41,1.59,1.59,0,0,0,.83-1.43Q15.07,123.29,15.07,121.71Z"/><path class="cls-1" d="M25.11,77.14H23V63.2H20.94v-1a2.51,2.51,0,0,0,2.43-1.64h1.74V77.14Z"/><path class="cls-1" d="M34.06,77.32a14,14,0,0,1-1.84-.11,3.9,3.9,0,0,1-1.38-.43,9.06,9.06,0,0,1-1-.63,2.16,2.16,0,0,1-.67-1Q28.9,74.5,28.75,74a7.78,7.78,0,0,1-.22-1.56q-0.07-1-.08-1.8t0-2.17q0-.94,0-1.63t0.07-1.42a12.12,12.12,0,0,1,.15-1.25,10.09,10.09,0,0,1,.25-1.05,3.46,3.46,0,0,1,.39-0.89,5.11,5.11,0,0,1,.54-0.7,2.56,2.56,0,0,1,.72-0.55,6.29,6.29,0,0,1,.92-0.37,5.62,5.62,0,0,1,1.15-.24,13.53,13.53,0,0,1,1.41-.07,10.69,10.69,0,0,1,1.87.15,5.9,5.9,0,0,1,1.41.42,2.93,2.93,0,0,1,1,.76,4.63,4.63,0,0,1,.68,1,5.47,5.47,0,0,1,.41,1.4,15.35,15.35,0,0,1,.2,1.73q0.05,0.88.05,2.1,0,3.66-.13,4.91A5.61,5.61,0,0,1,38.37,76a5.32,5.32,0,0,1-3.82,1.27H34.06Zm0-15.38a5.24,5.24,0,0,0-2.53.48,1.74,1.74,0,0,0-.89,1.52q0,0.71-.07,1.51t0,1.83q0,1,0,1.57,0,3,.12,4.92a1.58,1.58,0,0,0,.87,1.39,5.66,5.66,0,0,0,2.55.44,5.66,5.66,0,0,0,2.55-.44,1.58,1.58,0,0,0,.87-1.39q0.12-1.93.12-4.92,0-.54-0.05-2.27t-0.08-2.64a1.76,1.76,0,0,0-.9-1.52A5.21,5.21,0,0,0,34.06,61.94Z"/><path class="cls-1" d="M68.4,35.64h-2.1V21.7H64.23v-1A2.51,2.51,0,0,0,66.67,19H68.4V35.64Z"/><path class="cls-1" d="M74.95,35.64h-2.1V21.7H70.78v-1A2.51,2.51,0,0,0,73.21,19h1.74V35.64Z"/></svg>
+<svg id="Dots_Small" data-name="Dots Small" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 250 250"><defs><style>.cls-1{fill:#fff;}</style></defs><title>face-010</title><circle class="cls-1" cx="134.86" cy="31.94" r="1" transform="translate(89 162.73) rotate(-84)"/><circle class="cls-1" cx="144.54" cy="33.48" r="1" transform="translate(81.74 167.9) rotate(-78)"/><circle class="cls-1" cx="154" cy="36.02" r="1" transform="translate(72.15 171.35) rotate(-72)"/><circle class="cls-1" cx="163.14" cy="39.54" r="1" transform="translate(60.66 172.49) rotate(-66)"/><circle class="cls-1" cx="171.86" cy="44" r="1" transform="translate(47.83 170.84) rotate(-60)"/><circle class="cls-1" cx="180.07" cy="49.34" r="1" transform="translate(34.31 166.02) rotate(-54)"/><circle class="cls-1" cx="187.68" cy="55.51" r="1" transform="translate(20.85 157.84) rotate(-48)"/><circle class="cls-1" cx="194.6" cy="62.44" r="1" transform="translate(8.2 146.25) rotate(-42)"/><circle class="cls-1" cx="200.76" cy="70.06" r="1" transform="matrix(0.81, -0.59, 0.59, 0.81, -2.84, 131.38)"/><circle class="cls-1" cx="206.09" cy="78.28" r="1" transform="translate(-11.53 113.53) rotate(-30)"/><circle class="cls-1" cx="210.53" cy="87.01" r="1" transform="translate(-17.19 93.15) rotate(-24)"/><circle class="cls-1" cx="214.03" cy="96.16" r="1" transform="translate(-19.24 70.84) rotate(-18)"/><circle class="cls-1" cx="216.56" cy="105.62" r="1" transform="translate(-17.23 47.33) rotate(-12)"/><circle class="cls-1" cx="218.08" cy="115.3" r="1" transform="translate(-10.86 23.43) rotate(-6)"/><circle class="cls-1" cx="218.58" cy="125.08" r="1"/><circle class="cls-1" cx="218.06" cy="134.86" r="1" transform="translate(61.14 337.64) rotate(-84)"/><circle class="cls-1" cx="216.52" cy="144.54" r="1" transform="translate(30.12 326.28) rotate(-78)"/><circle class="cls-1" cx="213.98" cy="154" r="1" transform="translate(1.39 309.91) rotate(-72)"/><circle class="cls-1" cx="210.46" cy="163.14" r="1" transform="translate(-24.18 289.05) rotate(-66)"/><circle class="cls-1" cx="206" cy="171.86" r="1" transform="translate(-45.84 264.34) rotate(-60)"/><circle class="cls-1" cx="200.66" cy="180.07" r="1" transform="translate(-62.97 236.57) rotate(-54)"/><circle class="cls-1" cx="194.49" cy="187.68" r="1" transform="translate(-75.12 206.63) rotate(-48)"/><circle class="cls-1" cx="187.56" cy="194.6" r="1" transform="translate(-82.04 175.48) rotate(-42)"/><circle class="cls-1" cx="179.94" cy="200.76" r="1" transform="translate(-83.64 144.11) rotate(-36)"/><circle class="cls-1" cx="171.72" cy="206.09" r="1" transform="translate(-80.04 113.47) rotate(-30)"/><circle class="cls-1" cx="162.99" cy="210.53" r="1" transform="translate(-71.54 84.49) rotate(-24)"/><circle class="cls-1" cx="153.84" cy="214.03" r="1" transform="translate(-58.61 58.01) rotate(-18)"/><circle class="cls-1" cx="144.38" cy="216.56" r="1" transform="translate(-41.87 34.75) rotate(-12)"/><circle class="cls-1" cx="134.7" cy="218.08" r="1" transform="translate(-22.06 15.27) rotate(-6)"/><circle class="cls-1" cx="124.92" cy="218.58" r="1"/><circle class="cls-1" cx="115.14" cy="218.06" r="1" transform="translate(-113.77 309.77) rotate(-84)"/><circle class="cls-1" cx="105.46" cy="216.52" r="1" transform="matrix(0.21, -0.98, 0.98, 0.21, -128.25, 274.66)"/><circle class="cls-1" cx="96" cy="213.98" r="1" transform="translate(-137.17 239.16) rotate(-72)"/><circle class="cls-1" cx="86.86" cy="210.46" r="1" transform="translate(-140.73 204.21) rotate(-66)"/><circle class="cls-1" cx="78.14" cy="206" r="1" transform="translate(-139.34 170.67) rotate(-60)"/><circle class="cls-1" cx="69.93" cy="200.66" r="1" transform="translate(-133.51 139.29) rotate(-54)"/><circle class="cls-1" cx="62.32" cy="194.49" r="1" transform="translate(-123.92 110.66) rotate(-48)"/><circle class="cls-1" cx="55.4" cy="187.56" r="1" transform="translate(-111.27 85.24) rotate(-42)"/><circle class="cls-1" cx="49.24" cy="179.94" r="1" transform="translate(-96.36 63.31) rotate(-36)"/><circle class="cls-1" cx="43.91" cy="171.72" r="1" transform="translate(-79.98 44.96) rotate(-30)"/><circle class="cls-1" cx="39.47" cy="162.99" r="1" transform="translate(-62.88 30.15) rotate(-24)"/><circle class="cls-1" cx="35.97" cy="153.84" r="1" transform="translate(-45.78 18.65) rotate(-18)"/><circle class="cls-1" cx="33.44" cy="144.38" r="1" transform="translate(-29.29 10.11) rotate(-12)"/><circle class="cls-1" cx="31.92" cy="134.7" r="1" transform="translate(-13.91 4.07) rotate(-6)"/><circle class="cls-1" cx="31.42" cy="124.92" r="1"/><circle class="cls-1" cx="31.94" cy="115.14" r="1" transform="translate(-85.9 134.86) rotate(-84)"/><circle class="cls-1" cx="33.48" cy="105.46" r="1" transform="translate(-76.64 116.28) rotate(-78)"/><circle class="cls-1" cx="36.02" cy="96" r="1" transform="translate(-66.41 100.6) rotate(-72)"/><circle class="cls-1" cx="39.54" cy="86.86" r="1" transform="translate(-55.89 87.65) rotate(-66)"/><circle class="cls-1" cx="44" cy="78.14" r="1" transform="translate(-45.67 77.17) rotate(-60)"/><circle class="cls-1" cx="49.34" cy="69.93" r="1" transform="translate(-36.23 68.74) rotate(-54)"/><circle class="cls-1" cx="55.51" cy="62.32" r="1" transform="translate(-27.95 61.87) rotate(-48)"/><circle class="cls-1" cx="62.44" cy="55.4" r="1" transform="translate(-21.03 56.01) rotate(-42)"/><circle class="cls-1" cx="70.06" cy="49.24" r="1" transform="translate(-15.56 50.58) rotate(-36)"/><circle class="cls-1" cx="78.28" cy="43.91" r="1" transform="matrix(0.87, -0.5, 0.5, 0.87, -11.47, 45.02)"/><circle class="cls-1" cx="87.01" cy="39.47" r="1" transform="translate(-8.53 38.8) rotate(-24)"/><circle class="cls-1" cx="96.16" cy="35.97" r="1" transform="translate(-6.41 31.48) rotate(-18)"/><circle class="cls-1" cx="105.62" cy="33.44" r="1" transform="translate(-4.65 22.69) rotate(-12)"/><circle class="cls-1" cx="115.3" cy="31.92" r="1" transform="translate(-2.7 12.23) rotate(-6)"/><circle class="cls-1" cx="125.08" cy="31.42" r="1"/><circle class="cls-1" cx="171.86" cy="44" r="2.5" transform="translate(47.83 170.84) rotate(-60)"/><circle class="cls-1" cx="206.09" cy="78.28" r="2.5" transform="translate(-11.53 113.53) rotate(-30)"/><circle class="cls-1" cx="218.58" cy="125.08" r="2.5"/><circle class="cls-1" cx="206" cy="171.86" r="2.5" transform="translate(-45.84 264.34) rotate(-60)"/><circle class="cls-1" cx="171.72" cy="206.09" r="2.5" transform="translate(-80.04 113.47) rotate(-30)"/><circle class="cls-1" cx="124.92" cy="218.58" r="2.5"/><circle class="cls-1" cx="78.14" cy="206" r="2.5" transform="translate(-139.34 170.67) rotate(-60)"/><circle class="cls-1" cx="43.91" cy="171.72" r="2.5" transform="translate(-79.98 44.96) rotate(-30)"/><circle class="cls-1" cx="31.42" cy="124.92" r="2.5"/><circle class="cls-1" cx="44" cy="78.14" r="2.5" transform="translate(-45.67 77.17) rotate(-60)"/><circle class="cls-1" cx="78.28" cy="43.91" r="2.5" transform="translate(-11.47 45.02) rotate(-30)"/><circle class="cls-1" cx="125.08" cy="31.42" r="2.5"/><path class="cls-1" d="M125,1.5a123.5,123.5,0,0,1,87.33,210.83A123.5,123.5,0,0,1,37.67,37.67,122.7,122.7,0,0,1,125,1.5m0-1A124.5,124.5,0,1,0,249.5,125,124.5,124.5,0,0,0,125,.5h0Z"/><path class="cls-1" d="M120.24,20.44h-2.1V6.5h-2.07v-1a2.51,2.51,0,0,0,2.43-1.64h1.74V20.44Z"/><path class="cls-1" d="M132.84,20.34h-9.67a14.87,14.87,0,0,1,.23-2.81,4.69,4.69,0,0,1,.73-1.79,6.14,6.14,0,0,1,1.5-1.42q0.66-.46,1.45-0.94l1.24-.75c0.3-.18.62-0.38,1-0.62a4.13,4.13,0,0,0,.77-0.67,4.08,4.08,0,0,0,.5-0.77,3.4,3.4,0,0,0,.33-1A9.47,9.47,0,0,0,131,8.14q0-.48,0-0.75c0-.18,0-0.38,0-0.62a2.16,2.16,0,0,0-.11-0.53,3.43,3.43,0,0,0-.2-0.4,0.84,0.84,0,0,0-.32-0.33,3.84,3.84,0,0,0-.48-0.21,2.62,2.62,0,0,0-.66-0.15,8.74,8.74,0,0,0-.87,0,9.89,9.89,0,0,0-1.46.08,2.19,2.19,0,0,0-.94.38,1.64,1.64,0,0,0-.59.82A6.16,6.16,0,0,0,125,7.84l-1.66-.39q0-.1,0-0.3a3.11,3.11,0,0,1,1.2-2.75,6.24,6.24,0,0,1,3.56-.83,14.76,14.76,0,0,1,1.58.07,6.19,6.19,0,0,1,1.24.26,2.75,2.75,0,0,1,1,.52,3,3,0,0,1,.66.84,4,4,0,0,1,.39,1.22A10.37,10.37,0,0,1,133,8.14a7.76,7.76,0,0,1-.37,2.59,4.45,4.45,0,0,1-1.07,1.72,8.75,8.75,0,0,1-1.92,1.33l-0.77.44-0.73.41-0.64.38a6.31,6.31,0,0,0-.59.39l-0.49.4a2.77,2.77,0,0,0-.44.45q-0.15.21-.33,0.5a2.52,2.52,0,0,0-.27.59,5.29,5.29,0,0,0-.15.67,5.71,5.71,0,0,0-.07.78h7.64v1.53Z"/><path class="cls-1" d="M183.06,35.62H181V21.68h-2.07v-1A2.51,2.51,0,0,0,181.32,19h1.74V35.62Z"/><path class="cls-1" d="M227.74,77h-9.67a14.87,14.87,0,0,1,.23-2.81,4.69,4.69,0,0,1,.73-1.79,6.16,6.16,0,0,1,1.5-1.42Q221.2,70.52,222,70l1.24-.75c0.3-.18.62-0.38,1-0.62a4.13,4.13,0,0,0,.77-0.67,4.08,4.08,0,0,0,.5-0.77,3.4,3.4,0,0,0,.33-1,9.34,9.34,0,0,0,.09-1.38q0-.48,0-0.75t0-.62a2.12,2.12,0,0,0-.11-0.53,3.41,3.41,0,0,0-.2-0.4,0.84,0.84,0,0,0-.33-0.33,3.89,3.89,0,0,0-.48-0.21,2.63,2.63,0,0,0-.66-0.15,8.72,8.72,0,0,0-.87,0,9.88,9.88,0,0,0-1.46.08,2.18,2.18,0,0,0-.94.38,1.64,1.64,0,0,0-.59.82,6.13,6.13,0,0,0-.26,1.44l-1.66-.39a2.86,2.86,0,0,1,0-.3,3.11,3.11,0,0,1,1.2-2.75,6.24,6.24,0,0,1,3.56-.83,14.77,14.77,0,0,1,1.58.07,6.19,6.19,0,0,1,1.24.26,2.76,2.76,0,0,1,1,.52,2.94,2.94,0,0,1,.66.84,3.94,3.94,0,0,1,.39,1.22,10.37,10.37,0,0,1,.12,1.66,7.76,7.76,0,0,1-.37,2.59,4.43,4.43,0,0,1-1.07,1.72,8.75,8.75,0,0,1-1.92,1.33l-0.77.44-0.73.41-0.64.38a6.44,6.44,0,0,0-.59.39l-0.49.4a2.73,2.73,0,0,0-.44.45q-0.15.21-.33,0.5a2.52,2.52,0,0,0-.27.59,5.38,5.38,0,0,0-.15.67,5.78,5.78,0,0,0-.07.78h7.64V77Z"/><path class="cls-1" d="M243.25,129.08a7.47,7.47,0,0,1-.25,2,4,4,0,0,1-.68,1.41,3,3,0,0,1-1.15.87,5.93,5.93,0,0,1-1.55.44,13.63,13.63,0,0,1-2,.12,13.37,13.37,0,0,1-2-.13,4.65,4.65,0,0,1-1.46-.47,2.15,2.15,0,0,1-1-1,3.58,3.58,0,0,1-.31-1.58q0-.44,0-0.71l1.79-.26c0,0.09,0,.21,0,0.38s0,0.31,0,.44,0,0.26,0,.38a1.25,1.25,0,0,0,.79,1.08,6.44,6.44,0,0,0,2.31.3q0.86,0,1.39,0a2.48,2.48,0,0,0,.92-0.21,2.53,2.53,0,0,0,.57-0.34,1.23,1.23,0,0,0,.28-0.64,4.85,4.85,0,0,0,.12-0.86q0-.37,0-1.27v0a5.86,5.86,0,0,0-.16-1.5,3.28,3.28,0,0,0-.37-0.9,1.29,1.29,0,0,0-.85-0.47,7.34,7.34,0,0,0-1.15-.17q-0.51,0-1.72,0h-0.07l-0.09-1.59h1.8a4.49,4.49,0,0,0,1.23-.18,2.52,2.52,0,0,0,.75-0.36,1.22,1.22,0,0,0,.38-0.73,5.8,5.8,0,0,0,.14-0.92q0-.4,0-1.33v-0.19a4.3,4.3,0,0,0-.1-1.05,1.28,1.28,0,0,0-.44-0.66,2,2,0,0,0-.94-0.38,10.57,10.57,0,0,0-1.65-.1,7,7,0,0,0-2.36.27,1.1,1.1,0,0,0-.71,1l-0.1,1.22-1.73-.34v-0.31a6.3,6.3,0,0,1,.11-1.31,2.54,2.54,0,0,1,.41-0.94,1.92,1.92,0,0,1,.87-0.66,6.33,6.33,0,0,1,1.45-.35,18.42,18.42,0,0,1,2.19-.15,5.94,5.94,0,0,1,3.81,1,3.9,3.9,0,0,1,1.2,3.18,7.4,7.4,0,0,1-.2,1.8,4,4,0,0,1-.45,1.18,2.37,2.37,0,0,1-.62.66,2.45,2.45,0,0,1-.58.33,3.65,3.65,0,0,1-.44.12h-0.08l0.3,0.06a2.43,2.43,0,0,1,.4.15,2.21,2.21,0,0,1,.48.28,3.39,3.39,0,0,1,.46.46,2.74,2.74,0,0,1,.43.69,4.85,4.85,0,0,1,.29,1A7.25,7.25,0,0,1,243.25,129.08Z"/><path class="cls-1" d="M228.34,186.08h-1.56v4.37h-2.07v-4.36h-7v-1.68l5.8-10.57h3.24v10.77h1.56v1.47ZM224.71,175l-0.57,1.15-0.52,1L221,182.46l-0.55,1.09-0.54,1.06h4.81V175Z"/><path class="cls-1" d="M187.18,226.8a13.7,13.7,0,0,1-.12,1.94,5,5,0,0,1-.4,1.42,2.76,2.76,0,0,1-1.77,1.57,6.63,6.63,0,0,1-1.46.31,18.57,18.57,0,0,1-1.91.08q-0.67,0-1.19,0t-1.05-.12a4.26,4.26,0,0,1-.92-0.25,3.71,3.71,0,0,1-.73-0.41,2,2,0,0,1-.57-0.61,3.15,3.15,0,0,1-.34-0.86,4.77,4.77,0,0,1-.12-1.14c0-.07,0-0.19,0-0.35s0-.29,0-0.38l1.69-.24q0.06,0.66.11,1a3.49,3.49,0,0,0,.19.71,1.17,1.17,0,0,0,.32.5,1.83,1.83,0,0,0,.55.28,3.24,3.24,0,0,0,.83.16q0.47,0,1.21,0a8.56,8.56,0,0,0,1.64-.13,3.74,3.74,0,0,0,1.07-.35,1.54,1.54,0,0,0,.6-0.59,2.37,2.37,0,0,0,.28-0.76,5.52,5.52,0,0,0,.07-0.94q0-.23,0-0.78t0-.85q0-.58,0-0.89a6.06,6.06,0,0,0-.06-0.68,2,2,0,0,0-.13-0.55,1.84,1.84,0,0,0-.25-0.38,0.88,0.88,0,0,0-.4-0.29,6.11,6.11,0,0,0-.6-0.16,4.46,4.46,0,0,0-.82-0.1l-1.09,0H181c-0.2,0-.43,0-0.67.06a1.93,1.93,0,0,0-.59.16,2.54,2.54,0,0,0-.45.3,1.31,1.31,0,0,0-.36.47,2.68,2.68,0,0,0-.2.69l-2-.15v-9.21h9.44V217H179l-0.36,6.38a5.87,5.87,0,0,1,.32-0.68,3.12,3.12,0,0,1,.43-0.57,2.14,2.14,0,0,1,.64-0.48,3.89,3.89,0,0,1,.93-0.29,6.89,6.89,0,0,1,1.31-.11,11.37,11.37,0,0,1,1.83.13,4,4,0,0,1,1.33.44,3.14,3.14,0,0,1,.89.72,3,3,0,0,1,.54,1.06,7.39,7.39,0,0,1,.27,1.38Q187.18,225.76,187.18,226.8Z"/><path class="cls-1" d="M130.75,241.65a18.38,18.38,0,0,1-.09,1.95,6.27,6.27,0,0,1-.33,1.47,3.14,3.14,0,0,1-.61,1.06,3,3,0,0,1-1,.68,5,5,0,0,1-1.39.38,14.37,14.37,0,0,1-1.88.11,19.56,19.56,0,0,1-2.35-.12,4.55,4.55,0,0,1-1.63-.49,3.45,3.45,0,0,1-1.06-.85,3.58,3.58,0,0,1-.59-1.42,11.49,11.49,0,0,1-.27-1.95q-0.06-1-.06-2.7,0-3.67.1-4.78a5.86,5.86,0,0,1,1-3.28,4.74,4.74,0,0,1,3.42-1.36q0.54,0,1.15,0c0.5,0,.93,0,1.28,0a10.78,10.78,0,0,1,1.1.12,3.68,3.68,0,0,1,1,.26,2.91,2.91,0,0,1,.7.45,1.62,1.62,0,0,1,.47.7,3,3,0,0,1,.15,1q0,0.21-.09,1.11-1,.1-1.79.24c0-.34,0-0.58,0-0.74a5.29,5.29,0,0,0,0-.55,1.58,1.58,0,0,0-.09-0.43,1.34,1.34,0,0,0-.21-0.29,0.63,0.63,0,0,0-.31-0.21l-0.48-.1a4.13,4.13,0,0,0-.65-0.06h-0.87a6.79,6.79,0,0,0-2.73.45,1.75,1.75,0,0,0-.82,1.53q-0.11,2.51-.16,4.54a3.62,3.62,0,0,1,.77-1,3.3,3.3,0,0,1,1.19-.63,5.87,5.87,0,0,1,1.78-.24c0.53,0,1,0,1.39,0a9.2,9.2,0,0,1,1.14.15,4.13,4.13,0,0,1,.94.29,3.33,3.33,0,0,1,.72.46,2.29,2.29,0,0,1,.54.66,4.64,4.64,0,0,1,.36.91,6.11,6.11,0,0,1,.22,1.18C130.72,240.61,130.75,241.1,130.75,241.65Zm-2,1.74q0-3.13,0-3.47a1.42,1.42,0,0,0-.77-1.33,7.52,7.52,0,0,0-2.72-.36,13.41,13.41,0,0,0-1.51.07,2.95,2.95,0,0,0-1.64.67,1.14,1.14,0,0,0-.32.62,4.77,4.77,0,0,0-.12.73q0,0.31,0,.94,0,0.35,0,.92c0,0.38,0,.65,0,0.81a6.72,6.72,0,0,0,.06,1,2.41,2.41,0,0,0,.26.76,1.33,1.33,0,0,0,.59.57,3.94,3.94,0,0,0,1.06.31,9.68,9.68,0,0,0,1.64.12q0.72,0,1.24,0a9,9,0,0,0,.91-0.12,1.84,1.84,0,0,0,.63-0.23,2.06,2.06,0,0,0,.4-0.31,1,1,0,0,0,.22-0.44,3.29,3.29,0,0,0,.1-0.54C128.71,243.9,128.71,243.67,128.71,243.39Z"/><path class="cls-1" d="M72.3,214.38v1.91q-3.37,8.73-5,14.7H65.23q2.07-7.06,5.18-14.9H64v-1.7H72.3Z"/><path class="cls-1" d="M27.08,190.67h0a16.53,16.53,0,0,1-2.1-.11,6.11,6.11,0,0,1-1.54-.4,2.54,2.54,0,0,1-1.08-.8,3.61,3.61,0,0,1-.59-1.28,7.55,7.55,0,0,1-.2-1.88,6.76,6.76,0,0,1,.51-2.91,4.45,4.45,0,0,1,1.53-1.74q-1.22-.9-1.22-3.74a4.1,4.1,0,0,1,1.09-3.27,5.56,5.56,0,0,1,3.58-.92,5.56,5.56,0,0,1,3.58.92,4.1,4.1,0,0,1,1.09,3.27q0,2.85-1.22,3.74a4.45,4.45,0,0,1,1.53,1.74,6.76,6.76,0,0,1,.51,2.91,7.57,7.57,0,0,1-.2,1.88,3.61,3.61,0,0,1-.59,1.28,2.54,2.54,0,0,1-1.08.8,6.11,6.11,0,0,1-1.54.4A16.53,16.53,0,0,1,27.08,190.67Zm0-8.15h-1l-0.81.05a1.88,1.88,0,0,0-.66.14l-0.44.26a0.78,0.78,0,0,0-.33.44,5.7,5.7,0,0,0-.15.64,5.1,5.1,0,0,0-.07.9q0,0.38,0,1t0,0.91a3.52,3.52,0,0,0,.07.75,1.64,1.64,0,0,0,.27.59,1.35,1.35,0,0,0,.59.45,4.43,4.43,0,0,0,1,.26,12.19,12.19,0,0,0,3.13,0,4.43,4.43,0,0,0,1-.26,1.35,1.35,0,0,0,.59-0.45,1.64,1.64,0,0,0,.27-0.59,3.52,3.52,0,0,0,.07-0.75q0-.27,0-0.91t0-1a5.1,5.1,0,0,0-.07-0.9,5.6,5.6,0,0,0-.15-0.64A0.78,0.78,0,0,0,30,183l-0.44-.26a1.89,1.89,0,0,0-.66-0.14l-0.81-.05h-1Zm0-7.25H26.22a4.57,4.57,0,0,0-.67.07,4.18,4.18,0,0,0-.5.11,0.81,0.81,0,0,0-.33.21,1,1,0,0,0-.22.3,1.84,1.84,0,0,0-.12.44,3.76,3.76,0,0,0-.06.56c0,0.18,0,.43,0,0.74q0,2.66.86,3.21H29q0.86-.55.86-3.21c0-.31,0-0.56,0-0.74a3.76,3.76,0,0,0-.06-0.56A1.84,1.84,0,0,0,29.7,176a1.05,1.05,0,0,0-.22-0.3,0.81,0.81,0,0,0-.33-0.21,4.22,4.22,0,0,0-.5-0.11,4.57,4.57,0,0,0-.67-0.07H27.08Z"/><path class="cls-1" d="M17.14,124.39q0,3.88-.1,5a5.65,5.65,0,0,1-1,3.11,4.21,4.21,0,0,1-3,1.24,14.62,14.62,0,0,1-1.49.07h-1.1q-0.44,0-1-.06a7.1,7.1,0,0,1-1-.14,4.78,4.78,0,0,1-.8-0.26,1.8,1.8,0,0,1-1-1,2.1,2.1,0,0,1-.16-0.83,7.59,7.59,0,0,1,.1-1.23q0.91-.1,1.78-0.24,0,0.44,0,.66a4.19,4.19,0,0,0,.05.52,1.39,1.39,0,0,0,.12.43,1.53,1.53,0,0,0,.23.3,0.8,0.8,0,0,0,.37.23l0.55,0.13a4.56,4.56,0,0,0,.76.09l1,0a14.51,14.51,0,0,0,1.64-.11,2.63,2.63,0,0,0,1-.31,1.19,1.19,0,0,0,.53-0.58,3.81,3.81,0,0,0,.21-1q0.11-2.58.16-4.67a3.77,3.77,0,0,1-3.64,1.86,17.84,17.84,0,0,1-1.81-.08,6.66,6.66,0,0,1-1.38-.29,2.88,2.88,0,0,1-1-.55,2.85,2.85,0,0,1-.67-0.92,4.63,4.63,0,0,1-.39-1.34A13.11,13.11,0,0,1,6,122.59a17.11,17.11,0,0,1,.1-2,6.07,6.07,0,0,1,.35-1.48,3.21,3.21,0,0,1,.63-1,2.82,2.82,0,0,1,1-.66A5.44,5.44,0,0,1,9.46,117a14,14,0,0,1,1.82-.1,18.67,18.67,0,0,1,2.31.12,4.43,4.43,0,0,1,1.6.49,3.42,3.42,0,0,1,1,.85,3.58,3.58,0,0,1,.58,1.41,11.65,11.65,0,0,1,.27,1.93Q17.14,122.73,17.14,124.39Zm-2.07-2.68q0-.75,0-1.09a5,5,0,0,0-.12-0.81,1.16,1.16,0,0,0-.31-0.64,3.09,3.09,0,0,0-.6-0.38,2.7,2.7,0,0,0-1-.26q-0.59-.06-1.48-0.06a9.51,9.51,0,0,0-2.21.19,1.69,1.69,0,0,0-1,.55,2.07,2.07,0,0,0-.29,1.09q0,1.68,0,2.54t0,1.09a3.76,3.76,0,0,0,.13.78,1,1,0,0,0,.32.58,3,3,0,0,0,.62.33,3.13,3.13,0,0,0,1,.22q0.58,0,1.47.06a6.1,6.1,0,0,0,2.64-.41,1.59,1.59,0,0,0,.83-1.43Q15.07,123.29,15.07,121.71Z"/><path class="cls-1" d="M25.11,77.14H23V63.2H20.94v-1a2.51,2.51,0,0,0,2.43-1.64h1.74V77.14Z"/><path class="cls-1" d="M34.06,77.32a14,14,0,0,1-1.84-.11,3.9,3.9,0,0,1-1.38-.43,9.06,9.06,0,0,1-1-.63,2.16,2.16,0,0,1-.67-1Q28.9,74.5,28.75,74a7.78,7.78,0,0,1-.22-1.56q-0.07-1-.08-1.8t0-2.17q0-.94,0-1.63t0.07-1.42a12.12,12.12,0,0,1,.15-1.25,10.09,10.09,0,0,1,.25-1.05,3.46,3.46,0,0,1,.39-0.89,5.11,5.11,0,0,1,.54-0.7,2.56,2.56,0,0,1,.72-0.55,6.29,6.29,0,0,1,.92-0.37,5.62,5.62,0,0,1,1.15-.24,13.53,13.53,0,0,1,1.41-.07,10.69,10.69,0,0,1,1.87.15,5.9,5.9,0,0,1,1.41.42,2.93,2.93,0,0,1,1,.76,4.63,4.63,0,0,1,.68,1,5.47,5.47,0,0,1,.41,1.4,15.35,15.35,0,0,1,.2,1.73q0.05,0.88.05,2.1,0,3.66-.13,4.91A5.61,5.61,0,0,1,38.37,76a5.32,5.32,0,0,1-3.82,1.27H34.06Zm0-15.38a5.24,5.24,0,0,0-2.53.48,1.74,1.74,0,0,0-.89,1.52q0,0.71-.07,1.51t0,1.83q0,1,0,1.57,0,3,.12,4.92a1.58,1.58,0,0,0,.87,1.39,5.66,5.66,0,0,0,2.55.44,5.66,5.66,0,0,0,2.55-.44,1.58,1.58,0,0,0,.87-1.39q0.12-1.93.12-4.92,0-.54-0.05-2.27t-0.08-2.64a1.76,1.76,0,0,0-.9-1.52A5.21,5.21,0,0,0,34.06,61.94Z"/><path class="cls-1" d="M68.4,35.64h-2.1V21.7H64.23v-1A2.51,2.51,0,0,0,66.67,19H68.4V35.64Z"/><path class="cls-1" d="M74.95,35.64h-2.1V21.7H70.78v-1A2.51,2.51,0,0,0,73.21,19h1.74V35.64Z"/></svg>
diff --git a/modules/default/clock/faces/face-011.svg b/modules/default/clock/faces/face-011.svg
index 2d5f27ba..9886fed5 100644
--- a/modules/default/clock/faces/face-011.svg
+++ b/modules/default/clock/faces/face-011.svg
@@ -1 +1 @@
-<svg id="Dots_Small_Larger" data-name="Dots Small Larger" xmlns="https://www.w3.org/2000/svg" viewBox="0 0 250 250"><defs><style>.cls-1{fill:#fff;}</style></defs><title>face-011</title><circle class="cls-1" cx="136.81" cy="13.62" r="1.2" transform="translate(108.97 148.25) rotate(-84)"/><circle class="cls-1" cx="148.39" cy="15.46" r="1.2" transform="translate(102.41 157.39) rotate(-78)"/><circle class="cls-1" cx="159.71" cy="18.51" r="1.2" transform="translate(92.76 164.68) rotate(-72)"/><circle class="cls-1" cx="170.65" cy="22.72" r="1.2" transform="translate(80.49 169.37) rotate(-66)"/><circle class="cls-1" cx="181.09" cy="28.05" r="1.2" transform="translate(66.25 170.85) rotate(-60)"/><circle class="cls-1" cx="190.92" cy="34.44" r="1.2" transform="translate(50.83 168.65) rotate(-54)"/><circle class="cls-1" cx="200.02" cy="41.83" r="1.2" transform="translate(35.1 162.49) rotate(-48)"/><circle class="cls-1" cx="208.3" cy="50.13" r="1.2" transform="translate(19.96 152.26) rotate(-42)"/><circle class="cls-1" cx="215.67" cy="59.24" r="1.2" transform="translate(6.37 138.09) rotate(-36)"/><circle class="cls-1" cx="222.05" cy="69.08" r="1.2" transform="translate(-4.79 120.28) rotate(-30)"/><circle class="cls-1" cx="227.36" cy="79.53" r="1.2" transform="translate(-12.69 99.35) rotate(-24)"/><circle class="cls-1" cx="231.56" cy="90.48" r="1.2" transform="translate(-16.63 75.98) rotate(-18)"/><circle class="cls-1" cx="234.58" cy="101.81" r="1.2" transform="translate(-16.04 51) rotate(-12)"/><circle class="cls-1" cx="236.4" cy="113.39" r="1.2" transform="translate(-10.56 25.33) rotate(-6)"/><circle class="cls-1" cx="237.01" cy="125.1" r="1.2"/><circle class="cls-1" cx="236.38" cy="136.81" r="1.2" transform="translate(75.62 357.6) rotate(-84)"/><circle class="cls-1" cx="234.54" cy="148.39" r="1.2" transform="translate(40.63 346.95) rotate(-78)"/><circle class="cls-1" cx="231.49" cy="159.71" r="1.2" transform="translate(8.07 330.52) rotate(-72)"/><circle class="cls-1" cx="227.28" cy="170.65" r="1.2" transform="translate(-21.06 308.87) rotate(-66)"/><circle class="cls-1" cx="221.95" cy="181.09" r="1.2" transform="translate(-45.85 282.76) rotate(-60)"/><circle class="cls-1" cx="215.56" cy="190.92" r="1.2" transform="translate(-65.6 253.09) rotate(-54)"/><circle class="cls-1" cx="208.17" cy="200.02" r="1.2" transform="translate(-79.77 220.88) rotate(-48)"/><circle class="cls-1" cx="199.87" cy="208.3" r="1.2" transform="translate(-88.04 187.25) rotate(-42)"/><circle class="cls-1" cx="190.76" cy="215.67" r="1.2" transform="translate(-90.34 153.31) rotate(-36)"/><circle class="cls-1" cx="180.92" cy="222.05" r="1.2" transform="translate(-86.79 120.21) rotate(-30)"/><circle class="cls-1" cx="170.47" cy="227.36" r="1.2" transform="translate(-77.74 88.99) rotate(-24)"/><circle class="cls-1" cx="159.52" cy="231.56" r="1.2" transform="translate(-63.75 60.63) rotate(-18)"/><circle class="cls-1" cx="148.19" cy="234.58" r="1.2" transform="translate(-45.53 35.94) rotate(-12)"/><circle class="cls-1" cx="136.61" cy="236.4" r="1.2" transform="translate(-23.96 15.57) rotate(-6)"/><circle class="cls-1" cx="124.9" cy="237.01" r="1.2"/><circle class="cls-1" cx="113.19" cy="236.38" r="1.2" transform="translate(-133.73 324.25) rotate(-84)"/><circle class="cls-1" cx="101.61" cy="234.54" r="1.2" transform="translate(-148.93 285.17) rotate(-78)"/><circle class="cls-1" cx="90.29" cy="231.49" r="1.2" transform="translate(-157.77 245.83) rotate(-72)"/><circle class="cls-1" cx="79.35" cy="227.28" r="1.2" transform="matrix(0.41, -0.91, 0.91, 0.41, -160.56, 207.33)"/><circle class="cls-1" cx="68.91" cy="221.95" r="1.2" transform="translate(-157.76 170.65) rotate(-60)"/><circle class="cls-1" cx="59.08" cy="215.56" r="1.2" transform="translate(-150.03 136.65) rotate(-54)"/><circle class="cls-1" cx="49.98" cy="208.17" r="1.2" transform="translate(-138.17 106.02) rotate(-48)"/><circle class="cls-1" cx="41.7" cy="199.87" r="1.2" transform="translate(-123.03 79.24) rotate(-42)"/><circle class="cls-1" cx="34.33" cy="190.76" r="1.2" transform="translate(-105.57 56.61) rotate(-36)"/><circle class="cls-1" cx="27.95" cy="180.92" r="1.2" transform="matrix(0.87, -0.5, 0.5, 0.87, -86.71, 38.21)"/><circle class="cls-1" cx="22.64" cy="170.47" r="1.2" transform="translate(-67.38 23.94) rotate(-24)"/><circle class="cls-1" cx="18.44" cy="159.52" r="1.2" transform="translate(-48.39 13.51) rotate(-18)"/><circle class="cls-1" cx="15.42" cy="148.19" r="1.2" transform="translate(-30.47 6.44) rotate(-12)"/><circle class="cls-1" cx="13.6" cy="136.61" r="1.2" transform="translate(-14.21 2.17) rotate(-6)"/><circle class="cls-1" cx="12.99" cy="124.9" r="1.2"/><circle class="cls-1" cx="13.62" cy="113.19" r="1.2" transform="translate(-100.38 114.9) rotate(-84)"/><circle class="cls-1" cx="15.46" cy="101.61" r="1.2" transform="translate(-87.15 95.61) rotate(-78)"/><circle class="cls-1" cx="18.51" cy="90.29" r="1.2" transform="translate(-73.09 79.99) rotate(-72)"/><circle class="cls-1" cx="22.72" cy="79.35" r="1.2" transform="translate(-59.01 67.83) rotate(-66)"/><circle class="cls-1" cx="28.05" cy="68.91" r="1.2" transform="translate(-45.65 58.75) rotate(-60)"/><circle class="cls-1" cx="34.44" cy="59.08" r="1.2" transform="translate(-33.6 52.22) rotate(-54)"/><circle class="cls-1" cx="41.83" cy="49.98" r="1.2" transform="translate(-23.3 47.62) rotate(-48)"/><circle class="cls-1" cx="50.13" cy="41.7" r="1.2" transform="translate(-15.02 44.25) rotate(-42)"/><circle class="cls-1" cx="59.24" cy="34.33" r="1.2" transform="translate(-8.86 41.38) rotate(-36)"/><circle class="cls-1" cx="69.08" cy="27.95" r="1.2" transform="translate(-4.72 38.29) rotate(-30)"/><circle class="cls-1" cx="79.53" cy="22.64" r="1.2" transform="translate(-2.33 34.31) rotate(-24)"/><circle class="cls-1" cx="90.48" cy="18.44" r="1.2" transform="translate(-1.27 28.86) rotate(-18)"/><circle class="cls-1" cx="101.81" cy="15.42" r="1.2" transform="translate(-0.98 21.5) rotate(-12)"/><circle class="cls-1" cx="113.39" cy="13.6" r="1.2" transform="translate(-0.8 11.93) rotate(-6)"/><circle class="cls-1" cx="125.1" cy="12.99" r="1.2"/><circle class="cls-1" cx="181.09" cy="28.05" r="2.99" transform="translate(66.25 170.85) rotate(-60)"/><circle class="cls-1" cx="222.05" cy="69.08" r="2.99" transform="matrix(0.87, -0.5, 0.5, 0.87, -4.79, 120.28)"/><circle class="cls-1" cx="237.01" cy="125.1" r="2.99"/><circle class="cls-1" cx="221.95" cy="181.09" r="2.99" transform="translate(-45.85 282.76) rotate(-60)"/><circle class="cls-1" cx="180.92" cy="222.05" r="2.99" transform="matrix(0.87, -0.5, 0.5, 0.87, -86.79, 120.21)"/><circle class="cls-1" cx="124.9" cy="237.01" r="2.99"/><circle class="cls-1" cx="68.91" cy="221.95" r="2.99" transform="translate(-157.76 170.65) rotate(-60)"/><circle class="cls-1" cx="27.95" cy="180.92" r="2.99" transform="translate(-86.71 38.21) rotate(-30)"/><circle class="cls-1" cx="12.99" cy="124.9" r="2.99"/><circle class="cls-1" cx="28.05" cy="68.91" r="2.99" transform="translate(-45.65 58.75) rotate(-60)"/><circle class="cls-1" cx="69.08" cy="27.95" r="2.99" transform="translate(-4.72 38.29) rotate(-30)"/><circle class="cls-1" cx="125.1" cy="12.99" r="2.99"/><path class="cls-1" d="M125,1.5a123.5,123.5,0,0,1,87.33,210.83A123.5,123.5,0,0,1,37.67,37.67,122.7,122.7,0,0,1,125,1.5m0-1A124.5,124.5,0,1,0,249.5,125,124.5,124.5,0,0,0,125,.5h0Z"/></svg>
+<svg id="Dots_Small_Larger" data-name="Dots Small Larger" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 250 250"><defs><style>.cls-1{fill:#fff;}</style></defs><title>face-011</title><circle class="cls-1" cx="136.81" cy="13.62" r="1.2" transform="translate(108.97 148.25) rotate(-84)"/><circle class="cls-1" cx="148.39" cy="15.46" r="1.2" transform="translate(102.41 157.39) rotate(-78)"/><circle class="cls-1" cx="159.71" cy="18.51" r="1.2" transform="translate(92.76 164.68) rotate(-72)"/><circle class="cls-1" cx="170.65" cy="22.72" r="1.2" transform="translate(80.49 169.37) rotate(-66)"/><circle class="cls-1" cx="181.09" cy="28.05" r="1.2" transform="translate(66.25 170.85) rotate(-60)"/><circle class="cls-1" cx="190.92" cy="34.44" r="1.2" transform="translate(50.83 168.65) rotate(-54)"/><circle class="cls-1" cx="200.02" cy="41.83" r="1.2" transform="translate(35.1 162.49) rotate(-48)"/><circle class="cls-1" cx="208.3" cy="50.13" r="1.2" transform="translate(19.96 152.26) rotate(-42)"/><circle class="cls-1" cx="215.67" cy="59.24" r="1.2" transform="translate(6.37 138.09) rotate(-36)"/><circle class="cls-1" cx="222.05" cy="69.08" r="1.2" transform="translate(-4.79 120.28) rotate(-30)"/><circle class="cls-1" cx="227.36" cy="79.53" r="1.2" transform="translate(-12.69 99.35) rotate(-24)"/><circle class="cls-1" cx="231.56" cy="90.48" r="1.2" transform="translate(-16.63 75.98) rotate(-18)"/><circle class="cls-1" cx="234.58" cy="101.81" r="1.2" transform="translate(-16.04 51) rotate(-12)"/><circle class="cls-1" cx="236.4" cy="113.39" r="1.2" transform="translate(-10.56 25.33) rotate(-6)"/><circle class="cls-1" cx="237.01" cy="125.1" r="1.2"/><circle class="cls-1" cx="236.38" cy="136.81" r="1.2" transform="translate(75.62 357.6) rotate(-84)"/><circle class="cls-1" cx="234.54" cy="148.39" r="1.2" transform="translate(40.63 346.95) rotate(-78)"/><circle class="cls-1" cx="231.49" cy="159.71" r="1.2" transform="translate(8.07 330.52) rotate(-72)"/><circle class="cls-1" cx="227.28" cy="170.65" r="1.2" transform="translate(-21.06 308.87) rotate(-66)"/><circle class="cls-1" cx="221.95" cy="181.09" r="1.2" transform="translate(-45.85 282.76) rotate(-60)"/><circle class="cls-1" cx="215.56" cy="190.92" r="1.2" transform="translate(-65.6 253.09) rotate(-54)"/><circle class="cls-1" cx="208.17" cy="200.02" r="1.2" transform="translate(-79.77 220.88) rotate(-48)"/><circle class="cls-1" cx="199.87" cy="208.3" r="1.2" transform="translate(-88.04 187.25) rotate(-42)"/><circle class="cls-1" cx="190.76" cy="215.67" r="1.2" transform="translate(-90.34 153.31) rotate(-36)"/><circle class="cls-1" cx="180.92" cy="222.05" r="1.2" transform="translate(-86.79 120.21) rotate(-30)"/><circle class="cls-1" cx="170.47" cy="227.36" r="1.2" transform="translate(-77.74 88.99) rotate(-24)"/><circle class="cls-1" cx="159.52" cy="231.56" r="1.2" transform="translate(-63.75 60.63) rotate(-18)"/><circle class="cls-1" cx="148.19" cy="234.58" r="1.2" transform="translate(-45.53 35.94) rotate(-12)"/><circle class="cls-1" cx="136.61" cy="236.4" r="1.2" transform="translate(-23.96 15.57) rotate(-6)"/><circle class="cls-1" cx="124.9" cy="237.01" r="1.2"/><circle class="cls-1" cx="113.19" cy="236.38" r="1.2" transform="translate(-133.73 324.25) rotate(-84)"/><circle class="cls-1" cx="101.61" cy="234.54" r="1.2" transform="translate(-148.93 285.17) rotate(-78)"/><circle class="cls-1" cx="90.29" cy="231.49" r="1.2" transform="translate(-157.77 245.83) rotate(-72)"/><circle class="cls-1" cx="79.35" cy="227.28" r="1.2" transform="matrix(0.41, -0.91, 0.91, 0.41, -160.56, 207.33)"/><circle class="cls-1" cx="68.91" cy="221.95" r="1.2" transform="translate(-157.76 170.65) rotate(-60)"/><circle class="cls-1" cx="59.08" cy="215.56" r="1.2" transform="translate(-150.03 136.65) rotate(-54)"/><circle class="cls-1" cx="49.98" cy="208.17" r="1.2" transform="translate(-138.17 106.02) rotate(-48)"/><circle class="cls-1" cx="41.7" cy="199.87" r="1.2" transform="translate(-123.03 79.24) rotate(-42)"/><circle class="cls-1" cx="34.33" cy="190.76" r="1.2" transform="translate(-105.57 56.61) rotate(-36)"/><circle class="cls-1" cx="27.95" cy="180.92" r="1.2" transform="matrix(0.87, -0.5, 0.5, 0.87, -86.71, 38.21)"/><circle class="cls-1" cx="22.64" cy="170.47" r="1.2" transform="translate(-67.38 23.94) rotate(-24)"/><circle class="cls-1" cx="18.44" cy="159.52" r="1.2" transform="translate(-48.39 13.51) rotate(-18)"/><circle class="cls-1" cx="15.42" cy="148.19" r="1.2" transform="translate(-30.47 6.44) rotate(-12)"/><circle class="cls-1" cx="13.6" cy="136.61" r="1.2" transform="translate(-14.21 2.17) rotate(-6)"/><circle class="cls-1" cx="12.99" cy="124.9" r="1.2"/><circle class="cls-1" cx="13.62" cy="113.19" r="1.2" transform="translate(-100.38 114.9) rotate(-84)"/><circle class="cls-1" cx="15.46" cy="101.61" r="1.2" transform="translate(-87.15 95.61) rotate(-78)"/><circle class="cls-1" cx="18.51" cy="90.29" r="1.2" transform="translate(-73.09 79.99) rotate(-72)"/><circle class="cls-1" cx="22.72" cy="79.35" r="1.2" transform="translate(-59.01 67.83) rotate(-66)"/><circle class="cls-1" cx="28.05" cy="68.91" r="1.2" transform="translate(-45.65 58.75) rotate(-60)"/><circle class="cls-1" cx="34.44" cy="59.08" r="1.2" transform="translate(-33.6 52.22) rotate(-54)"/><circle class="cls-1" cx="41.83" cy="49.98" r="1.2" transform="translate(-23.3 47.62) rotate(-48)"/><circle class="cls-1" cx="50.13" cy="41.7" r="1.2" transform="translate(-15.02 44.25) rotate(-42)"/><circle class="cls-1" cx="59.24" cy="34.33" r="1.2" transform="translate(-8.86 41.38) rotate(-36)"/><circle class="cls-1" cx="69.08" cy="27.95" r="1.2" transform="translate(-4.72 38.29) rotate(-30)"/><circle class="cls-1" cx="79.53" cy="22.64" r="1.2" transform="translate(-2.33 34.31) rotate(-24)"/><circle class="cls-1" cx="90.48" cy="18.44" r="1.2" transform="translate(-1.27 28.86) rotate(-18)"/><circle class="cls-1" cx="101.81" cy="15.42" r="1.2" transform="translate(-0.98 21.5) rotate(-12)"/><circle class="cls-1" cx="113.39" cy="13.6" r="1.2" transform="translate(-0.8 11.93) rotate(-6)"/><circle class="cls-1" cx="125.1" cy="12.99" r="1.2"/><circle class="cls-1" cx="181.09" cy="28.05" r="2.99" transform="translate(66.25 170.85) rotate(-60)"/><circle class="cls-1" cx="222.05" cy="69.08" r="2.99" transform="matrix(0.87, -0.5, 0.5, 0.87, -4.79, 120.28)"/><circle class="cls-1" cx="237.01" cy="125.1" r="2.99"/><circle class="cls-1" cx="221.95" cy="181.09" r="2.99" transform="translate(-45.85 282.76) rotate(-60)"/><circle class="cls-1" cx="180.92" cy="222.05" r="2.99" transform="matrix(0.87, -0.5, 0.5, 0.87, -86.79, 120.21)"/><circle class="cls-1" cx="124.9" cy="237.01" r="2.99"/><circle class="cls-1" cx="68.91" cy="221.95" r="2.99" transform="translate(-157.76 170.65) rotate(-60)"/><circle class="cls-1" cx="27.95" cy="180.92" r="2.99" transform="translate(-86.71 38.21) rotate(-30)"/><circle class="cls-1" cx="12.99" cy="124.9" r="2.99"/><circle class="cls-1" cx="28.05" cy="68.91" r="2.99" transform="translate(-45.65 58.75) rotate(-60)"/><circle class="cls-1" cx="69.08" cy="27.95" r="2.99" transform="translate(-4.72 38.29) rotate(-30)"/><circle class="cls-1" cx="125.1" cy="12.99" r="2.99"/><path class="cls-1" d="M125,1.5a123.5,123.5,0,0,1,87.33,210.83A123.5,123.5,0,0,1,37.67,37.67,122.7,122.7,0,0,1,125,1.5m0-1A124.5,124.5,0,1,0,249.5,125,124.5,124.5,0,0,0,125,.5h0Z"/></svg>
diff --git a/modules/default/clock/faces/face-012.svg b/modules/default/clock/faces/face-012.svg
index 8096d492..cfd80698 100644
--- a/modules/default/clock/faces/face-012.svg
+++ b/modules/default/clock/faces/face-012.svg
@@ -1 +1 @@
-<svg id="Dots_Small_Larger" data-name="Dots Small Larger" xmlns="https://www.w3.org/2000/svg" viewBox="0 0 250 250"><defs><style>.cls-1{fill:#fff;}</style></defs><title>face-012</title><circle class="cls-1" cx="135.52" cy="25.72" r="1.07" transform="translate(95.78 157.82) rotate(-84)"/><circle class="cls-1" cx="145.84" cy="27.37" r="1.07" transform="translate(88.75 164.33) rotate(-78)"/><circle class="cls-1" cx="155.93" cy="30.08" r="1.07" transform="translate(79.14 169.09) rotate(-72)"/><circle class="cls-1" cx="165.69" cy="33.83" r="1.07" transform="translate(67.39 171.44) rotate(-66)"/><circle class="cls-1" cx="174.99" cy="38.59" r="1.07" transform="translate(54.08 170.84) rotate(-60)"/><circle class="cls-1" cx="183.75" cy="44.29" r="1.07" transform="translate(39.92 166.91) rotate(-54)"/><circle class="cls-1" cx="191.87" cy="50.87" r="1.07" transform="translate(25.68 159.42) rotate(-48)"/><circle class="cls-1" cx="199.25" cy="58.26" r="1.07" transform="translate(12.19 148.29) rotate(-42)"/><circle class="cls-1" cx="205.82" cy="66.39" r="1.07" transform="translate(0.28 133.66) rotate(-36)"/><circle class="cls-1" cx="211.5" cy="75.16" r="1.07" transform="matrix(0.87, -0.5, 0.5, 0.87, -9.24, 115.82)"/><circle class="cls-1" cx="216.24" cy="84.48" r="1.07" transform="translate(-15.66 95.26) rotate(-24)"/><circle class="cls-1" cx="219.97" cy="94.23" r="1.07" transform="translate(-18.35 72.59) rotate(-18)"/><circle class="cls-1" cx="222.67" cy="104.33" r="1.07" transform="translate(-16.83 48.58) rotate(-12)"/><circle class="cls-1" cx="224.3" cy="114.65" r="1.07" transform="translate(-10.76 24.07) rotate(-6)"/><circle class="cls-1" cx="224.83" cy="125.09" r="1.07"/><circle class="cls-1" cx="224.28" cy="135.52" r="1.07" transform="translate(66.05 344.41) rotate(-84)"/><circle class="cls-1" cx="222.63" cy="145.84" r="1.07" transform="translate(33.69 333.29) rotate(-78)"/><circle class="cls-1" cx="219.92" cy="155.93" r="1.07" transform="translate(3.66 316.9) rotate(-72)"/><circle class="cls-1" cx="216.17" cy="165.69" r="1.07" transform="translate(-23.12 295.77) rotate(-66)"/><circle class="cls-1" cx="211.41" cy="174.99" r="1.07" transform="translate(-45.84 270.59) rotate(-60)"/><circle class="cls-1" cx="205.71" cy="183.75" r="1.07" transform="translate(-63.86 242.17) rotate(-54)"/><circle class="cls-1" cx="199.13" cy="191.87" r="1.07" transform="translate(-76.7 211.47) rotate(-48)"/><circle class="cls-1" cx="191.74" cy="199.25" r="1.07" transform="translate(-84.08 179.47) rotate(-42)"/><circle class="cls-1" cx="183.61" cy="205.82" r="1.07" transform="translate(-85.91 147.23) rotate(-36)"/><circle class="cls-1" cx="174.84" cy="211.5" r="1.07" transform="translate(-82.33 115.76) rotate(-30)"/><circle class="cls-1" cx="165.52" cy="216.24" r="1.07" transform="translate(-73.64 86.02) rotate(-24)"/><circle class="cls-1" cx="155.77" cy="219.97" r="1.07" transform="matrix(0.95, -0.31, 0.31, 0.95, -60.35, 58.9)"/><circle class="cls-1" cx="145.67" cy="222.67" r="1.07" transform="translate(-43.11 35.15) rotate(-12)"/><circle class="cls-1" cx="135.35" cy="224.3" r="1.07" transform="translate(-22.7 15.38) rotate(-6)"/><circle class="cls-1" cx="124.91" cy="224.83" r="1.07"/><circle class="cls-1" cx="114.48" cy="224.28" r="1.07" transform="translate(-120.54 314.68) rotate(-84)"/><circle class="cls-1" cx="104.16" cy="222.63" r="1.07" transform="translate(-135.27 278.23) rotate(-78)"/><circle class="cls-1" cx="94.07" cy="219.92" r="1.07" transform="translate(-144.16 241.42) rotate(-72)"/><circle class="cls-1" cx="84.31" cy="216.17" r="1.07" transform="translate(-147.46 205.27) rotate(-66)"/><circle class="cls-1" cx="75.01" cy="211.41" r="1.07" transform="translate(-145.59 170.66) rotate(-60)"/><circle class="cls-1" cx="66.25" cy="205.71" r="1.07" transform="matrix(0.59, -0.81, 0.81, 0.59, -139.12, 138.39)"/><circle class="cls-1" cx="58.13" cy="199.13" r="1.07" transform="translate(-128.75 109.09) rotate(-48)"/><circle class="cls-1" cx="50.75" cy="191.74" r="1.07" transform="translate(-115.26 83.21) rotate(-42)"/><circle class="cls-1" cx="44.18" cy="183.61" r="1.07" transform="translate(-99.48 61.04) rotate(-36)"/><circle class="cls-1" cx="38.5" cy="174.84" r="1.07" transform="translate(-82.26 42.67) rotate(-30)"/><circle class="cls-1" cx="33.76" cy="165.52" r="1.07" transform="translate(-64.41 28.04) rotate(-24)"/><circle class="cls-1" cx="30.03" cy="155.77" r="1.07" transform="matrix(0.95, -0.31, 0.31, 0.95, -46.66, 16.9)"/><circle class="cls-1" cx="27.33" cy="145.67" r="1.07" transform="translate(-29.69 8.87) rotate(-12)"/><circle class="cls-1" cx="25.7" cy="135.35" r="1.07" transform="translate(-14.01 3.43) rotate(-6)"/><circle class="cls-1" cx="25.17" cy="124.91" r="1.07"/><circle class="cls-1" cx="25.72" cy="114.48" r="1.07" transform="translate(-90.81 128.09) rotate(-84)"/><circle class="cls-1" cx="27.37" cy="104.16" r="1.07" transform="translate(-80.2 109.27) rotate(-78)"/><circle class="cls-1" cx="30.08" cy="94.07" r="1.07" transform="translate(-68.68 93.61) rotate(-72)"/><circle class="cls-1" cx="33.83" cy="84.31" r="1.07" transform="translate(-56.95 80.93) rotate(-66)"/><circle class="cls-1" cx="38.59" cy="75.01" r="1.07" transform="translate(-45.66 70.92) rotate(-60)"/><circle class="cls-1" cx="44.29" cy="66.25" r="1.07" transform="translate(-35.34 63.14) rotate(-54)"/><circle class="cls-1" cx="50.87" cy="58.13" r="1.07" transform="translate(-26.37 57.04) rotate(-48)"/><circle class="cls-1" cx="58.26" cy="50.75" r="1.07" transform="translate(-18.99 52.02) rotate(-42)"/><circle class="cls-1" cx="66.39" cy="44.18" r="1.07" transform="translate(-13.29 47.46) rotate(-36)"/><circle class="cls-1" cx="75.16" cy="38.5" r="1.07" transform="translate(-9.18 42.74) rotate(-30)"/><circle class="cls-1" cx="84.48" cy="33.76" r="1.07" transform="translate(-6.43 37.28) rotate(-24)"/><circle class="cls-1" cx="94.23" cy="30.03" r="1.07" transform="translate(-4.67 30.59) rotate(-18)"/><circle class="cls-1" cx="104.33" cy="27.33" r="1.07" transform="translate(-3.4 22.29) rotate(-12)"/><circle class="cls-1" cx="114.65" cy="25.7" r="1.07" transform="translate(-2.06 12.13) rotate(-6)"/><circle class="cls-1" cx="125.09" cy="25.17" r="1.07"/><circle class="cls-1" cx="174.99" cy="38.59" r="2.67" transform="translate(54.08 170.84) rotate(-60)"/><circle class="cls-1" cx="211.5" cy="75.16" r="2.67" transform="matrix(0.87, -0.5, 0.5, 0.87, -9.24, 115.82)"/><circle class="cls-1" cx="224.83" cy="125.09" r="2.67"/><circle class="cls-1" cx="211.41" cy="174.99" r="2.67" transform="translate(-45.84 270.59) rotate(-60)"/><circle class="cls-1" cx="174.84" cy="211.5" r="2.67" transform="matrix(0.87, -0.5, 0.5, 0.87, -82.33, 115.76)"/><circle class="cls-1" cx="124.91" cy="224.83" r="2.67"/><circle class="cls-1" cx="75.01" cy="211.41" r="2.67" transform="translate(-145.59 170.66) rotate(-60)"/><circle class="cls-1" cx="38.5" cy="174.84" r="2.67" transform="translate(-82.26 42.67) rotate(-30)"/><circle class="cls-1" cx="25.17" cy="124.91" r="2.67"/><circle class="cls-1" cx="38.59" cy="75.01" r="2.67" transform="translate(-45.66 70.92) rotate(-60)"/><circle class="cls-1" cx="75.16" cy="38.5" r="2.67" transform="translate(-9.18 42.74) rotate(-30)"/><circle class="cls-1" cx="125.09" cy="25.17" r="2.67"/></svg>
+<svg id="Dots_Small_Larger" data-name="Dots Small Larger" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 250 250"><defs><style>.cls-1{fill:#fff;}</style></defs><title>face-012</title><circle class="cls-1" cx="135.52" cy="25.72" r="1.07" transform="translate(95.78 157.82) rotate(-84)"/><circle class="cls-1" cx="145.84" cy="27.37" r="1.07" transform="translate(88.75 164.33) rotate(-78)"/><circle class="cls-1" cx="155.93" cy="30.08" r="1.07" transform="translate(79.14 169.09) rotate(-72)"/><circle class="cls-1" cx="165.69" cy="33.83" r="1.07" transform="translate(67.39 171.44) rotate(-66)"/><circle class="cls-1" cx="174.99" cy="38.59" r="1.07" transform="translate(54.08 170.84) rotate(-60)"/><circle class="cls-1" cx="183.75" cy="44.29" r="1.07" transform="translate(39.92 166.91) rotate(-54)"/><circle class="cls-1" cx="191.87" cy="50.87" r="1.07" transform="translate(25.68 159.42) rotate(-48)"/><circle class="cls-1" cx="199.25" cy="58.26" r="1.07" transform="translate(12.19 148.29) rotate(-42)"/><circle class="cls-1" cx="205.82" cy="66.39" r="1.07" transform="translate(0.28 133.66) rotate(-36)"/><circle class="cls-1" cx="211.5" cy="75.16" r="1.07" transform="matrix(0.87, -0.5, 0.5, 0.87, -9.24, 115.82)"/><circle class="cls-1" cx="216.24" cy="84.48" r="1.07" transform="translate(-15.66 95.26) rotate(-24)"/><circle class="cls-1" cx="219.97" cy="94.23" r="1.07" transform="translate(-18.35 72.59) rotate(-18)"/><circle class="cls-1" cx="222.67" cy="104.33" r="1.07" transform="translate(-16.83 48.58) rotate(-12)"/><circle class="cls-1" cx="224.3" cy="114.65" r="1.07" transform="translate(-10.76 24.07) rotate(-6)"/><circle class="cls-1" cx="224.83" cy="125.09" r="1.07"/><circle class="cls-1" cx="224.28" cy="135.52" r="1.07" transform="translate(66.05 344.41) rotate(-84)"/><circle class="cls-1" cx="222.63" cy="145.84" r="1.07" transform="translate(33.69 333.29) rotate(-78)"/><circle class="cls-1" cx="219.92" cy="155.93" r="1.07" transform="translate(3.66 316.9) rotate(-72)"/><circle class="cls-1" cx="216.17" cy="165.69" r="1.07" transform="translate(-23.12 295.77) rotate(-66)"/><circle class="cls-1" cx="211.41" cy="174.99" r="1.07" transform="translate(-45.84 270.59) rotate(-60)"/><circle class="cls-1" cx="205.71" cy="183.75" r="1.07" transform="translate(-63.86 242.17) rotate(-54)"/><circle class="cls-1" cx="199.13" cy="191.87" r="1.07" transform="translate(-76.7 211.47) rotate(-48)"/><circle class="cls-1" cx="191.74" cy="199.25" r="1.07" transform="translate(-84.08 179.47) rotate(-42)"/><circle class="cls-1" cx="183.61" cy="205.82" r="1.07" transform="translate(-85.91 147.23) rotate(-36)"/><circle class="cls-1" cx="174.84" cy="211.5" r="1.07" transform="translate(-82.33 115.76) rotate(-30)"/><circle class="cls-1" cx="165.52" cy="216.24" r="1.07" transform="translate(-73.64 86.02) rotate(-24)"/><circle class="cls-1" cx="155.77" cy="219.97" r="1.07" transform="matrix(0.95, -0.31, 0.31, 0.95, -60.35, 58.9)"/><circle class="cls-1" cx="145.67" cy="222.67" r="1.07" transform="translate(-43.11 35.15) rotate(-12)"/><circle class="cls-1" cx="135.35" cy="224.3" r="1.07" transform="translate(-22.7 15.38) rotate(-6)"/><circle class="cls-1" cx="124.91" cy="224.83" r="1.07"/><circle class="cls-1" cx="114.48" cy="224.28" r="1.07" transform="translate(-120.54 314.68) rotate(-84)"/><circle class="cls-1" cx="104.16" cy="222.63" r="1.07" transform="translate(-135.27 278.23) rotate(-78)"/><circle class="cls-1" cx="94.07" cy="219.92" r="1.07" transform="translate(-144.16 241.42) rotate(-72)"/><circle class="cls-1" cx="84.31" cy="216.17" r="1.07" transform="translate(-147.46 205.27) rotate(-66)"/><circle class="cls-1" cx="75.01" cy="211.41" r="1.07" transform="translate(-145.59 170.66) rotate(-60)"/><circle class="cls-1" cx="66.25" cy="205.71" r="1.07" transform="matrix(0.59, -0.81, 0.81, 0.59, -139.12, 138.39)"/><circle class="cls-1" cx="58.13" cy="199.13" r="1.07" transform="translate(-128.75 109.09) rotate(-48)"/><circle class="cls-1" cx="50.75" cy="191.74" r="1.07" transform="translate(-115.26 83.21) rotate(-42)"/><circle class="cls-1" cx="44.18" cy="183.61" r="1.07" transform="translate(-99.48 61.04) rotate(-36)"/><circle class="cls-1" cx="38.5" cy="174.84" r="1.07" transform="translate(-82.26 42.67) rotate(-30)"/><circle class="cls-1" cx="33.76" cy="165.52" r="1.07" transform="translate(-64.41 28.04) rotate(-24)"/><circle class="cls-1" cx="30.03" cy="155.77" r="1.07" transform="matrix(0.95, -0.31, 0.31, 0.95, -46.66, 16.9)"/><circle class="cls-1" cx="27.33" cy="145.67" r="1.07" transform="translate(-29.69 8.87) rotate(-12)"/><circle class="cls-1" cx="25.7" cy="135.35" r="1.07" transform="translate(-14.01 3.43) rotate(-6)"/><circle class="cls-1" cx="25.17" cy="124.91" r="1.07"/><circle class="cls-1" cx="25.72" cy="114.48" r="1.07" transform="translate(-90.81 128.09) rotate(-84)"/><circle class="cls-1" cx="27.37" cy="104.16" r="1.07" transform="translate(-80.2 109.27) rotate(-78)"/><circle class="cls-1" cx="30.08" cy="94.07" r="1.07" transform="translate(-68.68 93.61) rotate(-72)"/><circle class="cls-1" cx="33.83" cy="84.31" r="1.07" transform="translate(-56.95 80.93) rotate(-66)"/><circle class="cls-1" cx="38.59" cy="75.01" r="1.07" transform="translate(-45.66 70.92) rotate(-60)"/><circle class="cls-1" cx="44.29" cy="66.25" r="1.07" transform="translate(-35.34 63.14) rotate(-54)"/><circle class="cls-1" cx="50.87" cy="58.13" r="1.07" transform="translate(-26.37 57.04) rotate(-48)"/><circle class="cls-1" cx="58.26" cy="50.75" r="1.07" transform="translate(-18.99 52.02) rotate(-42)"/><circle class="cls-1" cx="66.39" cy="44.18" r="1.07" transform="translate(-13.29 47.46) rotate(-36)"/><circle class="cls-1" cx="75.16" cy="38.5" r="1.07" transform="translate(-9.18 42.74) rotate(-30)"/><circle class="cls-1" cx="84.48" cy="33.76" r="1.07" transform="translate(-6.43 37.28) rotate(-24)"/><circle class="cls-1" cx="94.23" cy="30.03" r="1.07" transform="translate(-4.67 30.59) rotate(-18)"/><circle class="cls-1" cx="104.33" cy="27.33" r="1.07" transform="translate(-3.4 22.29) rotate(-12)"/><circle class="cls-1" cx="114.65" cy="25.7" r="1.07" transform="translate(-2.06 12.13) rotate(-6)"/><circle class="cls-1" cx="125.09" cy="25.17" r="1.07"/><circle class="cls-1" cx="174.99" cy="38.59" r="2.67" transform="translate(54.08 170.84) rotate(-60)"/><circle class="cls-1" cx="211.5" cy="75.16" r="2.67" transform="matrix(0.87, -0.5, 0.5, 0.87, -9.24, 115.82)"/><circle class="cls-1" cx="224.83" cy="125.09" r="2.67"/><circle class="cls-1" cx="211.41" cy="174.99" r="2.67" transform="translate(-45.84 270.59) rotate(-60)"/><circle class="cls-1" cx="174.84" cy="211.5" r="2.67" transform="matrix(0.87, -0.5, 0.5, 0.87, -82.33, 115.76)"/><circle class="cls-1" cx="124.91" cy="224.83" r="2.67"/><circle class="cls-1" cx="75.01" cy="211.41" r="2.67" transform="translate(-145.59 170.66) rotate(-60)"/><circle class="cls-1" cx="38.5" cy="174.84" r="2.67" transform="translate(-82.26 42.67) rotate(-30)"/><circle class="cls-1" cx="25.17" cy="124.91" r="2.67"/><circle class="cls-1" cx="38.59" cy="75.01" r="2.67" transform="translate(-45.66 70.92) rotate(-60)"/><circle class="cls-1" cx="75.16" cy="38.5" r="2.67" transform="translate(-9.18 42.74) rotate(-30)"/><circle class="cls-1" cx="125.09" cy="25.17" r="2.67"/></svg>
diff --git a/modules/default/compliments/compliments.js b/modules/default/compliments/compliments.js
index 00d7c83c..412fe170 100644
--- a/modules/default/compliments/compliments.js
+++ b/modules/default/compliments/compliments.js
@@ -22,8 +22,7 @@ Module.register("compliments", {
 		afternoonStartTime: 12,
 		afternoonEndTime: 17,
 		random: true,
-		mockDate: null,
-		advice: false
+		mockDate: null
 	},
 	lastIndexUsed: -1,
 	// Set currentweather from module
@@ -46,18 +45,6 @@ Module.register("compliments", {
 				self.config.compliments = JSON.parse(response);
 				self.updateDom();
 			});
-		} else if (this.config.advice) {
-			var xobj = new XMLHttpRequest();
-			xobj.overrideMimeType("application/json");
-			xobj.open("GET", "https://api.adviceslip.com/advice", true);
-			xobj.onreadystatechange = function () {
-				if (xobj.readyState === 4 && xobj.status === 200) {
-					const adviceResp = JSON.parse(xobj.responseText);
-					self.config.compliments = adviceResp.slip.advice;
-					self.updateDom();
-				}
-			};
-			xobj.send(null);
 		}
 
 		// Schedule update timer.
diff --git a/modules/default/currentweather/currentweather.js b/modules/default/currentweather/currentweather.js
index e0f8be50..d9d06ccb 100644
--- a/modules/default/currentweather/currentweather.js
+++ b/modules/default/currentweather/currentweather.js
@@ -23,6 +23,7 @@ Module.register("currentweather", {
 		lang: config.language,
 		decimalSymbol: ".",
 		showHumidity: false,
+		showSun: true,
 		degreeLabel: false,
 		showIndoorTemperature: false,
 		showIndoorHumidity: false,
@@ -155,13 +156,15 @@ Module.register("currentweather", {
 			small.appendChild(humidityIcon);
 		}
 
-		var sunriseSunsetIcon = document.createElement("span");
-		sunriseSunsetIcon.className = "wi dimmed " + this.sunriseSunsetIcon;
-		small.appendChild(sunriseSunsetIcon);
+		if (this.config.showSun) {
+			var sunriseSunsetIcon = document.createElement("span");
+			sunriseSunsetIcon.className = "wi dimmed " + this.sunriseSunsetIcon;
+			small.appendChild(sunriseSunsetIcon);
 
-		var sunriseSunsetTime = document.createElement("span");
-		sunriseSunsetTime.innerHTML = " " + this.sunriseSunsetTime;
-		small.appendChild(sunriseSunsetTime);
+			var sunriseSunsetTime = document.createElement("span");
+			sunriseSunsetTime.innerHTML = " " + this.sunriseSunsetTime;
+			small.appendChild(sunriseSunsetTime);
+		}
 
 		wrapper.appendChild(small);
 	},
diff --git a/modules/default/newsfeed/fetcher.js b/modules/default/newsfeed/fetcher.js
index 3877818b..da9616dc 100644
--- a/modules/default/newsfeed/fetcher.js
+++ b/modules/default/newsfeed/fetcher.js
@@ -5,9 +5,10 @@
  * MIT Licensed.
  */
 
-var FeedMe = require("feedme");
-var request = require("request");
-var iconv = require("iconv-lite");
+const Log = require("../../../js/logger.js");
+const FeedMe = require("feedme");
+const request = require("request");
+const iconv = require("iconv-lite");
 
 /* Fetcher
  * Responsible for requesting an update on the set interval and broadcasting the data.
@@ -34,7 +35,6 @@ var Fetcher = function (url, reloadInterval, encoding, logFeedWarnings) {
 	/* fetchNews()
 	 * Request the new items.
 	 */
-
 	var fetchNews = function () {
 		clearTimeout(reloadTimer);
 		reloadTimer = null;
@@ -59,16 +59,15 @@ var Fetcher = function (url, reloadInterval, encoding, logFeedWarnings) {
 					url: url
 				});
 			} else if (logFeedWarnings) {
-				console.log("Can't parse feed item:");
-				console.log(item);
-				console.log("Title: " + title);
-				console.log("Description: " + description);
-				console.log("Pubdate: " + pubdate);
+				Log.warn("Can't parse feed item:");
+				Log.warn(item);
+				Log.warn("Title: " + title);
+				Log.warn("Description: " + description);
+				Log.warn("Pubdate: " + pubdate);
 			}
 		});
 
 		parser.on("end", function () {
-			//console.log("end parsing - " + url);
 			self.broadcastItems();
 			scheduleTimer();
 		});
@@ -93,9 +92,7 @@ var Fetcher = function (url, reloadInterval, encoding, logFeedWarnings) {
 	/* scheduleTimer()
 	 * Schedule the timer for the next update.
 	 */
-
 	var scheduleTimer = function () {
-		//console.log('Schedule update timer.');
 		clearTimeout(reloadTimer);
 		reloadTimer = setTimeout(function () {
 			fetchNews();
@@ -127,10 +124,10 @@ var Fetcher = function (url, reloadInterval, encoding, logFeedWarnings) {
 	 */
 	this.broadcastItems = function () {
 		if (items.length <= 0) {
-			//console.log('No items to broadcast yet.');
+			Log.info("Newsfeed-Fetcher: No items to broadcast yet.");
 			return;
 		}
-		//console.log('Broadcasting ' + items.length + ' items.');
+		Log.info("Newsfeed-Fetcher: Broadcasting " + items.length + " items.");
 		itemsReceivedCallback(self);
 	};
 
diff --git a/modules/default/newsfeed/node_helper.js b/modules/default/newsfeed/node_helper.js
index f6d6705a..4ccef958 100644
--- a/modules/default/newsfeed/node_helper.js
+++ b/modules/default/newsfeed/node_helper.js
@@ -5,22 +5,22 @@
  * MIT Licensed.
  */
 
-var NodeHelper = require("node_helper");
-var validUrl = require("valid-url");
-var Fetcher = require("./fetcher.js");
+const NodeHelper = require("node_helper");
+const validUrl = require("valid-url");
+const Fetcher = require("./fetcher.js");
+const Log = require("../../../js/logger");
 
 module.exports = NodeHelper.create({
-	// Subclass start method.
+	// Override start method.
 	start: function () {
-		console.log("Starting module: " + this.name);
+		Log.log("Starting node helper for: " + this.name);
 		this.fetchers = [];
 	},
 
-	// Subclass socketNotificationReceived received.
+	// Override socketNotificationReceived received.
 	socketNotificationReceived: function (notification, payload) {
 		if (notification === "ADD_FEED") {
 			this.createFetcher(payload.feed, payload.config);
-			return;
 		}
 	},
 
@@ -45,7 +45,7 @@ module.exports = NodeHelper.create({
 
 		var fetcher;
 		if (typeof self.fetchers[url] === "undefined") {
-			console.log("Create new news fetcher for url: " + url + " - Interval: " + reloadInterval);
+			Log.log("Create new news fetcher for url: " + url + " - Interval: " + reloadInterval);
 			fetcher = new Fetcher(url, reloadInterval, encoding, config.logFeedWarnings);
 
 			fetcher.onReceive(function (fetcher) {
@@ -61,7 +61,7 @@ module.exports = NodeHelper.create({
 
 			self.fetchers[url] = fetcher;
 		} else {
-			console.log("Use existing news fetcher for url: " + url);
+			Log.log("Use existing news fetcher for url: " + url);
 			fetcher = self.fetchers[url];
 			fetcher.setReloadInterval(reloadInterval);
 			fetcher.broadcastItems();
diff --git a/modules/default/updatenotification/node_helper.js b/modules/default/updatenotification/node_helper.js
index 1e47b47e..0c206c5f 100644
--- a/modules/default/updatenotification/node_helper.js
+++ b/modules/default/updatenotification/node_helper.js
@@ -1,9 +1,10 @@
-var SimpleGit = require("simple-git");
-var simpleGits = [];
-var fs = require("fs");
-var path = require("path");
-var defaultModules = require(__dirname + "/../defaultmodules.js");
-var NodeHelper = require("node_helper");
+const SimpleGit = require("simple-git");
+const simpleGits = [];
+const fs = require("fs");
+const path = require("path");
+const defaultModules = require(__dirname + "/../defaultmodules.js");
+const Log = require(__dirname + "/../../../js/logger.js");
+const NodeHelper = require("node_helper");
 
 module.exports = NodeHelper.create({
 	config: {},
@@ -27,7 +28,7 @@ module.exports = NodeHelper.create({
 				var moduleFolder = path.normalize(__dirname + "/../../" + moduleName);
 
 				try {
-					//console.log("checking git for module="+moduleName)
+					Log.info("Checking git for module: " + moduleName);
 					let stat = fs.statSync(path.join(moduleFolder, ".git"));
 					promises.push(this.resolveRemote(moduleName, moduleFolder));
 				} catch (err) {
diff --git a/modules/default/weather/providers/ukmetofficedatahub.js b/modules/default/weather/providers/ukmetofficedatahub.js
new file mode 100644
index 00000000..9ed74684
--- /dev/null
+++ b/modules/default/weather/providers/ukmetofficedatahub.js
@@ -0,0 +1,303 @@
+/* Magic Mirror
+ * Module: Weather
+ *
+ * By Malcolm Oakes https://github.com/maloakes
+ * Existing Met Office provider edited for new MetOffice Data Hub by CreepinJesus http://github.com/XBCreepinJesus
+ * MIT Licensed.
+ *
+ * This class is a provider for UK Met Office Data Hub (the replacement for their Data Point services).
+ * For more information on Data Hub, see https://www.metoffice.gov.uk/services/data/datapoint/notifications/weather-datahub
+ * Data available:
+ * 		Hourly data for next 2 days ("hourly") - https://www.metoffice.gov.uk/binaries/content/assets/metofficegovuk/pdf/data/global-spot-data-hourly.pdf
+ * 		3-hourly data for the next 7 days ("3hourly") - https://www.metoffice.gov.uk/binaries/content/assets/metofficegovuk/pdf/data/global-spot-data-3-hourly.pdf
+ * 		Daily data for the next 7 days ("daily") - https://www.metoffice.gov.uk/binaries/content/assets/metofficegovuk/pdf/data/global-spot-data-daily.pdf
+ */
+
+/* NOTES
+ * This provider requires longitude/latitude coordinates, rather than a location ID (as with the previous Met Office provider)
+ * Provide the following in your config.js file:
+ * 		weatherProvider: "ukmetofficedatahub",
+ * 		apiBase: "https://api-metoffice.apiconnect.ibmcloud.com/metoffice/production/v0/forecasts/point/",
+ * 		apiKey: "[YOUR API KEY]",
+ * 		apiSecret: "[YOUR API SECRET]]",
+ * 		lat: [LATITUDE (DECIMAL)],
+ * 		lon: [LONGITUDE (DECIMAL)],
+ *		windUnits: "mps" | "kph" | "mph" (default)
+ *		tempUnits: "imperial" | "metric" (default)
+ *
+ * At time of writing, free accounts are limited to 360 requests a day per service (hourly, 3hourly, daily); take this in mind when
+ * setting your update intervals. For reference, 360 requests per day is once every 4 minutes.
+ *
+ * Pay attention to the units of the supplied data from the Met Office - it is given in SI/metric units where applicable:
+ * 	- Temperatures are in degrees Celsius (°C)
+ * 	- Wind speeds are in metres per second (m/s)
+ * 	- Wind direction given in degrees (°)
+ * 	- Pressures are in Pascals (Pa)
+ * 	- Distances are in metres (m)
+ * 	- Probabilities and humidity are given as percentages (%)
+ * 	- Precipitation is measured in millimetres (mm) with rates per hour (mm/h)
+ *
+ * See the PDFs linked above for more information on the data their corresponding units.
+ */
+
+WeatherProvider.register("ukmetofficedatahub", {
+	// Set the name of the provider.
+	providerName: "UK Met Office (DataHub)",
+
+	// Build URL with query strings according to DataHub API (https://metoffice.apiconnect.ibmcloud.com/metoffice/production/api)
+	getUrl(forecastType) {
+		let queryStrings = "?";
+		queryStrings += "latitude=" + this.config.lat;
+		queryStrings += "&longitude=" + this.config.lon;
+		if (this.config.appendLocationNameToHeader) {
+			queryStrings += "&includeLocationName=" + true;
+		}
+
+		// Return URL, making sure there is a trailing "/" in the base URL.
+		return this.config.apiBase + (this.config.apiBase.endsWith("/") ? "" : "/") + forecastType + queryStrings;
+	},
+
+	// Build the list of headers for the request
+	// For DataHub requests, the API key/secret are sent in the headers rather than as query strings.
+	// Headers defined according to Data Hub API (https://metoffice.apiconnect.ibmcloud.com/metoffice/production/api)
+	getHeaders() {
+		let headers = {
+			accept: "application/json",
+			"x-ibm-client-id": this.config.apiKey,
+			"x-ibm-client-secret": this.config.apiSecret
+		};
+
+		return headers;
+	},
+
+	// Fetch data using supplied URL and request headers
+	async fetchWeather(url, headers) {
+		const response = await fetch(url, { headers: headers });
+
+		// Return JSON data
+		return response.json();
+	},
+
+	// Fetch hourly forecast data (to use for current weather)
+	fetchCurrentWeather() {
+		this.fetchWeather(this.getUrl("hourly"), this.getHeaders())
+			.then((data) => {
+				// Check data is useable
+				if (!data || !data.features || !data.features[0].properties || !data.features[0].properties.timeSeries || data.features[0].properties.timeSeries.length == 0) {
+					// Did not receive usable new data.
+					// Maybe this needs a better check?
+					Log.error("Possibly bad current/hourly data?");
+					Log.info(data);
+					return;
+				}
+
+				// Set location name
+				this.setFetchedLocation(`${data.features[0].properties.location.name}`);
+
+				// Generate current weather data
+				const currentWeather = this.generateWeatherObjectFromCurrentWeather(data);
+				this.setCurrentWeather(currentWeather);
+			})
+
+			// Catch any error(s)
+			.catch((error) => Log.error("Could not load data: " + error.message))
+
+			// Let the module know there're new data available
+			.finally(() => this.updateAvailable());
+	},
+
+	// Create a WeatherObject using current weather data (data for the current hour)
+	generateWeatherObjectFromCurrentWeather(currentWeatherData) {
+		const currentWeather = new WeatherObject(this.config.units, this.config.tempUnits, this.config.windUnits);
+
+		// Extract the actual forecasts
+		let forecastDataHours = currentWeatherData.features[0].properties.timeSeries;
+
+		// Define now
+		let nowUtc = moment.utc();
+
+		// Find hour that contains the current time
+		for (hour in forecastDataHours) {
+			let forecastTime = moment.utc(forecastDataHours[hour].time);
+			if (nowUtc.isSameOrAfter(forecastTime) && nowUtc.isBefore(moment(forecastTime.add(1, "h")))) {
+				currentWeather.date = forecastTime;
+				currentWeather.windSpeed = this.convertWindSpeed(forecastDataHours[hour].windSpeed10m);
+				currentWeather.windDirection = forecastDataHours[hour].windDirectionFrom10m;
+				currentWeather.temperature = this.convertTemp(forecastDataHours[hour].screenTemperature);
+				currentWeather.minTemperature = this.convertTemp(forecastDataHours[hour].minScreenAirTemp);
+				currentWeather.maxTemperature = this.convertTemp(forecastDataHours[hour].maxScreenAirTemp);
+				currentWeather.weatherType = this.convertWeatherType(forecastDataHours[hour].significantWeatherCode);
+				currentWeather.humidity = forecastDataHours[hour].screenRelativeHumidity;
+				currentWeather.rain = forecastDataHours[hour].totalPrecipAmount;
+				currentWeather.snow = forecastDataHours[hour].totalSnowAmount;
+				currentWeather.precipitation = forecastDataHours[hour].probOfPrecipitation;
+				currentWeather.feelsLikeTemp = this.convertTemp(forecastDataHours[hour].feelsLikeTemperature);
+
+				// Pass on full details so they can be used in custom templates
+				// Note the units of the supplied data when using this (see top of file)
+				currentWeather.rawData = forecastDataHours[hour];
+			}
+		}
+
+		// Determine the sunrise/sunset times - (still) not supplied in UK Met Office data
+		// Passes {longitude, latitude, height} to calcAstroData
+		// Could just pass lat/long from this.config, but returned data from MO also contains elevation
+		let times = this.calcAstroData(currentWeatherData.features[0].geometry.coordinates);
+		currentWeather.sunrise = times[0];
+		currentWeather.sunset = times[1];
+
+		return currentWeather;
+	},
+
+	// Fetch daily forecast data
+	fetchWeatherForecast() {
+		this.fetchWeather(this.getUrl("daily"), this.getHeaders())
+			.then((data) => {
+				// Check data is useable
+				if (!data || !data.features || !data.features[0].properties || !data.features[0].properties.timeSeries || data.features[0].properties.timeSeries.length == 0) {
+					// Did not receive usable new data.
+					// Maybe this needs a better check?
+					Log.error("Possibly bad forecast data?");
+					Log.info(data);
+					return;
+				}
+
+				// Set location name
+				this.setFetchedLocation(`${data.features[0].properties.location.name}`);
+
+				// Generate the forecast data
+				const forecast = this.generateWeatherObjectsFromForecast(data);
+				this.setWeatherForecast(forecast);
+			})
+
+			// Catch any error(s)
+			.catch((error) => Log.error("Could not load data: " + error.message))
+
+			// Let the module know there're new data available
+			.finally(() => this.updateAvailable());
+	},
+
+	// Create a WeatherObject for each day using daily forecast data
+	generateWeatherObjectsFromForecast(forecasts) {
+		const dailyForecasts = [];
+
+		// Extract the actual forecasts
+		let forecastDataDays = forecasts.features[0].properties.timeSeries;
+
+		// Define today
+		let today = moment.utc().startOf("date");
+
+		// Go through each day in the forecasts
+		for (day in forecastDataDays) {
+			const forecastWeather = new WeatherObject(this.config.units, this.config.tempUnits, this.config.windUnits);
+
+			// Get date of forecast
+			let forecastDate = moment.utc(forecastDataDays[day].time);
+
+			// Check if forecast is for today or in the future (i.e., ignore yesterday's forecast)
+			if (forecastDate.isSameOrAfter(today)) {
+				forecastWeather.date = forecastDate;
+				forecastWeather.minTemperature = this.convertTemp(forecastDataDays[day].nightMinScreenTemperature);
+				forecastWeather.maxTemperature = this.convertTemp(forecastDataDays[day].dayMaxScreenTemperature);
+
+				// Using daytime forecast values
+				forecastWeather.windSpeed = this.convertWindSpeed(forecastDataDays[day].midday10MWindSpeed);
+				forecastWeather.windDirection = forecastDataDays[day].midday10MWindDirection;
+				forecastWeather.weatherType = this.convertWeatherType(forecastDataDays[day].daySignificantWeatherCode);
+				forecastWeather.precipitation = forecastDataDays[day].dayProbabilityOfPrecipitation;
+				forecastWeather.temperature = forecastDataDays[day].dayMaxScreenTemperature;
+				forecastWeather.humidity = forecastDataDays[day].middayRelativeHumidity;
+				forecastWeather.rain = forecastDataDays[day].dayProbabilityOfRain;
+				forecastWeather.snow = forecastDataDays[day].dayProbabilityOfSnow;
+				forecastWeather.feelsLikeTemp = this.convertTemp(forecastDataDays[day].dayMaxFeelsLikeTemp);
+
+				// Pass on full details so they can be used in custom templates
+				// Note the units of the supplied data when using this (see top of file)
+
+				forecastWeather.rawData = forecastDataDays[day];
+
+				dailyForecasts.push(forecastWeather);
+			}
+		}
+
+		return dailyForecasts;
+	},
+
+	// Set the fetched location name.
+	setFetchedLocation: function (name) {
+		this.fetchedLocationName = name;
+	},
+
+	// Calculate sunrise/sunset times
+	calcAstroData(location) {
+		const sunTimes = [];
+
+		// Careful to pass values to SunCalc in correct order (latitude, longitude, elevation)
+		let times = SunCalc.getTimes(new Date(), location[1], location[0], location[2]);
+		sunTimes.push(moment(times.sunrise, "X"));
+		sunTimes.push(moment(times.sunset, "X"));
+
+		return sunTimes;
+	},
+
+	// Convert temperatures to Fahrenheit (from degrees C), if required
+	convertTemp(tempInC) {
+		return this.config.tempUnits === "imperial" ? (tempInC * 9) / 5 + 32 : tempInC;
+	},
+
+	// Convert wind speed from metres per second
+	// To keep the supplied metres per second units, use "mps"
+	// To use kilometres per hour, use "kph"
+	// Else assumed imperial and the value is returned in miles per hour (a Met Office user is likely to be UK-based)
+	convertWindSpeed(windInMpS) {
+		if (this.config.windUnits == "mps") {
+			return windInMpS;
+		}
+
+		if (this.config.windUnits == "kph" || this.config.windUnits == "metric") {
+			return windInMpS * 3.6;
+		}
+
+		return windInMpS * 2.23694;
+	},
+
+	// Match the Met Office "significant weather code" to a weathericons.css icon
+	// Use: https://metoffice.apiconnect.ibmcloud.com/metoffice/production/node/264
+	// and: https://erikflowers.github.io/weather-icons/
+	convertWeatherType(weatherType) {
+		const weatherTypes = {
+			0: "night-clear",
+			1: "day-sunny",
+			2: "night-alt-cloudy",
+			3: "day-cloudy",
+			5: "fog",
+			6: "fog",
+			7: "cloudy",
+			8: "cloud",
+			9: "night-sprinkle",
+			10: "day-sprinkle",
+			11: "raindrops",
+			12: "sprinkle",
+			13: "night-alt-showers",
+			14: "day-showers",
+			15: "rain",
+			16: "night-alt-sleet",
+			17: "day-sleet",
+			18: "sleet",
+			19: "night-alt-hail",
+			20: "day-hail",
+			21: "hail",
+			22: "night-alt-snow",
+			23: "day-snow",
+			24: "snow",
+			25: "night-alt-snow",
+			26: "day-snow",
+			27: "snow",
+			28: "night-alt-thunderstorm",
+			29: "day-thunderstorm",
+			30: "thunderstorm"
+		};
+
+		return weatherTypes.hasOwnProperty(weatherType) ? weatherTypes[weatherType] : null;
+	}
+});
diff --git a/modules/default/weather/weather.js b/modules/default/weather/weather.js
index 23afb549..73c493e0 100644
--- a/modules/default/weather/weather.js
+++ b/modules/default/weather/weather.js
@@ -15,7 +15,6 @@ Module.register("weather", {
 
 		location: false,
 		locationID: false,
-		appid: "",
 		units: config.units,
 
 		tempUnits: config.units,
@@ -43,8 +42,10 @@ Module.register("weather", {
 		initialLoadDelay: 0, // 0 seconds delay
 		retryDelay: 2500,
 
+		apiKey: "",
+		apiSecret: "",
 		apiVersion: "2.5",
-		apiBase: "https://api.openweathermap.org/data/",
+		apiBase: "https://api.openweathermap.org/data/", // TODO: this should not be part of the weather.js file, but should be contained in the openweatherprovider
 		weatherEndpoint: "/weather",
 
 		appendLocationNameToHeader: true,
@@ -208,7 +209,7 @@ Module.register("weather", {
 					if (isNaN(value) || value === 0 || value.toFixed(2) === "0.00") {
 						value = "";
 					} else {
-						if (this.config.weatherProvider === "ukmetoffice") {
+						if (this.config.weatherProvider === "ukmetoffice" || this.config.weatherProvider === "ukmetofficedatahub") {
 							value += "%";
 						} else {
 							value = `${value.toFixed(2)} ${this.config.units === "imperial" ? "in" : "mm"}`;
diff --git a/modules/default/weatherforecast/weatherforecast.js b/modules/default/weatherforecast/weatherforecast.js
index 83389911..d872ee01 100644
--- a/modules/default/weatherforecast/weatherforecast.js
+++ b/modules/default/weatherforecast/weatherforecast.js
@@ -294,7 +294,15 @@ Module.register("weatherforecast", {
 			return;
 		}
 
-		params += "&cnt=" + (this.config.maxNumberOfDays < 1 || this.config.maxNumberOfDays > 17 ? 7 : this.config.maxNumberOfDays);
+		let numberOfDays;
+		if (this.config.forecastEndpoint === "forecast") {
+			numberOfDays = this.config.maxNumberOfDays < 1 || this.config.maxNumberOfDays > 5 ? 5 : this.config.maxNumberOfDays;
+			// don't get forecasts for the 6th day, as it would not represent the whole day
+			numberOfDays = numberOfDays * 8 - (Math.floor(new Date().getHours() / 3) % 8);
+		} else {
+			numberOfDays = this.config.maxNumberOfDays < 1 || this.config.maxNumberOfDays > 17 ? 7 : this.config.maxNumberOfDays;
+		}
+		params += "&cnt=" + numberOfDays;
 
 		params += "&units=" + this.config.units;
 		params += "&lang=" + this.config.lang;
diff --git a/package-lock.json b/package-lock.json
index 20930a94..70658c2c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "magicmirror",
-  "version": "2.12.0-develop",
+  "version": "2.13.0-develop",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -13,19 +13,19 @@
       }
     },
     "@babel/core": {
-      "version": "7.9.0",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.9.0.tgz",
-      "integrity": "sha512-kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w==",
+      "version": "7.10.2",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.10.2.tgz",
+      "integrity": "sha512-KQmV9yguEjQsXqyOUGKjS4+3K8/DlOCE2pZcq4augdQmtTy5iv5EHtmMSJ7V4c1BIPjuwtZYqYLCq9Ga+hGBRQ==",
       "dev": true,
       "requires": {
-        "@babel/code-frame": "^7.8.3",
-        "@babel/generator": "^7.9.0",
-        "@babel/helper-module-transforms": "^7.9.0",
-        "@babel/helpers": "^7.9.0",
-        "@babel/parser": "^7.9.0",
-        "@babel/template": "^7.8.6",
-        "@babel/traverse": "^7.9.0",
-        "@babel/types": "^7.9.0",
+        "@babel/code-frame": "^7.10.1",
+        "@babel/generator": "^7.10.2",
+        "@babel/helper-module-transforms": "^7.10.1",
+        "@babel/helpers": "^7.10.1",
+        "@babel/parser": "^7.10.2",
+        "@babel/template": "^7.10.1",
+        "@babel/traverse": "^7.10.1",
+        "@babel/types": "^7.10.2",
         "convert-source-map": "^1.7.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.1",
@@ -36,6 +36,46 @@
         "source-map": "^0.5.0"
       },
       "dependencies": {
+        "@babel/code-frame": {
+          "version": "7.10.1",
+          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.1.tgz",
+          "integrity": "sha512-IGhtTmpjGbYzcEDOw7DcQtbQSXcG9ftmAXtWTu9V936vDye4xjjekktFAtgZsWpzTj/X01jocB46mTywm/4SZw==",
+          "dev": true,
+          "requires": {
+            "@babel/highlight": "^7.10.1"
+          }
+        },
+        "@babel/highlight": {
+          "version": "7.10.1",
+          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.1.tgz",
+          "integrity": "sha512-8rMof+gVP8mxYZApLF/JgNDAkdKa+aJt3ZYxF8z6+j/hpeXL7iMsKCPHa2jNMHu/qqBwzQF4OHNoYi8dMA/rYg==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.10.1",
+            "chalk": "^2.0.0",
+            "js-tokens": "^4.0.0"
+          }
+        },
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        },
         "debug": {
           "version": "4.1.1",
           "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
@@ -59,16 +99,25 @@
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
           "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
           "dev": true
+        },
+        "supports-color": {
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
         }
       }
     },
     "@babel/generator": {
-      "version": "7.9.5",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.5.tgz",
-      "integrity": "sha512-GbNIxVB3ZJe3tLeDm1HSn2AhuD/mVcyLDpgtLXa5tplmWrJdF/elxB56XNqCuD6szyNkDi6wuoKXln3QeBmCHQ==",
+      "version": "7.10.2",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.10.2.tgz",
+      "integrity": "sha512-AxfBNHNu99DTMvlUPlt1h2+Hn7knPpH5ayJ8OqDWSeLld+Fi2AYBTC/IejWDM9Edcii4UzZRCsbUt0WlSDsDsA==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.9.5",
+        "@babel/types": "^7.10.2",
         "jsesc": "^2.5.1",
         "lodash": "^4.17.13",
         "source-map": "^0.5.0"
@@ -83,113 +132,113 @@
       }
     },
     "@babel/helper-function-name": {
-      "version": "7.9.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.9.5.tgz",
-      "integrity": "sha512-JVcQZeXM59Cd1qanDUxv9fgJpt3NeKUaqBqUEvfmQ+BCOKq2xUgaWZW2hr0dkbyJgezYuplEoh5knmrnS68efw==",
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.1.tgz",
+      "integrity": "sha512-fcpumwhs3YyZ/ttd5Rz0xn0TpIwVkN7X0V38B9TWNfVF42KEkhkAAuPCQ3oXmtTRtiPJrmZ0TrfS0GKF0eMaRQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-get-function-arity": "^7.8.3",
-        "@babel/template": "^7.8.3",
-        "@babel/types": "^7.9.5"
+        "@babel/helper-get-function-arity": "^7.10.1",
+        "@babel/template": "^7.10.1",
+        "@babel/types": "^7.10.1"
       }
     },
     "@babel/helper-get-function-arity": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz",
-      "integrity": "sha512-FVDR+Gd9iLjUMY1fzE2SR0IuaJToR4RkCDARVfsBBPSP53GEqSFjD8gNyxg246VUyc/ALRxFaAK8rVG7UT7xRA==",
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.1.tgz",
+      "integrity": "sha512-F5qdXkYGOQUb0hpRaPoetF9AnsXknKjWMZ+wmsIRsp5ge5sFh4c3h1eH2pRTTuy9KKAA2+TTYomGXAtEL2fQEw==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.8.3"
+        "@babel/types": "^7.10.1"
       }
     },
     "@babel/helper-member-expression-to-functions": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.8.3.tgz",
-      "integrity": "sha512-fO4Egq88utkQFjbPrSHGmGLFqmrshs11d46WI+WZDESt7Wu7wN2G2Iu+NMMZJFDOVRHAMIkB5SNh30NtwCA7RA==",
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.10.1.tgz",
+      "integrity": "sha512-u7XLXeM2n50gb6PWJ9hoO5oO7JFPaZtrh35t8RqKLT1jFKj9IWeD1zrcrYp1q1qiZTdEarfDWfTIP8nGsu0h5g==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.8.3"
+        "@babel/types": "^7.10.1"
       }
     },
     "@babel/helper-module-imports": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.8.3.tgz",
-      "integrity": "sha512-R0Bx3jippsbAEtzkpZ/6FIiuzOURPcMjHp+Z6xPe6DtApDJx+w7UYyOLanZqO8+wKR9G10s/FmHXvxaMd9s6Kg==",
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.10.1.tgz",
+      "integrity": "sha512-SFxgwYmZ3HZPyZwJRiVNLRHWuW2OgE5k2nrVs6D9Iv4PPnXVffuEHy83Sfx/l4SqF+5kyJXjAyUmrG7tNm+qVg==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.8.3"
+        "@babel/types": "^7.10.1"
       }
     },
     "@babel/helper-module-transforms": {
-      "version": "7.9.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.9.0.tgz",
-      "integrity": "sha512-0FvKyu0gpPfIQ8EkxlrAydOWROdHpBmiCiRwLkUiBGhCUPRRbVD2/tm3sFr/c/GWFrQ/ffutGUAnx7V0FzT2wA==",
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.10.1.tgz",
+      "integrity": "sha512-RLHRCAzyJe7Q7sF4oy2cB+kRnU4wDZY/H2xJFGof+M+SJEGhZsb+GFj5j1AD8NiSaVBJ+Pf0/WObiXu/zxWpFg==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-imports": "^7.8.3",
-        "@babel/helper-replace-supers": "^7.8.6",
-        "@babel/helper-simple-access": "^7.8.3",
-        "@babel/helper-split-export-declaration": "^7.8.3",
-        "@babel/template": "^7.8.6",
-        "@babel/types": "^7.9.0",
+        "@babel/helper-module-imports": "^7.10.1",
+        "@babel/helper-replace-supers": "^7.10.1",
+        "@babel/helper-simple-access": "^7.10.1",
+        "@babel/helper-split-export-declaration": "^7.10.1",
+        "@babel/template": "^7.10.1",
+        "@babel/types": "^7.10.1",
         "lodash": "^4.17.13"
       }
     },
     "@babel/helper-optimise-call-expression": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.8.3.tgz",
-      "integrity": "sha512-Kag20n86cbO2AvHca6EJsvqAd82gc6VMGule4HwebwMlwkpXuVqrNRj6CkCV2sKxgi9MyAUnZVnZ6lJ1/vKhHQ==",
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.1.tgz",
+      "integrity": "sha512-a0DjNS1prnBsoKx83dP2falChcs7p3i8VMzdrSbfLhuQra/2ENC4sbri34dz/rWmDADsmF1q5GbfaXydh0Jbjg==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.8.3"
+        "@babel/types": "^7.10.1"
       }
     },
     "@babel/helper-replace-supers": {
-      "version": "7.8.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.8.6.tgz",
-      "integrity": "sha512-PeMArdA4Sv/Wf4zXwBKPqVj7n9UF/xg6slNRtZW84FM7JpE1CbG8B612FyM4cxrf4fMAMGO0kR7voy1ForHHFA==",
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.10.1.tgz",
+      "integrity": "sha512-SOwJzEfpuQwInzzQJGjGaiG578UYmyi2Xw668klPWV5n07B73S0a9btjLk/52Mlcxa+5AdIYqws1KyXRfMoB7A==",
       "dev": true,
       "requires": {
-        "@babel/helper-member-expression-to-functions": "^7.8.3",
-        "@babel/helper-optimise-call-expression": "^7.8.3",
-        "@babel/traverse": "^7.8.6",
-        "@babel/types": "^7.8.6"
+        "@babel/helper-member-expression-to-functions": "^7.10.1",
+        "@babel/helper-optimise-call-expression": "^7.10.1",
+        "@babel/traverse": "^7.10.1",
+        "@babel/types": "^7.10.1"
       }
     },
     "@babel/helper-simple-access": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.8.3.tgz",
-      "integrity": "sha512-VNGUDjx5cCWg4vvCTR8qQ7YJYZ+HBjxOgXEl7ounz+4Sn7+LMD3CFrCTEU6/qXKbA2nKg21CwhhBzO0RpRbdCw==",
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.10.1.tgz",
+      "integrity": "sha512-VSWpWzRzn9VtgMJBIWTZ+GP107kZdQ4YplJlCmIrjoLVSi/0upixezHCDG8kpPVTBJpKfxTH01wDhh+jS2zKbw==",
       "dev": true,
       "requires": {
-        "@babel/template": "^7.8.3",
-        "@babel/types": "^7.8.3"
+        "@babel/template": "^7.10.1",
+        "@babel/types": "^7.10.1"
       }
     },
     "@babel/helper-split-export-declaration": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz",
-      "integrity": "sha512-3x3yOeyBhW851hroze7ElzdkeRXQYQbFIb7gLK1WQYsw2GWDay5gAJNw1sWJ0VFP6z5J1whqeXH/WCdCjZv6dA==",
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.10.1.tgz",
+      "integrity": "sha512-UQ1LVBPrYdbchNhLwj6fetj46BcFwfS4NllJo/1aJsT+1dLTEnXJL0qHqtY7gPzF8S2fXBJamf1biAXV3X077g==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.8.3"
+        "@babel/types": "^7.10.1"
       }
     },
     "@babel/helper-validator-identifier": {
-      "version": "7.9.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz",
-      "integrity": "sha512-/8arLKUFq882w4tWGj9JYzRpAlZgiWUJ+dtteNTDqrRBz9Iguck9Rn3ykuBDoUwh2TO4tSAJlrxDUOXWklJe4g==",
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.1.tgz",
+      "integrity": "sha512-5vW/JXLALhczRCWP0PnFDMCJAchlBvM7f4uk/jXritBnIa6E1KmqmtrS3yn1LAnxFBypQ3eneLuXjsnfQsgILw==",
       "dev": true
     },
     "@babel/helpers": {
-      "version": "7.9.2",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.9.2.tgz",
-      "integrity": "sha512-JwLvzlXVPjO8eU9c/wF9/zOIN7X6h8DYf7mG4CiFRZRvZNKEF5dQ3H3V+ASkHoIB3mWhatgl5ONhyqHRI6MppA==",
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.10.1.tgz",
+      "integrity": "sha512-muQNHF+IdU6wGgkaJyhhEmI54MOZBKsFfsXFhboz1ybwJ1Kl7IHlbm2a++4jwrmY5UYsgitt5lfqo1wMFcHmyw==",
       "dev": true,
       "requires": {
-        "@babel/template": "^7.8.3",
-        "@babel/traverse": "^7.9.0",
-        "@babel/types": "^7.9.0"
+        "@babel/template": "^7.10.1",
+        "@babel/traverse": "^7.10.1",
+        "@babel/types": "^7.10.1"
       }
     },
     "@babel/highlight": {
@@ -231,9 +280,9 @@
       }
     },
     "@babel/parser": {
-      "version": "7.9.4",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.4.tgz",
-      "integrity": "sha512-bC49otXX6N0/VYhgOMh4gnP26E9xnDZK3TmbNpxYzzz9BQLBosQwfyOe9/cXUU3txYhTzLCbcqd5c8y/OmCjHA==",
+      "version": "7.10.2",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.10.2.tgz",
+      "integrity": "sha512-PApSXlNMJyB4JiGVhCOlzKIif+TKFTvu0aQAhnTvfP/z3vVSN6ZypH5bfUNwFXXjRQtUEBNFd2PtmCmG2Py3qQ==",
       "dev": true
     },
     "@babel/runtime": {
@@ -254,33 +303,124 @@
       }
     },
     "@babel/template": {
-      "version": "7.8.6",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.6.tgz",
-      "integrity": "sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==",
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.1.tgz",
+      "integrity": "sha512-OQDg6SqvFSsc9A0ej6SKINWrpJiNonRIniYondK2ViKhB06i3c0s+76XUft71iqBEe9S1OKsHwPAjfHnuvnCig==",
       "dev": true,
       "requires": {
-        "@babel/code-frame": "^7.8.3",
-        "@babel/parser": "^7.8.6",
-        "@babel/types": "^7.8.6"
+        "@babel/code-frame": "^7.10.1",
+        "@babel/parser": "^7.10.1",
+        "@babel/types": "^7.10.1"
+      },
+      "dependencies": {
+        "@babel/code-frame": {
+          "version": "7.10.1",
+          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.1.tgz",
+          "integrity": "sha512-IGhtTmpjGbYzcEDOw7DcQtbQSXcG9ftmAXtWTu9V936vDye4xjjekktFAtgZsWpzTj/X01jocB46mTywm/4SZw==",
+          "dev": true,
+          "requires": {
+            "@babel/highlight": "^7.10.1"
+          }
+        },
+        "@babel/highlight": {
+          "version": "7.10.1",
+          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.1.tgz",
+          "integrity": "sha512-8rMof+gVP8mxYZApLF/JgNDAkdKa+aJt3ZYxF8z6+j/hpeXL7iMsKCPHa2jNMHu/qqBwzQF4OHNoYi8dMA/rYg==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.10.1",
+            "chalk": "^2.0.0",
+            "js-tokens": "^4.0.0"
+          }
+        },
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        },
+        "supports-color": {
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        }
       }
     },
     "@babel/traverse": {
-      "version": "7.9.5",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.5.tgz",
-      "integrity": "sha512-c4gH3jsvSuGUezlP6rzSJ6jf8fYjLj3hsMZRx/nX0h+fmHN0w+ekubRrHPqnMec0meycA2nwCsJ7dC8IPem2FQ==",
+      "version": "7.10.1",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.10.1.tgz",
+      "integrity": "sha512-C/cTuXeKt85K+p08jN6vMDz8vSV0vZcI0wmQ36o6mjbuo++kPMdpOYw23W2XH04dbRt9/nMEfA4W3eR21CD+TQ==",
       "dev": true,
       "requires": {
-        "@babel/code-frame": "^7.8.3",
-        "@babel/generator": "^7.9.5",
-        "@babel/helper-function-name": "^7.9.5",
-        "@babel/helper-split-export-declaration": "^7.8.3",
-        "@babel/parser": "^7.9.0",
-        "@babel/types": "^7.9.5",
+        "@babel/code-frame": "^7.10.1",
+        "@babel/generator": "^7.10.1",
+        "@babel/helper-function-name": "^7.10.1",
+        "@babel/helper-split-export-declaration": "^7.10.1",
+        "@babel/parser": "^7.10.1",
+        "@babel/types": "^7.10.1",
         "debug": "^4.1.0",
         "globals": "^11.1.0",
         "lodash": "^4.17.13"
       },
       "dependencies": {
+        "@babel/code-frame": {
+          "version": "7.10.1",
+          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.1.tgz",
+          "integrity": "sha512-IGhtTmpjGbYzcEDOw7DcQtbQSXcG9ftmAXtWTu9V936vDye4xjjekktFAtgZsWpzTj/X01jocB46mTywm/4SZw==",
+          "dev": true,
+          "requires": {
+            "@babel/highlight": "^7.10.1"
+          }
+        },
+        "@babel/highlight": {
+          "version": "7.10.1",
+          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.1.tgz",
+          "integrity": "sha512-8rMof+gVP8mxYZApLF/JgNDAkdKa+aJt3ZYxF8z6+j/hpeXL7iMsKCPHa2jNMHu/qqBwzQF4OHNoYi8dMA/rYg==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-validator-identifier": "^7.10.1",
+            "chalk": "^2.0.0",
+            "js-tokens": "^4.0.0"
+          }
+        },
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        },
         "debug": {
           "version": "4.1.1",
           "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
@@ -295,16 +435,25 @@
           "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
           "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
           "dev": true
+        },
+        "supports-color": {
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
         }
       }
     },
     "@babel/types": {
-      "version": "7.9.5",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.5.tgz",
-      "integrity": "sha512-XjnvNqenk818r5zMaba+sLQjnbda31UfUURv3ei0qPQw4u+j2jMyJ5b11y8ZHYTRSI3NnInQkkkRT4fLqqPdHg==",
+      "version": "7.10.2",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.2.tgz",
+      "integrity": "sha512-AD3AwWBSz0AWF0AkCN9VPiWrvldXq+/e3cHa4J89vo4ymjz1XwrBFFVZmkJTsQIPNk+ZVomPSXUJqq8yyjZsng==",
       "dev": true,
       "requires": {
-        "@babel/helper-validator-identifier": "^7.9.5",
+        "@babel/helper-validator-identifier": "^7.10.1",
         "lodash": "^4.17.13",
         "to-fast-properties": "^2.0.0"
       }
@@ -440,9 +589,9 @@
       }
     },
     "acorn": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.1.1.tgz",
-      "integrity": "sha512-add7dgA5ppRPxCFJoAGfMDi7PIBXq1RtGo7BhbLaxwrXPOmw8gq48Y9ozT01hUKy9byMjlR20EJhu5zlkErEkg=="
+      "version": "7.3.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.3.1.tgz",
+      "integrity": "sha512-tLc0wSnatxAQHVHUapaHdz72pi9KUyHjq5KyHjGg9Y8Ifdc79pTh2XvI6I1/chZbnM7QtNKzh66ooDogPZSleA=="
     },
     "acorn-globals": {
       "version": "4.3.4",
@@ -501,23 +650,7 @@
     "ansi-colors": {
       "version": "3.2.3",
       "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.3.tgz",
-      "integrity": "sha512-LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw==",
-      "dev": true
-    },
-    "ansi-escapes": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz",
-      "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==",
-      "requires": {
-        "type-fest": "^0.11.0"
-      },
-      "dependencies": {
-        "type-fest": {
-          "version": "0.11.0",
-          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz",
-          "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ=="
-        }
-      }
+      "integrity": "sha512-LEHHyuhlPY3TmuUYMh2oz89lTShfvgbmzaBcxve9t/9Wuy7Dwf4yoAKcND7KFT1HAQfqZ12qtc+DUrBMeKF9nw=="
     },
     "ansi-regex": {
       "version": "2.1.1",
@@ -603,9 +736,9 @@
       "integrity": "sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog=="
     },
     "arrify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
-      "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz",
+      "integrity": "sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==",
       "dev": true
     },
     "asn1": {
@@ -649,18 +782,18 @@
       "dev": true
     },
     "autoprefixer": {
-      "version": "9.7.6",
-      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.7.6.tgz",
-      "integrity": "sha512-F7cYpbN7uVVhACZTeeIeealwdGM6wMtfWARVLTy5xmKtgVdBNJvbDRoCK3YO1orcs7gv/KwYlb3iXwu9Ug9BkQ==",
+      "version": "9.8.0",
+      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.8.0.tgz",
+      "integrity": "sha512-D96ZiIHXbDmU02dBaemyAg53ez+6F5yZmapmgKcjm35yEe1uVDYI8hGW3VYoGRaG290ZFf91YxHrR518vC0u/A==",
       "dev": true,
       "requires": {
-        "browserslist": "^4.11.1",
-        "caniuse-lite": "^1.0.30001039",
+        "browserslist": "^4.12.0",
+        "caniuse-lite": "^1.0.30001061",
         "chalk": "^2.4.2",
         "normalize-range": "^0.1.2",
         "num2fraction": "^1.2.2",
-        "postcss": "^7.0.27",
-        "postcss-value-parser": "^4.0.3"
+        "postcss": "^7.0.30",
+        "postcss-value-parser": "^4.1.0"
       },
       "dependencies": {
         "ansi-styles": {
@@ -700,9 +833,9 @@
       "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg="
     },
     "aws4": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.9.0.tgz",
-      "integrity": "sha512-Uvq6hVe90D0B2WEnUqtdgY1bATGz3mw33nH9Y+dmA+w5DHvUmBgkr5rM/KCHpCsiFNRUfokW/szpPPgMK2hm4A=="
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.10.0.tgz",
+      "integrity": "sha512-3YDiu347mtVtjpyV3u5kVqQLP242c06zwDOgpeRnybmXlYYsLbtTrUBUm8i8srONt+FWobl5aibnU1030PeeuA=="
     },
     "babel-polyfill": {
       "version": "6.26.0",
@@ -985,9 +1118,9 @@
       "integrity": "sha1-FkpUg+Yw+kMh5a8HAg5TGDGyYJs="
     },
     "caniuse-lite": {
-      "version": "1.0.30001045",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001045.tgz",
-      "integrity": "sha512-Y8o2Iz1KPcD6FjySbk1sPpvJqchgxk/iow0DABpGyzA1UeQAuxh63Xh0Enj5/BrsYbXtCN32JmR4ZxQTCQ6E6A==",
+      "version": "1.0.30001084",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001084.tgz",
+      "integrity": "sha512-ftdc5oGmhEbLUuMZ/Qp3mOpzfZLCxPYKcvGv6v2dJJ+8EdqcvZRbAGOiLmkM/PV1QGta/uwBs8/nCl6sokDW6w==",
       "dev": true
     },
     "caseless": {
@@ -1060,11 +1193,6 @@
       "integrity": "sha512-mKKUkUbhPpQlCOfIuZkvSEgktjPFIsZKRRbC6KWVEMvlzblj3i3asQv5ODsrwt0N3pHAEvjP8KTQPHkp0+6jOg==",
       "dev": true
     },
-    "chardet": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",
-      "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA=="
-    },
     "check-error": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz",
@@ -1098,18 +1226,11 @@
       "resolved": "https://registry.npmjs.org/clarinet/-/clarinet-0.12.4.tgz",
       "integrity": "sha512-Rx9Zw8KQkoPO3/O2yPRchCZm3cGubCQiRLmmFAlbkDKobUIPP3JYul+bKILR9DIv1gSVwPQSgF8JGGkXzX8Q0w=="
     },
-    "cli-cursor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
-      "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
-      "requires": {
-        "restore-cursor": "^3.1.0"
-      }
-    },
     "cli-width": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz",
-      "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk="
+      "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=",
+      "dev": true
     },
     "cliui": {
       "version": "4.1.0",
@@ -1397,6 +1518,7 @@
       "version": "6.0.5",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
       "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+      "dev": true,
       "requires": {
         "nice-try": "^1.0.4",
         "path-key": "^2.0.1",
@@ -1727,9 +1849,9 @@
           "dev": true
         },
         "entities": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/entities/-/entities-2.0.0.tgz",
-          "integrity": "sha512-D9f7V0JSRwIxlRI2mjMqufDrRDnx8p+eEOz7aUM9SuvF8gsBzra0/6tbjl1m8eQHrZlYj6PxqE00hZ1SAIKPLw==",
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/entities/-/entities-2.0.3.tgz",
+          "integrity": "sha512-MyoZ0jgnLvB2X3Lg5HqpFmn1kybDiIfEQmKzTb5apr51Rb+T3KdmMiqa70T+bhGnyv7bQ6WMj2QMHpGMmlrUYQ==",
           "dev": true
         }
       }
@@ -1855,15 +1977,15 @@
       }
     },
     "electron-to-chromium": {
-      "version": "1.3.414",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.414.tgz",
-      "integrity": "sha512-UfxhIvED++qLwWrAq9uYVcqF8FdeV9sU2S7qhiHYFODxzXRrd1GZRl/PjITHsTEejgibcWDraD8TQqoHb1aCBQ==",
+      "version": "1.3.478",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.478.tgz",
+      "integrity": "sha512-pt9GUDD52uEO9ZXWcG4UuW/HwE8T+a8iFP7K2qqWrHB5wUxbbvCIXGBVpQDDQwSR766Nn4AkmLYxOUNd4Ji5Dw==",
       "dev": true
     },
     "emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
+      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="
     },
     "encodeurl": {
       "version": "1.0.2",
@@ -1955,6 +2077,14 @@
         "has-binary2": "~1.0.2"
       }
     },
+    "enquirer": {
+      "version": "2.3.5",
+      "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.5.tgz",
+      "integrity": "sha512-BNT1C08P9XD0vNg3J475yIUG+mVdp9T6towYFHUv897X0KoHBjB1shyrNmhmtHWKP17iSWgo7Gqh7BBuzLZMSA==",
+      "requires": {
+        "ansi-colors": "^3.2.1"
+      }
+    },
     "entities": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
@@ -2059,21 +2189,22 @@
       }
     },
     "eslint": {
-      "version": "6.8.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-6.8.0.tgz",
-      "integrity": "sha512-K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig==",
+      "version": "7.3.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.3.0.tgz",
+      "integrity": "sha512-dJMVXwfU5PT1cj2Nv2VPPrKahKTGdX+5Dh0Q3YuKt+Y2UhdL2YbzsVaBMyG9HC0tBismlv/r1+eZqs6SMIV38Q==",
       "requires": {
         "@babel/code-frame": "^7.0.0",
         "ajv": "^6.10.0",
-        "chalk": "^2.1.0",
-        "cross-spawn": "^6.0.5",
+        "chalk": "^4.0.0",
+        "cross-spawn": "^7.0.2",
         "debug": "^4.0.1",
         "doctrine": "^3.0.0",
-        "eslint-scope": "^5.0.0",
-        "eslint-utils": "^1.4.3",
-        "eslint-visitor-keys": "^1.1.0",
-        "espree": "^6.1.2",
-        "esquery": "^1.0.1",
+        "enquirer": "^2.3.5",
+        "eslint-scope": "^5.1.0",
+        "eslint-utils": "^2.0.0",
+        "eslint-visitor-keys": "^1.2.0",
+        "espree": "^7.1.0",
+        "esquery": "^1.2.0",
         "esutils": "^2.0.2",
         "file-entry-cache": "^5.0.1",
         "functional-red-black-tree": "^1.0.1",
@@ -2082,47 +2213,68 @@
         "ignore": "^4.0.6",
         "import-fresh": "^3.0.0",
         "imurmurhash": "^0.1.4",
-        "inquirer": "^7.0.0",
         "is-glob": "^4.0.0",
         "js-yaml": "^3.13.1",
         "json-stable-stringify-without-jsonify": "^1.0.1",
-        "levn": "^0.3.0",
+        "levn": "^0.4.1",
         "lodash": "^4.17.14",
         "minimatch": "^3.0.4",
-        "mkdirp": "^0.5.1",
         "natural-compare": "^1.4.0",
-        "optionator": "^0.8.3",
+        "optionator": "^0.9.1",
         "progress": "^2.0.0",
-        "regexpp": "^2.0.1",
-        "semver": "^6.1.2",
-        "strip-ansi": "^5.2.0",
-        "strip-json-comments": "^3.0.1",
+        "regexpp": "^3.1.0",
+        "semver": "^7.2.1",
+        "strip-ansi": "^6.0.0",
+        "strip-json-comments": "^3.1.0",
         "table": "^5.2.3",
         "text-table": "^0.2.0",
         "v8-compile-cache": "^2.0.3"
       },
       "dependencies": {
         "ansi-regex": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg=="
         },
         "ansi-styles": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "version": "4.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
+          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
           "requires": {
-            "color-convert": "^1.9.0"
+            "@types/color-name": "^1.1.1",
+            "color-convert": "^2.0.1"
           }
         },
         "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
           "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+        },
+        "cross-spawn": {
+          "version": "7.0.3",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+          "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+          "requires": {
+            "path-key": "^3.1.0",
+            "shebang-command": "^2.0.0",
+            "which": "^2.0.1"
           }
         },
         "debug": {
@@ -2133,17 +2285,67 @@
             "ms": "^2.1.1"
           }
         },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
+        },
+        "levn": {
+          "version": "0.4.1",
+          "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
+          "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
+          "requires": {
+            "prelude-ls": "^1.2.1",
+            "type-check": "~0.4.0"
+          }
+        },
+        "optionator": {
+          "version": "0.9.1",
+          "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
+          "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
+          "requires": {
+            "deep-is": "^0.1.3",
+            "fast-levenshtein": "^2.0.6",
+            "levn": "^0.4.1",
+            "prelude-ls": "^1.2.1",
+            "type-check": "^0.4.0",
+            "word-wrap": "^1.2.3"
+          }
+        },
+        "path-key": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+          "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="
+        },
+        "prelude-ls": {
+          "version": "1.2.1",
+          "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
+          "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g=="
+        },
         "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
+          "version": "7.3.2",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz",
+          "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ=="
+        },
+        "shebang-command": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+          "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+          "requires": {
+            "shebang-regex": "^3.0.0"
+          }
+        },
+        "shebang-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+          "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="
         },
         "strip-ansi": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
           "requires": {
-            "ansi-regex": "^4.1.0"
+            "ansi-regex": "^5.0.0"
           }
         },
         "strip-json-comments": {
@@ -2152,11 +2354,27 @@
           "integrity": "sha512-e6/d0eBu7gHtdCqFt0xJr642LdToM5/cN4Qb9DbHjVx1CP5RyeM+zH7pbecEmDv/lBqb0QH+6Uqq75rxFPkM0w=="
         },
         "supports-color": {
-          "version": "5.5.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+          "version": "7.1.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
+          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
           "requires": {
-            "has-flag": "^3.0.0"
+            "has-flag": "^4.0.0"
+          }
+        },
+        "type-check": {
+          "version": "0.4.0",
+          "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
+          "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
+          "requires": {
+            "prelude-ls": "^1.2.1"
+          }
+        },
+        "which": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+          "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+          "requires": {
+            "isexe": "^2.0.0"
           }
         }
       }
@@ -2179,44 +2397,44 @@
       }
     },
     "eslint-plugin-prettier": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-3.1.3.tgz",
-      "integrity": "sha512-+HG5jmu/dN3ZV3T6eCD7a4BlAySdN7mLIbJYo0z1cFQuI+r2DiTJEFeF68ots93PsnrMxbzIZ2S/ieX+mkrBeQ==",
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-3.1.4.tgz",
+      "integrity": "sha512-jZDa8z76klRqo+TdGDTFJSavwbnWK2ZpqGKNZ+VvweMW516pDUMmQ2koXvxEE4JhzNvTv+radye/bWGBmA6jmg==",
       "dev": true,
       "requires": {
         "prettier-linter-helpers": "^1.0.0"
       }
     },
     "eslint-scope": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.0.0.tgz",
-      "integrity": "sha512-oYrhJW7S0bxAFDvWqzvMPRm6pcgcnWc4QnofCAqRTRfQC0JcwenzGglTtsLyIuuWFfkqDG9vz67cnttSd53djw==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.0.tgz",
+      "integrity": "sha512-iiGRvtxWqgtx5m8EyQUJihBloE4EnYeGE/bz1wSPwJE6tZuJUtHlhqDM4Xj2ukE8Dyy1+HCZ4hE0fzIVMzb58w==",
       "requires": {
         "esrecurse": "^4.1.0",
         "estraverse": "^4.1.1"
       }
     },
     "eslint-utils": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.3.tgz",
-      "integrity": "sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",
+      "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
       "requires": {
         "eslint-visitor-keys": "^1.1.0"
       }
     },
     "eslint-visitor-keys": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz",
-      "integrity": "sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A=="
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
+      "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ=="
     },
     "espree": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-6.2.1.tgz",
-      "integrity": "sha512-ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw==",
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-7.1.0.tgz",
+      "integrity": "sha512-dcorZSyfmm4WTuTnE5Y7MEN1DyoPYy1ZR783QW1FJoenn7RailyWFsq/UL6ZAAA7uXurN9FIpYyUs3OfiIW+Qw==",
       "requires": {
-        "acorn": "^7.1.1",
+        "acorn": "^7.2.0",
         "acorn-jsx": "^5.2.0",
-        "eslint-visitor-keys": "^1.1.0"
+        "eslint-visitor-keys": "^1.2.0"
       }
     },
     "esprima": {
@@ -2225,17 +2443,17 @@
       "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="
     },
     "esquery": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.2.0.tgz",
-      "integrity": "sha512-weltsSqdeWIX9G2qQZz7KlTRJdkkOCTPgLYJUz1Hacf48R4YOwGPHO3+ORfWedqJKbq5WQmsgK90n+pFLIKt/Q==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.3.1.tgz",
+      "integrity": "sha512-olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ==",
       "requires": {
-        "estraverse": "^5.0.0"
+        "estraverse": "^5.1.0"
       },
       "dependencies": {
         "estraverse": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.0.0.tgz",
-          "integrity": "sha512-j3acdrMzqrxmJTNj5dbr1YbjacrYgAxVMeF0gK16E3j494mOe7xygM/ZLIguEQ0ETwAg2hlJCtHRGav+y0Ny5A=="
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.1.0.tgz",
+          "integrity": "sha512-FyohXK+R0vE+y1nHLoBM7ZTyqRpqAlhdZHCWIWEviFLiGB8b04H6bQs8G+XTthacvT8VuwvteiP7RJSxMs8UEw=="
         }
       }
     },
@@ -2392,26 +2610,6 @@
         "is-extendable": "^0.1.0"
       }
     },
-    "external-editor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz",
-      "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==",
-      "requires": {
-        "chardet": "^0.7.0",
-        "iconv-lite": "^0.4.24",
-        "tmp": "^0.0.33"
-      },
-      "dependencies": {
-        "iconv-lite": {
-          "version": "0.4.24",
-          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-          "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-          "requires": {
-            "safer-buffer": ">= 2.1.2 < 3"
-          }
-        }
-      }
-    },
     "extract-zip": {
       "version": "1.7.0",
       "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.7.0.tgz",
@@ -2455,9 +2653,9 @@
       "dev": true
     },
     "fast-glob": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.2.tgz",
-      "integrity": "sha512-UDV82o4uQyljznxwMxyVRJgZZt3O5wENYojjzbaGEGZgeOxkLFf+V4cnUD+krzb2F72E18RhamkMZ7AdeggF7A==",
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.4.tgz",
+      "integrity": "sha512-kr/Oo6PX51265qeuCYsyGypiO5uJFgBS0jksyG7FUeCyQzNwYnzrNIMR1NXfkZXsMYXYLRAHgISHBz8gQcxKHQ==",
       "dev": true,
       "requires": {
         "@nodelib/fs.stat": "^2.0.2",
@@ -2479,9 +2677,9 @@
       "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc="
     },
     "fastq": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.7.0.tgz",
-      "integrity": "sha512-YOadQRnHd5q6PogvAR/x62BGituF2ufiEA6s8aavQANw5YKHERI4AREboX6KotzP8oX2klxYF2wcV/7bn1clfQ==",
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.8.0.tgz",
+      "integrity": "sha512-SMIZoZdLh/fgofivvIkmknUXyPnvxRE3DhtZ5Me3Mrsk5gyPL42F0xr51TdRXskBxHfMp+07bcYzfsYEsSQA9Q==",
       "dev": true,
       "requires": {
         "reusify": "^1.0.4"
@@ -2510,14 +2708,6 @@
         "sax": "^1.0.0"
       }
     },
-    "figures": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
-      "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
-      "requires": {
-        "escape-string-regexp": "^1.0.5"
-      }
-    },
     "file-entry-cache": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz",
@@ -2602,9 +2792,9 @@
       }
     },
     "flatted": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.1.tgz",
-      "integrity": "sha512-a1hQMktqW9Nmqr5aktAux3JMNqaucxGcjtjWnZLHX7yyPCmlSV3M54nGYbqT8K+0GhF3NBgmJCc3ma+WOgX8Jg=="
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.2.tgz",
+      "integrity": "sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA=="
     },
     "forever-agent": {
       "version": "0.6.1",
@@ -2745,7 +2935,6 @@
       "version": "7.1.3",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
       "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
-      "dev": true,
       "requires": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
@@ -2792,9 +2981,9 @@
       }
     },
     "globby": {
-      "version": "11.0.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.0.tgz",
-      "integrity": "sha512-iuehFnR3xu5wBBtm4xi0dMe92Ob87ufyu/dHwpDYfbcpYpIbrO5OnS8M1vWvrBhSGEJ3/Ecj7gnX76P8YxpPEg==",
+      "version": "11.0.1",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.1.tgz",
+      "integrity": "sha512-iH9RmgwCmUJHi2z5o2l3eTtGBtXek1OYlHrbcxOYugyHLmAsZrPj43OtHThd62Buh/Vv6VyCBD2bdyWcGNQqoQ==",
       "dev": true,
       "requires": {
         "array-union": "^2.1.0",
@@ -2806,9 +2995,9 @@
       },
       "dependencies": {
         "ignore": {
-          "version": "5.1.4",
-          "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.4.tgz",
-          "integrity": "sha512-MzbUSahkTW1u7JpKKjY7LCARd1fU5W2rLdxlM4kdkayuCwZImjkpluF9CM1aLewYJguPDqewLam18Y6AU69A8A==",
+          "version": "5.1.8",
+          "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz",
+          "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==",
           "dev": true
         }
       }
@@ -3235,6 +3424,24 @@
       "integrity": "sha512-Ty8UblRWFEcfSuIaajM34LdPXIhbs1ajEX/BBPv24J+enSVaEVY63xQ6lTO9VRYS5LAoghIG0IDJ+p+IPzKUQQ==",
       "dev": true
     },
+    "ical": {
+      "version": "0.8.0",
+      "resolved": "https://registry.npmjs.org/ical/-/ical-0.8.0.tgz",
+      "integrity": "sha512-/viUSb/RGLLnlgm0lWRlPBtVeQguQRErSPYl3ugnUaKUnzQswKqOG3M8/P1v1AB5NJwlHTuvTq1cs4mpeG2rCg==",
+      "requires": {
+        "rrule": "2.4.1"
+      },
+      "dependencies": {
+        "rrule": {
+          "version": "2.4.1",
+          "resolved": "https://registry.npmjs.org/rrule/-/rrule-2.4.1.tgz",
+          "integrity": "sha512-+NcvhETefswZq13T8nkuEnnQ6YgUeZaqMqVbp+ZiFDPCbp3AVgQIwUvNVDdMNrP05bKZG9ddDULFp0qZZYDrxg==",
+          "requires": {
+            "luxon": "^1.3.3"
+          }
+        }
+      }
+    },
     "iconv-lite": {
       "version": "0.5.1",
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.5.1.tgz",
@@ -3317,108 +3524,6 @@
       "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
       "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw=="
     },
-    "inquirer": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.1.0.tgz",
-      "integrity": "sha512-5fJMWEmikSYu0nv/flMc475MhGbB7TSPd/2IpFV4I4rMklboCH2rQjYY5kKiYGHqUF9gvaambupcJFFG9dvReg==",
-      "requires": {
-        "ansi-escapes": "^4.2.1",
-        "chalk": "^3.0.0",
-        "cli-cursor": "^3.1.0",
-        "cli-width": "^2.0.0",
-        "external-editor": "^3.0.3",
-        "figures": "^3.0.0",
-        "lodash": "^4.17.15",
-        "mute-stream": "0.0.8",
-        "run-async": "^2.4.0",
-        "rxjs": "^6.5.3",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0",
-        "through": "^2.3.6"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg=="
-        },
-        "ansi-styles": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
-          "requires": {
-            "@types/color-name": "^1.1.1",
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-          "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
-        },
-        "is-fullwidth-code-point": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
-        },
-        "run-async": {
-          "version": "2.4.0",
-          "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.0.tgz",
-          "integrity": "sha512-xJTbh/d7Lm7SBhc1tNvTpeCHaEzoyxPrqNlvSdMfBTYwaY++UJFyXUOxAtsRUXjlqOfj8luNaR9vjCh4KeV+pg==",
-          "requires": {
-            "is-promise": "^2.1.0"
-          }
-        },
-        "string-width": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
-          "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
-          "requires": {
-            "emoji-regex": "^8.0.0",
-            "is-fullwidth-code-point": "^3.0.0",
-            "strip-ansi": "^6.0.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-          "requires": {
-            "ansi-regex": "^5.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
     "invert-kv": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz",
@@ -3556,7 +3661,8 @@
     "is-promise": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz",
-      "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o="
+      "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=",
+      "dev": true
     },
     "is-regex": {
       "version": "1.0.5",
@@ -3849,9 +3955,9 @@
       "dev": true
     },
     "known-css-properties": {
-      "version": "0.18.0",
-      "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.18.0.tgz",
-      "integrity": "sha512-69AgJ1rQa7VvUsd2kpvVq+VeObDuo3zrj0CzM5Slmf6yduQFAI2kXPDQJR2IE/u6MSAUOJrwSzjg5vlz8qcMiw==",
+      "version": "0.19.0",
+      "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.19.0.tgz",
+      "integrity": "sha512-eYboRV94Vco725nKMlpkn3nV2+96p9c3gKXRsYqAJSswSENvBhN7n5L+uDhY58xQa0UukWsDMTGELzmD8Q+wTA==",
       "dev": true
     },
     "lazystream": {
@@ -3926,6 +4032,7 @@
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
       "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
+      "dev": true,
       "requires": {
         "prelude-ls": "~1.1.2",
         "type-check": "~0.3.2"
@@ -4199,9 +4306,9 @@
       "dev": true
     },
     "merge2": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.3.0.tgz",
-      "integrity": "sha512-2j4DAdlBOkiSZIsaXk4mTE3sRS02yBHAtfy127xRV3bQUFqXkjHCHLW6Scv7DwNRbIWNHH8zpnz9zMaKXIdvYw==",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
+      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
       "dev": true
     },
     "methods": {
@@ -4240,12 +4347,13 @@
     "mimic-fn": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="
+      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
+      "dev": true
     },
     "min-indent": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.0.tgz",
-      "integrity": "sha1-z8RcN+nsDY8KDsPdTvf3w6vjklY=",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz",
+      "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==",
       "dev": true
     },
     "minimatch": {
@@ -4262,15 +4370,22 @@
       "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
     },
     "minimist-options": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-4.0.2.tgz",
-      "integrity": "sha512-seq4hpWkYSUh1y7NXxzucwAN9yVlBc3Upgdjz8vLCP97jG8kaOmzYrVH/m7tQ1NYD1wdtZbSLfdy4zFmRWuc/w==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz",
+      "integrity": "sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==",
       "dev": true,
       "requires": {
         "arrify": "^1.0.1",
-        "is-plain-obj": "^1.1.0"
+        "is-plain-obj": "^1.1.0",
+        "kind-of": "^6.0.3"
       },
       "dependencies": {
+        "arrify": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
+          "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
+          "dev": true
+        },
         "is-plain-obj": {
           "version": "1.1.0",
           "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
@@ -4670,11 +4785,6 @@
         }
       }
     },
-    "mute-stream": {
-      "version": "0.0.8",
-      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
-      "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA=="
-    },
     "natural-compare": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
@@ -4688,7 +4798,8 @@
     "nice-try": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
-      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="
+      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
+      "dev": true
     },
     "nocache": {
       "version": "2.1.0",
@@ -4718,9 +4829,9 @@
       "dev": true
     },
     "node-releases": {
-      "version": "1.1.53",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.53.tgz",
-      "integrity": "sha512-wp8zyQVwef2hpZ/dJH7SfSrIPD6YoJz6BDQDpGEkcA0s3LpAQoxBIYmfIq6QAhC1DhwsyCgTaTTcONwX8qzCuQ==",
+      "version": "1.1.58",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.58.tgz",
+      "integrity": "sha512-NxBudgVKiRh/2aPWMgPR7bPTX0VPmGx5QBwCtdHitnqFE5/O8DeBXuIMH1nwNnw/aMo6AjOrpsHzfY3UbUJ7yg==",
       "dev": true
     },
     "normalize-package-data": {
@@ -4889,6 +5000,7 @@
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.0.tgz",
       "integrity": "sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==",
+      "dev": true,
       "requires": {
         "mimic-fn": "^2.1.0"
       }
@@ -4921,6 +5033,7 @@
       "version": "0.8.3",
       "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
       "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
+      "dev": true,
       "requires": {
         "deep-is": "~0.1.3",
         "fast-levenshtein": "~2.0.6",
@@ -4954,7 +5067,8 @@
     "os-tmpdir": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ="
+      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
+      "dev": true
     },
     "p-defer": {
       "version": "1.0.0",
@@ -5117,7 +5231,8 @@
     "path-key": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
-      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A="
+      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
+      "dev": true
     },
     "path-parse": {
       "version": "1.0.6",
@@ -5281,9 +5396,9 @@
       "dev": true
     },
     "postcss": {
-      "version": "7.0.27",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.27.tgz",
-      "integrity": "sha512-WuQETPMcW9Uf1/22HWUWP9lgsIC+KEHg2kozMflKjbeUtw9ujvFX6QmIfozaErDkmLWS9WEnEdEe6Uo9/BNTdQ==",
+      "version": "7.0.32",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.32.tgz",
+      "integrity": "sha512-03eXong5NLnNCD05xscnGKGDZ98CyzoqPSMjOe6SuoQY7Z2hIj0Ld1g/O/UQRuOle2aRtiIRDg9tDcTGAkLfKw==",
       "dev": true,
       "requires": {
         "chalk": "^2.4.2",
@@ -5435,12 +5550,12 @@
       }
     },
     "postcss-scss": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-2.0.0.tgz",
-      "integrity": "sha512-um9zdGKaDZirMm+kZFKKVsnKPF7zF7qBAtIfTSnZXD1jZ0JNZIxdB6TxQOjCnlSzLRInVl2v3YdBh/M881C4ug==",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-2.1.1.tgz",
+      "integrity": "sha512-jQmGnj0hSGLd9RscFw9LyuSVAa5Bl1/KBPqG1NQw9w8ND55nY4ZEsdlVuYJvLPpV+y0nwTV5v/4rHPzZRihQbA==",
       "dev": true,
       "requires": {
-        "postcss": "^7.0.0"
+        "postcss": "^7.0.6"
       }
     },
     "postcss-selector-parser": {
@@ -5461,15 +5576,16 @@
       "dev": true
     },
     "postcss-value-parser": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.0.3.tgz",
-      "integrity": "sha512-N7h4pG+Nnu5BEIzyeaaIYWs0LI5XC40OrRh5L60z0QjFsqGWcHcbkBvpe1WYpcIS9yQ8sOi/vIPt1ejQCrMVrg==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz",
+      "integrity": "sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==",
       "dev": true
     },
     "prelude-ls": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
-      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ="
+      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
+      "dev": true
     },
     "prettier": {
       "version": "2.0.5",
@@ -5873,9 +5989,9 @@
       "dev": true
     },
     "regexpp": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-2.0.1.tgz",
-      "integrity": "sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw=="
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.1.0.tgz",
+      "integrity": "sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q=="
     },
     "remark": {
       "version": "12.0.0",
@@ -5889,9 +6005,9 @@
       }
     },
     "remark-parse": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-8.0.1.tgz",
-      "integrity": "sha512-Ye/5W57tdQZWsfkuVyRq9SUWRgECHnDsMuyUMzdSKpTbNPkZeGtoYfsrkeSi4+Xyl0mhcPPddHITXPcCPHrl3w==",
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-8.0.2.tgz",
+      "integrity": "sha512-eMI6kMRjsAGpMXXBAywJwiwAse+KNpmt+BK55Oofy4KvBZEqUDj6mWbGLJZrujoPIPPxDXzn3T9baRlpsm2jnQ==",
       "dev": true,
       "requires": {
         "ccount": "^1.0.0",
@@ -5921,9 +6037,9 @@
       }
     },
     "remark-stringify": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/remark-stringify/-/remark-stringify-8.0.0.tgz",
-      "integrity": "sha512-cABVYVloFH+2ZI5bdqzoOmemcz/ZuhQSH6W6ZNYnLojAUUn3xtX7u+6BpnYp35qHoGr2NFBsERV14t4vCIeW8w==",
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/remark-stringify/-/remark-stringify-8.1.0.tgz",
+      "integrity": "sha512-FSPZv1ds76oAZjurhhuV5qXSUSoz6QRPuwYK38S41sLHwg4oB7ejnmZshj7qwjgYLf93kdz6BOX9j5aidNE7rA==",
       "dev": true,
       "requires": {
         "ccount": "^1.0.0",
@@ -5977,9 +6093,9 @@
       "dev": true
     },
     "request": {
-      "version": "2.88.0",
-      "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz",
-      "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==",
+      "version": "2.88.2",
+      "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
+      "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
       "requires": {
         "aws-sign2": "~0.7.0",
         "aws4": "^1.8.0",
@@ -5988,7 +6104,7 @@
         "extend": "~3.0.2",
         "forever-agent": "~0.6.1",
         "form-data": "~2.3.2",
-        "har-validator": "~5.1.0",
+        "har-validator": "~5.1.3",
         "http-signature": "~1.2.0",
         "is-typedarray": "~1.0.0",
         "isstream": "~0.1.2",
@@ -5998,9 +6114,20 @@
         "performance-now": "^2.1.0",
         "qs": "~6.5.2",
         "safe-buffer": "^5.1.2",
-        "tough-cookie": "~2.4.3",
+        "tough-cookie": "~2.5.0",
         "tunnel-agent": "^0.6.0",
         "uuid": "^3.3.2"
+      },
+      "dependencies": {
+        "tough-cookie": {
+          "version": "2.5.0",
+          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
+          "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
+          "requires": {
+            "psl": "^1.1.28",
+            "punycode": "^2.1.1"
+          }
+        }
       }
     },
     "request-promise-core": {
@@ -6060,15 +6187,6 @@
       "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=",
       "dev": true
     },
-    "restore-cursor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
-      "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
-      "requires": {
-        "onetime": "^5.1.0",
-        "signal-exit": "^3.0.2"
-      }
-    },
     "reusify": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
@@ -6093,21 +6211,6 @@
       "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
       "requires": {
         "glob": "^7.1.3"
-      },
-      "dependencies": {
-        "glob": {
-          "version": "7.1.6",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
-          "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
-          "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^3.0.4",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
-          }
-        }
       }
     },
     "rrule": {
@@ -6154,14 +6257,6 @@
         "rx-lite": "*"
       }
     },
-    "rxjs": {
-      "version": "6.5.5",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.5.tgz",
-      "integrity": "sha512-WfQI+1gohdf0Dai/Bbmk5L5ItH5tYqm3ki2c5GdWhKjalzjg93N3avFjVStyZZz+A2Em+ZxKH5bNghw9UeylGQ==",
-      "requires": {
-        "tslib": "^1.9.0"
-      }
-    },
     "safe-buffer": {
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz",
@@ -6262,6 +6357,7 @@
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
       "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
+      "dev": true,
       "requires": {
         "shebang-regex": "^1.0.0"
       }
@@ -6269,7 +6365,8 @@
     "shebang-regex": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
-      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM="
+      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
+      "dev": true
     },
     "signal-exit": {
       "version": "3.0.2",
@@ -7013,9 +7110,9 @@
       "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ="
     },
     "stringify-entities": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/stringify-entities/-/stringify-entities-3.0.0.tgz",
-      "integrity": "sha512-h7NJJIssprqlyjHT2eQt2W1F+MCcNmwPGlKb0bWEdET/3N44QN3QbUF/ueKCgAssyKRZ3Br9rQ7FcXjHr0qLHw==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/stringify-entities/-/stringify-entities-3.0.1.tgz",
+      "integrity": "sha512-Lsk3ISA2++eJYqBMPKcr/8eby1I6L0gP0NlxF8Zja6c05yr/yCYyb2c9PwXjd08Ib3If1vn1rbs1H5ZtVuOfvQ==",
       "dev": true,
       "requires": {
         "character-entities-html4": "^1.0.0",
@@ -7073,37 +7170,37 @@
       "dev": true
     },
     "stylelint": {
-      "version": "13.3.3",
-      "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-13.3.3.tgz",
-      "integrity": "sha512-j8Oio2T1YNiJc6iXDaPYd74Jg4zOa1bByNm/g9/Nvnq4tDPsIjMi46jhRZyPPktGPwjJ5FwcmCqIRlH6PVP8mA==",
+      "version": "13.6.1",
+      "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-13.6.1.tgz",
+      "integrity": "sha512-XyvKyNE7eyrqkuZ85Citd/Uv3ljGiuYHC6UiztTR6sWS9rza8j3UeQv/eGcQS9NZz/imiC4GKdk1EVL3wst5vw==",
       "dev": true,
       "requires": {
         "@stylelint/postcss-css-in-js": "^0.37.1",
         "@stylelint/postcss-markdown": "^0.36.1",
-        "autoprefixer": "^9.7.6",
+        "autoprefixer": "^9.8.0",
         "balanced-match": "^1.0.0",
-        "chalk": "^4.0.0",
+        "chalk": "^4.1.0",
         "cosmiconfig": "^6.0.0",
         "debug": "^4.1.1",
         "execall": "^2.0.0",
         "file-entry-cache": "^5.0.1",
-        "get-stdin": "^7.0.0",
+        "get-stdin": "^8.0.0",
         "global-modules": "^2.0.0",
-        "globby": "^11.0.0",
+        "globby": "^11.0.1",
         "globjoin": "^0.1.4",
         "html-tags": "^3.1.0",
-        "ignore": "^5.1.4",
+        "ignore": "^5.1.8",
         "import-lazy": "^4.0.0",
         "imurmurhash": "^0.1.4",
-        "known-css-properties": "^0.18.0",
+        "known-css-properties": "^0.19.0",
         "leven": "^3.1.0",
         "lodash": "^4.17.15",
-        "log-symbols": "^3.0.0",
+        "log-symbols": "^4.0.0",
         "mathml-tag-names": "^2.1.3",
-        "meow": "^6.1.0",
+        "meow": "^7.0.1",
         "micromatch": "^4.0.2",
         "normalize-selector": "^0.2.0",
-        "postcss": "^7.0.27",
+        "postcss": "^7.0.32",
         "postcss-html": "^0.36.0",
         "postcss-less": "^3.1.4",
         "postcss-media-query-parser": "^0.2.3",
@@ -7111,10 +7208,10 @@
         "postcss-resolve-nested-selector": "^0.1.1",
         "postcss-safe-parser": "^4.0.2",
         "postcss-sass": "^0.4.4",
-        "postcss-scss": "^2.0.0",
+        "postcss-scss": "^2.1.1",
         "postcss-selector-parser": "^6.0.2",
         "postcss-syntax": "^0.36.2",
-        "postcss-value-parser": "^4.0.3",
+        "postcss-value-parser": "^4.1.0",
         "resolve-from": "^5.0.0",
         "slash": "^3.0.0",
         "specificity": "^0.4.1",
@@ -7124,7 +7221,7 @@
         "sugarss": "^2.0.0",
         "svg-tags": "^1.0.0",
         "table": "^5.4.6",
-        "v8-compile-cache": "^2.1.0",
+        "v8-compile-cache": "^2.1.1",
         "write-file-atomic": "^3.0.3"
       },
       "dependencies": {
@@ -7145,9 +7242,9 @@
           }
         },
         "camelcase": {
-          "version": "5.3.1",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-          "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.0.0.tgz",
+          "integrity": "sha512-8KMDF1Vz2gzOq54ONPJS65IvTUaB1cHJ2DMM7MbPmLZljDH1qpzzLsWdiN9pHh6qvkRVDTi/07+eNGch/oLU4w==",
           "dev": true
         },
         "camelcase-keys": {
@@ -7159,12 +7256,20 @@
             "camelcase": "^5.3.1",
             "map-obj": "^4.0.0",
             "quick-lru": "^4.0.1"
+          },
+          "dependencies": {
+            "camelcase": {
+              "version": "5.3.1",
+              "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+              "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+              "dev": true
+            }
           }
         },
         "chalk": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.0.0.tgz",
-          "integrity": "sha512-N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A==",
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
           "dev": true,
           "requires": {
             "ansi-styles": "^4.1.0",
@@ -7195,6 +7300,12 @@
             "ms": "^2.1.1"
           }
         },
+        "emoji-regex": {
+          "version": "8.0.0",
+          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+          "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+          "dev": true
+        },
         "find-up": {
           "version": "4.1.0",
           "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
@@ -7206,9 +7317,9 @@
           }
         },
         "get-stdin": {
-          "version": "7.0.0",
-          "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-7.0.0.tgz",
-          "integrity": "sha512-zRKcywvrXlXsA0v0i9Io4KDRaAw7+a1ZpjRwl9Wox8PFlVCCHra7E9c4kqXCoCM9nR5tBkaTTZRBoCm60bFqTQ==",
+          "version": "8.0.0",
+          "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-8.0.0.tgz",
+          "integrity": "sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==",
           "dev": true
         },
         "has-flag": {
@@ -7218,9 +7329,9 @@
           "dev": true
         },
         "ignore": {
-          "version": "5.1.4",
-          "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.4.tgz",
-          "integrity": "sha512-MzbUSahkTW1u7JpKKjY7LCARd1fU5W2rLdxlM4kdkayuCwZImjkpluF9CM1aLewYJguPDqewLam18Y6AU69A8A==",
+          "version": "5.1.8",
+          "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz",
+          "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==",
           "dev": true
         },
         "indent-string": {
@@ -7244,6 +7355,15 @@
             "p-locate": "^4.1.0"
           }
         },
+        "log-symbols": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.0.0.tgz",
+          "integrity": "sha512-FN8JBzLx6CzeMrB0tg6pqlGU1wCrXW+ZXGH481kfsBqer0hToTIiHdjH4Mq8xJUbvATujKCvaREGWpGUionraA==",
+          "dev": true,
+          "requires": {
+            "chalk": "^4.0.0"
+          }
+        },
         "map-obj": {
           "version": "4.1.0",
           "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.1.0.tgz",
@@ -7251,22 +7371,24 @@
           "dev": true
         },
         "meow": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/meow/-/meow-6.1.0.tgz",
-          "integrity": "sha512-iIAoeI01v6pmSfObAAWFoITAA4GgiT45m4SmJgoxtZfvI0fyZwhV4d0lTwiUXvAKIPlma05Feb2Xngl52Mj5Cg==",
+          "version": "7.0.1",
+          "resolved": "https://registry.npmjs.org/meow/-/meow-7.0.1.tgz",
+          "integrity": "sha512-tBKIQqVrAHqwit0vfuFPY3LlzJYkEOFyKa3bPgxzNl6q/RtN8KQ+ALYEASYuFayzSAsjlhXj/JZ10rH85Q6TUw==",
           "dev": true,
           "requires": {
             "@types/minimist": "^1.2.0",
-            "camelcase-keys": "^6.1.1",
+            "arrify": "^2.0.1",
+            "camelcase": "^6.0.0",
+            "camelcase-keys": "^6.2.2",
             "decamelize-keys": "^1.1.0",
-            "hard-rejection": "^2.0.0",
-            "minimist-options": "^4.0.1",
+            "hard-rejection": "^2.1.0",
+            "minimist-options": "^4.0.2",
             "normalize-package-data": "^2.5.0",
-            "read-pkg-up": "^7.0.0",
+            "read-pkg-up": "^7.0.1",
             "redent": "^3.0.0",
             "trim-newlines": "^3.0.0",
-            "type-fest": "^0.8.1",
-            "yargs-parser": "^18.1.1"
+            "type-fest": "^0.13.1",
+            "yargs-parser": "^18.1.3"
           }
         },
         "p-limit": {
@@ -7340,6 +7462,14 @@
             "find-up": "^4.1.0",
             "read-pkg": "^5.2.0",
             "type-fest": "^0.8.1"
+          },
+          "dependencies": {
+            "type-fest": {
+              "version": "0.8.1",
+              "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+              "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+              "dev": true
+            }
           }
         },
         "redent": {
@@ -7402,6 +7532,12 @@
           "integrity": "sha512-C4+gOpvmxaSMKuEf9Qc134F1ZuOHVXKRbtEflf4NTtuuJDEIJ9p5PXsalL8SkeRw+qit1Mo+yuvMPAKwWg/1hA==",
           "dev": true
         },
+        "type-fest": {
+          "version": "0.13.1",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.13.1.tgz",
+          "integrity": "sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==",
+          "dev": true
+        },
         "yargs-parser": {
           "version": "18.1.3",
           "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
@@ -7410,14 +7546,22 @@
           "requires": {
             "camelcase": "^5.0.0",
             "decamelize": "^1.2.0"
+          },
+          "dependencies": {
+            "camelcase": {
+              "version": "5.3.1",
+              "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+              "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+              "dev": true
+            }
           }
         }
       }
     },
     "stylelint-config-prettier": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/stylelint-config-prettier/-/stylelint-config-prettier-8.0.1.tgz",
-      "integrity": "sha512-RcjNW7MUaNVqONhJH4+rtlAE3ow/9SsAM0YWV0Lgu3dbTKdWTa/pQXRdFWgoHWpzUKn+9oBKR5x8JdH+20wmgw==",
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/stylelint-config-prettier/-/stylelint-config-prettier-8.0.2.tgz",
+      "integrity": "sha512-TN1l93iVTXpF9NJstlvP7nOu9zY2k+mN0NSFQ/VEGz15ZIP9ohdDZTtCWHs5LjctAhSAzaILULGbgiM0ItId3A==",
       "dev": true
     },
     "stylelint-config-recommended": {
@@ -7544,11 +7688,6 @@
           "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
           "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="
         },
-        "emoji-regex": {
-          "version": "7.0.3",
-          "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-          "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA=="
-        },
         "is-fullwidth-code-point": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
@@ -7587,7 +7726,8 @@
     "through": {
       "version": "2.3.8",
       "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
-      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU="
+      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
+      "dev": true
     },
     "through2": {
       "version": "0.2.3",
@@ -7602,6 +7742,7 @@
       "version": "0.0.33",
       "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
       "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
+      "dev": true,
       "requires": {
         "os-tmpdir": "~1.0.2"
       }
@@ -7641,6 +7782,7 @@
       "version": "2.4.3",
       "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz",
       "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==",
+      "dev": true,
       "requires": {
         "psl": "^1.1.24",
         "punycode": "^1.4.1"
@@ -7649,7 +7791,8 @@
         "punycode": {
           "version": "1.4.1",
           "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-          "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4="
+          "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
+          "dev": true
         }
       }
     },
@@ -7707,6 +7850,7 @@
       "version": "0.3.2",
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
       "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
+      "dev": true,
       "requires": {
         "prelude-ls": "~1.1.2"
       }
@@ -7916,9 +8060,9 @@
       "integrity": "sha512-pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ=="
     },
     "v8-compile-cache": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.1.0.tgz",
-      "integrity": "sha512-usZBT3PW+LOjM25wbqIlZwPeJV+3OSz3M1k1Ws8snlW39dZyYL9lOGC5FgPVHfk0jKmjiDV8Z0mIbVQPiwFs7g=="
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.1.1.tgz",
+      "integrity": "sha512-8OQ9CL+VWyt3JStj7HX7/ciTL2V3Rl1Wf5OL+SNTm0yK1KvtReVulksyeRnCANHHuUxHlQig+JJDlUhBt1NQDQ=="
     },
     "valid-url": {
       "version": "1.0.9",
@@ -7950,9 +8094,9 @@
       }
     },
     "vfile": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/vfile/-/vfile-4.1.0.tgz",
-      "integrity": "sha512-BaTPalregj++64xbGK6uIlsurN3BCRNM/P2Pg8HezlGzKd1O9PrwIac6bd9Pdx2uTb0QHoioZ+rXKolbVXEgJg==",
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/vfile/-/vfile-4.1.1.tgz",
+      "integrity": "sha512-lRjkpyDGjVlBA7cDQhQ+gNcvB1BGaTHYuSOcY3S7OhDmBtnzX95FhtZZDecSTDm6aajFymyve6S5DN4ZHGezdQ==",
       "dev": true,
       "requires": {
         "@types/unist": "^2.0.0",
@@ -8058,6 +8202,7 @@
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
       "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "dev": true,
       "requires": {
         "isexe": "^2.0.0"
       }
diff --git a/package.json b/package.json
index 8d93e7b6..4b8bf9e8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "magicmirror",
-	"version": "2.12.0-develop",
+	"version": "2.13.0-develop",
 	"description": "The open source modular smart mirror platform.",
 	"main": "js/electron.js",
 	"scripts": {
@@ -15,6 +15,7 @@
 		"test:prettier": "prettier --check **/*.{js,css,json,md,yml}",
 		"test:js": "eslint *.js js/**/*.js modules/default/**/*.js clientonly/*.js serveronly/*.js translations/*.js vendor/*.js tests/**/*.js config/* --config .eslintrc.json --quiet",
 		"test:css": "stylelint css/main.css modules/default/**/*.css --config .stylelintrc.json",
+		"test:calendar": "node ./modules/default/calendar/debug.js",
 		"config:check": "node js/check_config.js",
 		"lint:prettier": "prettier --write **/*.{js,css,json,md,yml}",
 		"lint:js": "eslint *.js js/**/*.js modules/default/**/*.js clientonly/*.js serveronly/*.js translations/*.js vendor/*.js tests/**/*.js config/* --config .eslintrc.json --fix",
@@ -46,7 +47,7 @@
 		"current-week-number": "^1.0.7",
 		"danger": "^3.1.3",
 		"eslint-config-prettier": "^6.11.0",
-		"eslint-plugin-prettier": "^3.1.3",
+		"eslint-plugin-prettier": "^3.1.4",
 		"http-auth": "^3.2.3",
 		"husky": "^4.2.5",
 		"jsdom": "^11.6.2",
@@ -56,8 +57,8 @@
 		"prettier": "^2.0.5",
 		"pretty-quick": "^2.0.1",
 		"spectron": "^8.0.0",
-		"stylelint": "^13.3.3",
-		"stylelint-config-prettier": "^8.0.1",
+		"stylelint": "^13.6.1",
+		"stylelint-config-prettier": "^8.0.2",
 		"stylelint-config-standard": "^20.0.0",
 		"stylelint-prettier": "^1.1.2"
 	},
@@ -67,16 +68,17 @@
 	"dependencies": {
 		"colors": "^1.1.2",
 		"console-stamp": "^0.2.9",
-		"eslint": "^6.8.0",
+		"eslint": "^7.3.0",
 		"express": "^4.16.2",
 		"express-ipfilter": "^1.0.1",
 		"feedme": "latest",
 		"helmet": "^3.21.2",
+		"ical": "^0.8.0",
 		"iconv-lite": "latest",
 		"lodash": "^4.17.15",
 		"module-alias": "^2.2.2",
 		"moment": "latest",
-		"request": "^2.88.0",
+		"request": "^2.88.2",
 		"rrule": "^2.6.2",
 		"rrule-alt": "^2.2.8",
 		"simple-git": "^1.85.0",
diff --git a/serveronly/index.js b/serveronly/index.js
index 44435ec2..9cc7d942 100644
--- a/serveronly/index.js
+++ b/serveronly/index.js
@@ -1,6 +1,8 @@
-var app = require("../js/app.js");
+const app = require("../js/app.js");
+const Log = require("../js/logger.js");
+
 app.start(function (config) {
 	var bindAddress = config.address ? config.address : "localhost";
 	var httpType = config.useHttps ? "https" : "http";
-	console.log("\nReady to go! Please point your browser to: " + httpType + "://" + bindAddress + ":" + config.port);
+	Log.log("\nReady to go! Please point your browser to: " + httpType + "://" + bindAddress + ":" + config.port);
 });
diff --git a/translations/bg.json b/translations/bg.json
index 786f8643..b48b0a2d 100644
--- a/translations/bg.json
+++ b/translations/bg.json
@@ -1,10 +1,10 @@
 {
-	"LOADING": "Зареждане &hellip;",
+	"LOADING": "Зареждане на &hellip;",
 
 	"TODAY": "Днес",
 	"TOMORROW": "Утре",
 	"DAYAFTERTOMORROW": "Вдругиден",
-	"RUNNING": "Свършва на",
+	"RUNNING": "Свършва след",
 	"EMPTY": "Няма предстоящи събития.",
 
 	"WEEK": "Седмица {weekNumber}",
@@ -26,8 +26,8 @@
 	"NW": "СЗ",
 	"NNW": "ССЗ",
 
-	"UPDATE_NOTIFICATION": "Налична актуализация за MagicMirror².",
-	"UPDATE_NOTIFICATION_MODULE": "Налична актуализация за {MODULE_NAME} модул.",
-	"UPDATE_INFO_SINGLE": "Текущата инсталация е изостанала с {COMMIT_COUNT} commit къмита на клон {BRANCH_NAME}.",
-	"UPDATE_INFO_MULTIPLE": "Текущата инсталация е изостанала с {COMMIT_COUNT} commits къмита на клон {BRANCH_NAME}."
+	"UPDATE_NOTIFICATION": "Налична е актуализация за MagicMirror².",
+	"UPDATE_NOTIFICATION_MODULE": "Налична е актуализация за модула „{MODULE_NAME}“.",
+	"UPDATE_INFO_SINGLE": "Инсталираната версия е с {COMMIT_COUNT} ревизия назад от клона „{BRANCH_NAME}“.",
+	"UPDATE_INFO_MULTIPLE": "Инсталираната версия е с {COMMIT_COUNT} ревизии назад от клона „{BRANCH_NAME}“."
 }