diff --git a/advancedcontentfilter/advancedcontentfilter.php b/advancedcontentfilter/advancedcontentfilter.php
index 3f036488..3067b513 100644
--- a/advancedcontentfilter/advancedcontentfilter.php
+++ b/advancedcontentfilter/advancedcontentfilter.php
@@ -35,6 +35,7 @@
 
 use Friendica\App;
 use Friendica\BaseModule;
+use Friendica\Content\Text;
 use Friendica\Content\Text\Markdown;
 use Friendica\Core\Addon;
 use Friendica\Core\Cache;
@@ -206,8 +207,8 @@ function advancedcontentfilter_content(App $a)
 
 		return $html;
 	} else {
-		$t = get_markup_template('settings.tpl', 'addon/advancedcontentfilter/');
-		return replace_macros($t, [
+		$t = Text::getMarkupTemplate('settings.tpl', 'addon/advancedcontentfilter/');
+		return Text::replaceMacros($t, [
 			'$messages' => [
 				'backtosettings'    => L10n::t('Back to Addon Settings'),
 				'title'             => L10n::t('Advanced Content Filter'),
diff --git a/blackout/blackout.php b/blackout/blackout.php
index 9b2d5b62..c317eb4a 100644
--- a/blackout/blackout.php
+++ b/blackout/blackout.php
@@ -49,6 +49,7 @@
  * THE SOFTWARE.
  */
 
+use Friendica\Content\Text;
 use Friendica\Core\Config;
 use Friendica\Core\Addon;
 use Friendica\Core\L10n;
@@ -84,7 +85,7 @@ function blackout_redirect ($a, $b) {
            $date2 = 0;
     }
     if (( $date1 <= $now ) && ( $now <= $date2 )) {
-        logger('redirecting user to blackout page');
+        Text::logger('redirecting user to blackout page');
         System::externalRedirect($myurl);
     }
 }
@@ -96,9 +97,9 @@ function blackout_addon_admin(&$a, &$o) {
     if (! is_string($myend)) { $myend = "YYYY-MM-DD:hhmm"; }
     $myurl   = Config::get('blackout','url');
     if (! is_string($myurl)) { $myurl = "http://www.example.com"; }
-    $t = get_markup_template( "admin.tpl", "addon/blackout/" );
+    $t = Text::getMarkupTemplate( "admin.tpl", "addon/blackout/" );
 
-   $o = replace_macros($t, [
+   $o = Text::replaceMacros($t, [
         '$submit' => L10n::t('Save Settings'),
         '$rurl' => ["rurl", "Redirect URL", $myurl, "all your visitors from the web will be redirected to this URL"],
         '$startdate' => ["startdate", "Begin of the Blackout<br />(YYYY-MM-DD hh:mm)", $mystart, "format is <em>YYYY</em> year, <em>MM</em> month, <em>DD</em> day, <em>hh</em> hour and <em>mm</em> minute"],
diff --git a/blockem/blockem.php b/blockem/blockem.php
index 2a5fd8b6..853a7279 100644
--- a/blockem/blockem.php
+++ b/blockem/blockem.php
@@ -8,6 +8,7 @@
  */
 
 use Friendica\App;
+use Friendica\Content\Text;
 use Friendica\Core\Addon;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
@@ -100,7 +101,7 @@ function blockem_enotify_store(App $a, array &$b)
 				continue;
 			}
 
-			if (link_compare($b['url'], $word)) {
+			if (Text::linkCompare($b['url'], $word)) {
 				$found = true;
 				break;
 			}
@@ -133,7 +134,7 @@ function blockem_prepare_body_content_filter(App $a, array &$hook_data)
 	$found = false;
 
 	foreach ($profiles_array as $word) {
-		if (link_compare($hook_data['item']['author-link'], trim($word))) {
+		if (Text::linkCompare($hook_data['item']['author-link'], trim($word))) {
 			$found = true;
 			break;
 		}
@@ -192,7 +193,7 @@ function blockem_item_photo_menu(App $a, array &$b)
 
 	if (!empty($a->data['blockem'])) {
 		foreach($a->data['blockem'] as $bloke) {
-			if (link_compare($bloke,$author)) {
+			if (Text::linkCompare($bloke,$author)) {
 				$blocked = true;
 				break;
 			}
@@ -231,7 +232,7 @@ function blockem_init(App $a)
 
 		if (count($arr)) {
 			foreach ($arr as $x) {
-				if (!link_compare(trim($x), trim($_GET['unblock']))) {
+				if (!Text::linkCompare(trim($x), trim($_GET['unblock']))) {
 					$newarr[] = $x;
 				}
 			}
diff --git a/blogger/blogger.php b/blogger/blogger.php
index 00563c3a..18333aba 100644
--- a/blogger/blogger.php
+++ b/blogger/blogger.php
@@ -7,6 +7,7 @@
  */
 
 use Friendica\App;
+use Friendica\Content\Text;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Addon;
 use Friendica\Core\L10n;
@@ -177,14 +178,14 @@ function blogger_send(App $a, array &$b)
 		return;
 	}
 
-	$bl_username = xmlify(PConfig::get($b['uid'], 'blogger', 'bl_username'));
-	$bl_password = xmlify(PConfig::get($b['uid'], 'blogger', 'bl_password'));
+	$bl_username = Text::xmlify(PConfig::get($b['uid'], 'blogger', 'bl_username'));
+	$bl_password = Text::xmlify(PConfig::get($b['uid'], 'blogger', 'bl_password'));
 	$bl_blog = PConfig::get($b['uid'], 'blogger', 'bl_blog');
 
 	if ($bl_username && $bl_password && $bl_blog) {
 		$title = '<title>' . (($b['title']) ? $b['title'] : L10n::t('Post from Friendica')) . '</title>';
 		$post = $title . BBCode::convert($b['body']);
-		$post = xmlify($post);
+		$post = Text::xmlify($post);
 
 		$xml = <<< EOT
 <?xml version=\"1.0\" encoding=\"utf-8\"?>
@@ -202,12 +203,12 @@ function blogger_send(App $a, array &$b)
 
 EOT;
 
-		logger('blogger: data: ' . $xml, LOGGER_DATA);
+		Text::logger('blogger: data: ' . $xml, LOGGER_DATA);
 
 		if ($bl_blog !== 'test') {
 			$x = Network::post($bl_blog, $xml)->getBody();
 		}
 
-		logger('posted to blogger: ' . (($x) ? $x : ''), LOGGER_DEBUG);
+		Text::logger('posted to blogger: ' . (($x) ? $x : ''), LOGGER_DEBUG);
 	}
 }
diff --git a/buffer/buffer.php b/buffer/buffer.php
index 048a27da..4eb9a594 100644
--- a/buffer/buffer.php
+++ b/buffer/buffer.php
@@ -8,6 +8,7 @@
 require 'addon/buffer/bufferapp.php';
 
 use Friendica\App;
+use Friendica\Content\Text;
 use Friendica\Content\Text\Plaintext;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
@@ -69,9 +70,9 @@ function buffer_content(App $a)
 
 function buffer_addon_admin(App $a, &$o)
 {
-	$t = get_markup_template("admin.tpl", "addon/buffer/");
+	$t = Text::getMarkupTemplate("admin.tpl", "addon/buffer/");
 
-	$o = replace_macros($t, [
+	$o = Text::replaceMacros($t, [
 		'$submit' => L10n::t('Save Settings'),
 		// name, label, value, help, [extra values]
 		'$client_id' => ['client_id', L10n::t('Client ID'), Config::get('buffer', 'client_id'), ''],
@@ -81,8 +82,8 @@ function buffer_addon_admin(App $a, &$o)
 
 function buffer_addon_admin_post(App $a)
 {
-	$client_id     = ((!empty($_POST['client_id']))     ? notags(trim($_POST['client_id']))     : '');
-	$client_secret = ((!empty($_POST['client_secret'])) ? notags(trim($_POST['client_secret'])) : '');
+	$client_id     = ((!empty($_POST['client_id']))     ? Text::noTags(trim($_POST['client_id']))     : '');
+	$client_secret = ((!empty($_POST['client_secret'])) ? Text::noTags(trim($_POST['client_secret'])) : '');
 
 	Config::set('buffer', 'client_id'    , $client_id);
 	Config::set('buffer', 'client_secret', $client_secret);
@@ -112,7 +113,7 @@ function buffer_connect(App $a)
 	if (!$buffer->ok) {
 		$o .= '<a href="' . $buffer->get_login_url() . '">Connect to Buffer!</a>';
 	} else {
-		logger("buffer_connect: authenticated");
+		Text::logger("buffer_connect: authenticated");
 		$o .= L10n::t("You are now authenticated to buffer. ");
 		$o .= '<br /><a href="' . $a->getBaseURL() . '/settings/connectors">' . L10n::t("return to the connector page") . '</a>';
 		PConfig::set(local_user(), 'buffer','access_token', $buffer->access_token);
@@ -298,7 +299,7 @@ function buffer_send(App $a, array &$b)
 
 		$profiles = $buffer->go('/profiles');
 		if (is_array($profiles)) {
-			logger("Will send these parameter ".print_r($b, true), LOGGER_DEBUG);
+			Text::logger("Will send these parameter ".print_r($b, true), LOGGER_DEBUG);
 
 			foreach ($profiles as $profile) {
 				if (!$profile->default)
@@ -357,7 +358,7 @@ function buffer_send(App $a, array &$b)
 				}
 
 				$post = ItemContent::getPlaintextPost($item, $limit, $includedlinks, $htmlmode);
-				logger("buffer_send: converted message ".$b["id"]." result: ".print_r($post, true), LOGGER_DEBUG);
+				Text::logger("buffer_send: converted message ".$b["id"]." result: ".print_r($post, true), LOGGER_DEBUG);
 
 				// The image proxy is used as a sanitizer. Buffer seems to be really picky about pictures
 				if (isset($post["image"])) {
@@ -407,9 +408,9 @@ function buffer_send(App $a, array &$b)
 				}
 
 				//print_r($message);
-				logger("buffer_send: data for message " . $b["id"] . ": " . print_r($message, true), LOGGER_DEBUG);
+				Text::logger("buffer_send: data for message " . $b["id"] . ": " . print_r($message, true), LOGGER_DEBUG);
 				$ret = $buffer->go('/updates/create', $message);
-				logger("buffer_send: send message " . $b["id"] . " result: " . print_r($ret, true), LOGGER_DEBUG);
+				Text::logger("buffer_send: send message " . $b["id"] . " result: " . print_r($ret, true), LOGGER_DEBUG);
 			}
 		}
 	}
diff --git a/catavatar/catavatar.php b/catavatar/catavatar.php
index b321ae33..c2e6f986 100644
--- a/catavatar/catavatar.php
+++ b/catavatar/catavatar.php
@@ -7,6 +7,7 @@
  */
 
 use Friendica\App;
+use Frienidica\Content\Text;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
@@ -28,7 +29,7 @@ function catavatar_install()
 	Addon::registerHook('addon_settings', 'addon/catavatar/catavatar.php', 'catavatar_addon_settings');
 	Addon::registerHook('addon_settings_post', 'addon/catavatar/catavatar.php', 'catavatar_addon_settings_post');
 
-	logger('registered catavatar');
+	Text::logger('registered catavatar');
 }
 
 /**
@@ -40,7 +41,7 @@ function catavatar_uninstall()
 	Addon::unregisterHook('addon_settings', 'addon/catavatar/catavatar.php', 'catavatar_addon_settings');
 	Addon::unregisterHook('addon_settings_post', 'addon/catavatar/catavatar.php', 'catavatar_addon_settings_post');
 
-	logger('unregistered catavatar');
+	Text::logger('unregistered catavatar');
 }
 
 /**
@@ -52,8 +53,8 @@ function catavatar_addon_settings(App $a, &$s)
 		return;
 	}
 
-	$t = get_markup_template('settings.tpl', 'addon/catavatar/');
-	$s .= replace_macros ($t, [
+	$t = Text::getMarkupTemplate('settings.tpl', 'addon/catavatar/');
+	$s .= Text::replaceMacros ($t, [
 		'$postpost' => !empty($_POST['catavatar-morecat']) || !empty($_POST['catavatar-emailcat']),
 		'$uncache' => time(),
 		'$uid' => local_user(),
diff --git a/curweather/curweather.php b/curweather/curweather.php
index db244c7d..80e245c6 100644
--- a/curweather/curweather.php
+++ b/curweather/curweather.php
@@ -12,6 +12,7 @@
 require_once 'include/text.php';
 
 use Friendica\App;
+use Friendica\Content\Text;
 use Friendica\Core\Addon;
 use Friendica\Core\Cache;
 use Friendica\Core\Config;
@@ -135,8 +136,8 @@ function curweather_network_mod_init(App $a, &$b)
 	}
 
 	if ($ok) {
-		$t = get_markup_template("widget.tpl", "addon/curweather/" );
-		$curweather = replace_macros ($t, [
+		$t = Text::getMarkupTemplate("widget.tpl", "addon/curweather/" );
+		$curweather = Text::replaceMacros ($t, [
 			'$title' => L10n::t("Current Weather"),
 			'$icon' => ProxyUtils::proxifyUrl('http://openweathermap.org/img/w/'.$res['icon'].'.png'),
 			'$city' => $res['city'],
@@ -152,8 +153,8 @@ function curweather_network_mod_init(App $a, &$b)
 			'$showonmap' => L10n::t('Show on map')
 		]);
 	} else {
-		$t = get_markup_template('widget-error.tpl', 'addon/curweather/');
-		$curweather = replace_macros( $t, [
+		$t = Text::getMarkupTemplate('widget-error.tpl', 'addon/curweather/');
+		$curweather = Text::replaceMacros( $t, [
 			'$problem' => L10n::t('There was a problem accessing the weather data. But have a look'),
 			'$rpt' => $rpt,
 			'$atOWM' => L10n::t('at OpenWeatherMap')
@@ -197,9 +198,9 @@ function curweather_addon_settings(App $a, &$s)
 	$enable_checked = (($enable) ? ' checked="checked" ' : '');
 	
 	// load template and replace the macros
-	$t = get_markup_template("settings.tpl", "addon/curweather/" );
+	$t = Text::getMarkupTemplate("settings.tpl", "addon/curweather/" );
 
-	$s = replace_macros ($t, [
+	$s = Text::replaceMacros ($t, [
 		'$submit' => L10n::t('Save Settings'),
 		'$header' => L10n::t('Current Weather').' '.L10n::t('Settings'),
 		'$noappidtext' => $noappidtext,
@@ -237,9 +238,9 @@ function curweather_addon_admin(App $a, &$o)
 	$appid = Config::get('curweather', 'appid');
 	$cachetime = Config::get('curweather', 'cachetime');
 
-	$t = get_markup_template("admin.tpl", "addon/curweather/" );
+	$t = Text::getMarkupTemplate("admin.tpl", "addon/curweather/" );
 
-	$o = replace_macros ($t, [
+	$o = Text::replaceMacros ($t, [
 		'$submit' => L10n::t('Save Settings'),
 		'$cachetime' => [
 			'cachetime',
diff --git a/diaspora/diaspora.php b/diaspora/diaspora.php
index 44bc1f74..bb34bac0 100644
--- a/diaspora/diaspora.php
+++ b/diaspora/diaspora.php
@@ -10,6 +10,7 @@
 require_once 'addon/diaspora/Diaspora_Connection.php';
 
 use Friendica\App;
+use Friendica\Content\Text;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Addon;
 use Friendica\Core\L10n;
@@ -72,7 +73,7 @@ function diaspora_queue_hook(App $a, &$b) {
 			continue;
 		}
 
-		logger('diaspora_queue: run');
+		Text::logger('diaspora_queue: run');
 
 		$r = q("SELECT `user`.* FROM `user` LEFT JOIN `contact` on `contact`.`uid` = `user`.`uid`
 			WHERE `contact`.`self` = 1 AND `contact`.`id` = %d LIMIT 1",
@@ -92,37 +93,37 @@ function diaspora_queue_hook(App $a, &$b) {
 		$success = false;
 
 		if ($handle && $password) {
-			logger('diaspora_queue: able to post for user '.$handle);
+			Text::logger('diaspora_queue: able to post for user '.$handle);
 
 			$z = unserialize($x['content']);
 
 			$post = $z['post'];
 
-			logger('diaspora_queue: post: '.$post, LOGGER_DATA);
+			Text::logger('diaspora_queue: post: '.$post, LOGGER_DATA);
 
 			try {
-				logger('diaspora_queue: prepare', LOGGER_DEBUG);
+				Text::logger('diaspora_queue: prepare', LOGGER_DEBUG);
 				$conn = new Diaspora_Connection($handle, $password);
-				logger('diaspora_queue: try to log in '.$handle, LOGGER_DEBUG);
+				Text::logger('diaspora_queue: try to log in '.$handle, LOGGER_DEBUG);
 				$conn->logIn();
-				logger('diaspora_queue: try to send '.$body, LOGGER_DEBUG);
+				Text::logger('diaspora_queue: try to send '.$body, LOGGER_DEBUG);
 				$conn->provider = $hostname;
 				$conn->postStatusMessage($post, $aspect);
 
-				logger('diaspora_queue: send '.$userdata['uid'].' success', LOGGER_DEBUG);
+				Text::logger('diaspora_queue: send '.$userdata['uid'].' success', LOGGER_DEBUG);
 
 				$success = true;
 
 				Queue::removeItem($x['id']);
 			} catch (Exception $e) {
-				logger("diaspora_queue: Send ".$userdata['uid']." failed: ".$e->getMessage(), LOGGER_DEBUG);
+				Text::logger("diaspora_queue: Send ".$userdata['uid']." failed: ".$e->getMessage(), LOGGER_DEBUG);
 			}
 		} else {
-			logger('diaspora_queue: send '.$userdata['uid'].' missing username or password', LOGGER_DEBUG);
+			Text::logger('diaspora_queue: send '.$userdata['uid'].' missing username or password', LOGGER_DEBUG);
 		}
 
 		if (!$success) {
-			logger('diaspora_queue: delayed');
+			Text::logger('diaspora_queue: delayed');
 			Queue::updateTime($x['id']);
 		}
 	}
@@ -289,7 +290,7 @@ function diaspora_send(App $a, array &$b)
 {
 	$hostname = $a->getHostName();
 
-	logger('diaspora_send: invoked');
+	Text::logger('diaspora_send: invoked');
 
 	if ($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited'])) {
 		return;
@@ -311,14 +312,14 @@ function diaspora_send(App $a, array &$b)
 		return;
 	}
 
-	logger('diaspora_send: prepare posting', LOGGER_DEBUG);
+	Text::logger('diaspora_send: prepare posting', LOGGER_DEBUG);
 
 	$handle = PConfig::get($b['uid'],'diaspora','handle');
 	$password = PConfig::get($b['uid'],'diaspora','password');
 	$aspect = PConfig::get($b['uid'],'diaspora','aspect');
 
 	if ($handle && $password) {
-		logger('diaspora_send: all values seem to be okay', LOGGER_DEBUG);
+		Text::logger('diaspora_send: all values seem to be okay', LOGGER_DEBUG);
 
 		$tag_arr = [];
 		$tags = '';
@@ -363,20 +364,20 @@ function diaspora_send(App $a, array &$b)
 		require_once "addon/diaspora/diasphp.php";
 
 		try {
-			logger('diaspora_send: prepare', LOGGER_DEBUG);
+			Text::logger('diaspora_send: prepare', LOGGER_DEBUG);
 			$conn = new Diaspora_Connection($handle, $password);
-			logger('diaspora_send: try to log in '.$handle, LOGGER_DEBUG);
+			Text::logger('diaspora_send: try to log in '.$handle, LOGGER_DEBUG);
 			$conn->logIn();
-			logger('diaspora_send: try to send '.$body, LOGGER_DEBUG);
+			Text::logger('diaspora_send: try to send '.$body, LOGGER_DEBUG);
 
 			$conn->provider = $hostname;
 			$conn->postStatusMessage($body, $aspect);
 
-			logger('diaspora_send: success');
+			Text::logger('diaspora_send: success');
 		} catch (Exception $e) {
-			logger("diaspora_send: Error submitting the post: " . $e->getMessage());
+			Text::logger("diaspora_send: Error submitting the post: " . $e->getMessage());
 
-			logger('diaspora_send: requeueing '.$b['uid'], LOGGER_DEBUG);
+			Text::logger('diaspora_send: requeueing '.$b['uid'], LOGGER_DEBUG);
 
 			$r = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `self`", $b['uid']);
 			if (count($r))
diff --git a/dwpost/dwpost.php b/dwpost/dwpost.php
index bc8959fc..4766ef5c 100644
--- a/dwpost/dwpost.php
+++ b/dwpost/dwpost.php
@@ -9,6 +9,7 @@
  */
 
 use Friendica\App;
+use Friendica\Content\Text;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Addon;
 use Friendica\Core\L10n;
@@ -188,7 +189,7 @@ function dwpost_send(App $a, array &$b)
 	if ($dw_username && $dw_password && $dw_blog) {
 		$title = $b['title'];
 		$post = BBCode::convert($b['body']);
-		$post = xmlify($post);
+		$post = Text::xmlify($post);
 		$tags = dwpost_get_tags($b['tag']);
 
 		$date = DateTimeFormat::convert($b['created'], $tz);
@@ -225,13 +226,13 @@ function dwpost_send(App $a, array &$b)
 
 EOT;
 
-		logger('dwpost: data: ' . $xml, LOGGER_DATA);
+		Text::logger('dwpost: data: ' . $xml, LOGGER_DATA);
 
 		if ($dw_blog !== 'test') {
 			$x = Network::post($dw_blog, $xml, ["Content-Type: text/xml"])->getBody();
 		}
 
-		logger('posted to dreamwidth: ' . ($x) ? $x : '', LOGGER_DEBUG);
+		Text::logger('posted to dreamwidth: ' . ($x) ? $x : '', LOGGER_DEBUG);
 	}
 }
 
diff --git a/forumdirectory/forumdirectory.php b/forumdirectory/forumdirectory.php
index 54818cdb..64e8c554 100644
--- a/forumdirectory/forumdirectory.php
+++ b/forumdirectory/forumdirectory.php
@@ -9,6 +9,7 @@
 use Friendica\App;
 use Friendica\Content\Nav;
 use Friendica\Content\Pager;
+use Friendica\Content\Text;
 use Friendica\Content\Widget;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
@@ -71,12 +72,12 @@ function forumdirectory_content(App $a)
 	Nav::setSelected('directory');
 
 	if (!empty($a->data['search'])) {
-		$search = notags(trim($a->data['search']));
+		$search = Text::noTags(trim($a->data['search']));
 	} else {
-		$search = ((!empty($_GET['search'])) ? notags(trim(rawurldecode($_GET['search']))) : '');
+		$search = ((!empty($_GET['search'])) ? Text::noTags(trim(rawurldecode($_GET['search']))) : '');
 	}
 
-	$tpl = get_markup_template('directory_header.tpl');
+	$tpl = Text::getMarkupTemplate('directory_header.tpl');
 
 	$globaldir = '';
 	$gdirpath = Config::get('system', 'directory');
@@ -87,7 +88,7 @@ function forumdirectory_content(App $a)
 
 	$admin = '';
 
-	$o .= replace_macros($tpl, [
+	$o .= Text::replaceMacros($tpl, [
 		'$search'    => $search,
 		'$globaldir' => $globaldir,
 		'$desc'      => L10n::t('Find on this site'),
@@ -187,9 +188,9 @@ function forumdirectory_content(App $a)
 			$homepage = !empty($profile['homepage']) ? L10n::t('Homepage:') : false;
 			$about    = !empty($profile['about'])    ? L10n::t('About:')    : false;
 
-			$tpl = get_markup_template('forumdirectory_item.tpl', 'addon/forumdirectory/');
+			$tpl = Text::getMarkupTemplate('forumdirectory_item.tpl', 'addon/forumdirectory/');
 
-			$entry = replace_macros($tpl, [
+			$entry = Text::replaceMacros($tpl, [
 				'$id'           => $rr['id'],
 				'$profile_link' => $profile_link,
 				'$photo'        => $rr[$photo],
diff --git a/fromapp/fromapp.php b/fromapp/fromapp.php
index 6a33cd03..73543799 100644
--- a/fromapp/fromapp.php
+++ b/fromapp/fromapp.php
@@ -6,6 +6,7 @@
  * Author: Commander Zot
  *
  */
+use Friendica\Content\Text;
 use Friendica\Core\Addon;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
@@ -15,7 +16,7 @@ function fromapp_install()
 	Addon::registerHook('post_local', 'addon/fromapp/fromapp.php', 'fromapp_post_hook');
 	Addon::registerHook('addon_settings', 'addon/fromapp/fromapp.php', 'fromapp_settings');
 	Addon::registerHook('addon_settings_post', 'addon/fromapp/fromapp.php', 'fromapp_settings_post');
-	logger("installed fromapp");
+	Text::logger("installed fromapp");
 }
 
 
@@ -24,7 +25,7 @@ function fromapp_uninstall()
 	Addon::unregisterHook('post_local', 'addon/fromapp/fromapp.php', 'fromapp_post_hook');
 	Addon::unregisterHook('addon_settings', 'addon/fromapp/fromapp.php', 'fromapp_settings');
 	Addon::unregisterHook('addon_settings_post', 'addon/fromapp/fromapp.php', 'fromapp_settings_post');
-	logger("removed fromapp");
+	Text::logger("removed fromapp");
 }
 
 function fromapp_settings_post($a, $post)
diff --git a/fromgplus/fromgplus.php b/fromgplus/fromgplus.php
index 9dc48753..5971cf58 100644
--- a/fromgplus/fromgplus.php
+++ b/fromgplus/fromgplus.php
@@ -9,6 +9,7 @@
 
 define('FROMGPLUS_DEFAULT_POLL_INTERVAL', 30); // given in minutes
 
+use Friendica\Content\Text;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
@@ -101,9 +102,9 @@ function fromgplus_addon_settings_post(&$a,&$b) {
 
 function fromgplus_addon_admin(&$a, &$o)
 {
-	$t = get_markup_template("admin.tpl", "addon/fromgplus/");
+	$t = Text::getMarkupTemplate("admin.tpl", "addon/fromgplus/");
 
-	$o = replace_macros($t, [
+	$o = Text::replaceMacros($t, [
 			'$submit' => L10n::t('Save Settings'),
 			'$key' => ['key', L10n::t('Key'), trim(Config::get('fromgplus', 'key')), ''],
 	]);
@@ -126,25 +127,25 @@ function fromgplus_cron($a,$b) {
         if($last) {
                 $next = $last + ($poll_interval * 60);
                 if($next > time()) {
-			logger('fromgplus: poll intervall not reached');
+			Text::logger('fromgplus: poll intervall not reached');
                         return;
 		}
 	}
 
-        logger('fromgplus: cron_start');
+        Text::logger('fromgplus: cron_start');
 
         $r = q("SELECT * FROM `pconfig` WHERE `cat` = 'fromgplus' AND `k` = 'enable' AND `v` = '1' ORDER BY RAND() ");
         if(count($r)) {
                 foreach($r as $rr) {
 			$account = PConfig::get($rr['uid'],'fromgplus','account');
 			if ($account) {
-		        logger('fromgplus: fetching for user '.$rr['uid']);
+		        Text::logger('fromgplus: fetching for user '.$rr['uid']);
 				fromgplus_fetch($a, $rr['uid']);
 			}
 		}
 	}
 
-        logger('fromgplus: cron_end');
+        Text::logger('fromgplus: cron_end');
 
 	Config::set('fromgplus','last_poll', time());
 }
@@ -190,15 +191,15 @@ function fromgplus_post($a, $uid, $source, $body, $location, $coord, $id) {
 	$_REQUEST['coord'] = $coord;
 
 	if (($_REQUEST['title'] == "") && ($_REQUEST['body'] == "")) {
-	        logger('fromgplus: empty post for user '.$uid." ".print_r($_REQUEST, true));
+	        Text::logger('fromgplus: empty post for user '.$uid." ".print_r($_REQUEST, true));
 		return;
 	}
 
 	require_once('mod/item.php');
 	//print_r($_REQUEST);
-        logger('fromgplus: posting for user '.$uid." ".print_r($_REQUEST, true));
+        Text::logger('fromgplus: posting for user '.$uid." ".print_r($_REQUEST, true));
 	item_post($a);
-        logger('fromgplus: done for user '.$uid);
+        Text::logger('fromgplus: done for user '.$uid);
 }
 
 function fromgplus_html2bbcode($html) {
@@ -472,7 +473,7 @@ function fromgplus_fetch($a, $uid) {
 
 		// Don't publish items that are too young
 		if (strtotime($item->published) > (time() - 3*60)) {
-			logger('fromgplus_fetch: item too new '.$item->published);
+			Text::logger('fromgplus_fetch: item too new '.$item->published);
 			continue;
 		}
 
diff --git a/geocoordinates/geocoordinates.php b/geocoordinates/geocoordinates.php
index 89ccd883..9368d70a 100644
--- a/geocoordinates/geocoordinates.php
+++ b/geocoordinates/geocoordinates.php
@@ -5,6 +5,8 @@
  * Version: 0.1
  * Author: Michael Vogel <https://pirati.ca/profile/heluecht>
  */
+
+use Friendica\Content\Text;
 use Friendica\Core\Addon;
 use Friendica\Core\Cache;
 use Friendica\Core\Config;
@@ -54,25 +56,25 @@ function geocoordinates_resolve_item(&$item)
 	$s = Network::fetchUrl("https://api.opencagedata.com/geocode/v1/json?q=".$coords[0].",".$coords[1]."&key=".$key."&language=".$language);
 
 	if (!$s) {
-		logger("API could not be queried", LOGGER_DEBUG);
+		Text::logger("API could not be queried", LOGGER_DEBUG);
 		return;
 	}
 
 	$data = json_decode($s);
 
 	if ($data->status->code != "200") {
-		logger("API returned error ".$data->status->code." ".$data->status->message, LOGGER_DEBUG);
+		Text::logger("API returned error ".$data->status->code." ".$data->status->message, LOGGER_DEBUG);
 		return;
 	}
 
 	if (($data->total_results == 0) || (count($data->results) == 0)) {
-		logger("No results found for coordinates ".$item["coord"], LOGGER_DEBUG);
+		Text::logger("No results found for coordinates ".$item["coord"], LOGGER_DEBUG);
 		return;
 	}
 
 	$item["location"] = $data->results[0]->formatted;
 
-	logger("Got location for coordinates ".$coords[0]."-".$coords[1].": ".$item["location"], LOGGER_DEBUG);
+	Text::logger("Got location for coordinates ".$coords[0]."-".$coords[1].": ".$item["location"], LOGGER_DEBUG);
 
 	if ($item["location"] != "")
 		Cache::set("geocoordinates:".$language.":".$coords[0]."-".$coords[1], $item["location"]);
@@ -86,9 +88,9 @@ function geocoordinates_post_hook($a, &$item)
 function geocoordinates_addon_admin(&$a, &$o)
 {
 
-	$t = get_markup_template("admin.tpl", "addon/geocoordinates/");
+	$t = Text::getMarkupTemplate("admin.tpl", "addon/geocoordinates/");
 
-	$o = replace_macros($t, [
+	$o = Text::replaceMacros($t, [
 		'$submit' => L10n::t('Save Settings'),
 		'$api_key' => ['api_key', L10n::t('API Key'), Config::get('geocoordinates', 'api_key'), ''],
 		'$language' => ['language', L10n::t('Language code (IETF format)'), Config::get('geocoordinates', 'language'), ''],
@@ -97,10 +99,10 @@ function geocoordinates_addon_admin(&$a, &$o)
 
 function geocoordinates_addon_admin_post(&$a)
 {
-	$api_key  = ((x($_POST, 'api_key')) ? notags(trim($_POST['api_key']))   : '');
+	$api_key  = ((x($_POST, 'api_key')) ? Text::noTags(trim($_POST['api_key']))   : '');
 	Config::set('geocoordinates', 'api_key', $api_key);
 
-	$language  = ((x($_POST, 'language')) ? notags(trim($_POST['language']))   : '');
+	$language  = ((x($_POST, 'language')) ? Text::noTags(trim($_POST['language']))   : '');
 	Config::set('geocoordinates', 'language', $language);
 	info(L10n::t('Settings updated.'). EOL);
 }
diff --git a/geonames/geonames.php b/geonames/geonames.php
index dc6e116b..2ea4bb4a 100644
--- a/geonames/geonames.php
+++ b/geonames/geonames.php
@@ -21,6 +21,7 @@
  * system will call the name_uninstall() function.
  *
  */
+use Friendica\Content\Text;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
@@ -52,7 +53,7 @@ function geonames_install() {
 	Addon::registerHook('addon_settings', 'addon/geonames/geonames.php', 'geonames_addon_admin');
 	Addon::registerHook('addon_settings_post', 'addon/geonames/geonames.php', 'geonames_addon_admin_post');
 
-	logger("installed geonames");
+	Text::logger("installed geonames");
 }
 
 
@@ -72,7 +73,7 @@ function geonames_uninstall() {
 	Addon::unregisterHook('addon_settings_post', 'addon/geonames/geonames.php', 'geonames_addon_admin_post');
 
 
-	logger("removed geonames");
+	Text::logger("removed geonames");
 }
 
 function geonames_load_config(\Friendica\App $a)
@@ -91,7 +92,7 @@ function geonames_post_hook($a, &$item) {
 	 *
 	 */
 
-	logger('geonames invoked');
+	Text::logger('geonames invoked');
 
 	if(! local_user())   /* non-zero if this is a logged in user of this system */
 		return;
@@ -132,7 +133,7 @@ function geonames_post_hook($a, &$item) {
 		$item['location'] = $xml->geoname->name . ', ' . $xml->geoname->countryName;
 
 
-//	logger('geonames : ' . print_r($xml,true), LOGGER_DATA);
+//	Text::logger('geonames : ' . print_r($xml,true), LOGGER_DATA);
 	return;
 }
 
diff --git a/gnot/gnot.php b/gnot/gnot.php
index 2c4555ba..8a7284b1 100644
--- a/gnot/gnot.php
+++ b/gnot/gnot.php
@@ -7,6 +7,7 @@
  * 
  *
  */
+use Friendica\Content\Text;
 use Friendica\Core\Addon;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
@@ -17,7 +18,7 @@ function gnot_install() {
 	Addon::registerHook('addon_settings_post', 'addon/gnot/gnot.php', 'gnot_settings_post');
 	Addon::registerHook('enotify_mail', 'addon/gnot/gnot.php', 'gnot_enotify_mail');
 
-	logger("installed gnot");
+	Text::logger("installed gnot");
 }
 
 
@@ -28,7 +29,7 @@ function gnot_uninstall() {
 	Addon::unregisterHook('enotify_mail', 'addon/gnot/gnot.php', 'gnot_enotify_mail');
 
 
-	logger("removed gnot");
+	Text::logger("removed gnot");
 }
 
 
diff --git a/googlemaps/googlemaps.php b/googlemaps/googlemaps.php
index e294c8e0..58374cf5 100644
--- a/googlemaps/googlemaps.php
+++ b/googlemaps/googlemaps.php
@@ -6,6 +6,7 @@
  * Author: Michael Vogel <https://pirati.ca/profile/heluecht>
  *
  */
+use Friendica\Content\Text;
 use Friendica\Core\Addon;
 use Friendica\Core\Cache;
 
@@ -13,14 +14,14 @@ function googlemaps_install()
 {
 	Addon::registerHook('render_location', 'addon/googlemaps/googlemaps.php', 'googlemaps_location');
 
-	logger("installed googlemaps");
+	Text::logger("installed googlemaps");
 }
 
 function googlemaps_uninstall()
 {
 	Addon::unregisterHook('render_location', 'addon/googlemaps/googlemaps.php', 'googlemaps_location');
 
-	logger("removed googlemaps");
+	Text::logger("removed googlemaps");
 }
 
 function googlemaps_location($a, &$item)
diff --git a/gravatar/gravatar.php b/gravatar/gravatar.php
index 9a23edfe..c263bdec 100644
--- a/gravatar/gravatar.php
+++ b/gravatar/gravatar.php
@@ -8,6 +8,7 @@
 
 use Friendica\App;
 use Friendica\BaseModule;
+use Friendica\Content\Text;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
@@ -21,7 +22,7 @@ function gravatar_install() {
 	Addon::registerHook('load_config',   'addon/gravatar/gravatar.php', 'gravatar_load_config');
 	Addon::registerHook('avatar_lookup', 'addon/gravatar/gravatar.php', 'gravatar_lookup');
 
-	logger("registered gravatar in avatar_lookup hook");
+	Text::logger("registered gravatar in avatar_lookup hook");
 }
 
 /**
@@ -31,7 +32,7 @@ function gravatar_uninstall() {
 	Addon::unregisterHook('load_config',   'addon/gravatar/gravatar.php', 'gravatar_load_config');
 	Addon::unregisterHook('avatar_lookup', 'addon/gravatar/gravatar.php', 'gravatar_lookup');
 
-	logger("unregistered gravatar in avatar_lookup hook");
+	Text::logger("unregistered gravatar in avatar_lookup hook");
 }
 
 function gravatar_load_config(App $a)
@@ -70,7 +71,7 @@ function gravatar_lookup($a, &$b) {
  * Display admin settings for this addon
  */
 function gravatar_addon_admin (&$a, &$o) {
-	$t = get_markup_template( "admin.tpl", "addon/gravatar/" );
+	$t = Text::getMarkupTemplate( "admin.tpl", "addon/gravatar/" );
 
 	$default_avatar = Config::get('gravatar', 'default_avatar');
 	$rating = Config::get('gravatar', 'rating');
@@ -106,7 +107,7 @@ function gravatar_addon_admin (&$a, &$o) {
 
 	// output Gravatar settings
 	$o .= '<input type="hidden" name="form_security_token" value="' . BaseModule::getFormSecurityToken("gravatarsave") .'">';
-	$o .= replace_macros( $t, [
+	$o .= Text::replaceMacros( $t, [
 		'$submit' => L10n::t('Save Settings'),
 		'$default_avatar' => ['avatar', L10n::t('Default avatar image'), $default_avatar, L10n::t('Select default avatar image if none was found at Gravatar. See README'), $default_avatars],
 		'$rating' => ['rating', L10n::t('Rating of images'), $rating, L10n::t('Select the appropriate avatar rating for your site. See README'), $ratings],
@@ -119,8 +120,8 @@ function gravatar_addon_admin (&$a, &$o) {
 function gravatar_addon_admin_post (&$a) {
 	BaseModule::checkFormSecurityToken('gravatarsave');
 
-	$default_avatar = ((x($_POST, 'avatar')) ? notags(trim($_POST['avatar'])) : 'identicon');
-	$rating = ((x($_POST, 'rating')) ? notags(trim($_POST['rating'])) : 'g');
+	$default_avatar = ((x($_POST, 'avatar')) ? Text::noTags(trim($_POST['avatar'])) : 'identicon');
+	$rating = ((x($_POST, 'rating')) ? Text::noTags(trim($_POST['rating'])) : 'g');
 	Config::set('gravatar', 'default_avatar', $default_avatar);
 	Config::set('gravatar', 'rating', $rating);
 	info(L10n::t('Gravatar settings updated.') .EOL);
diff --git a/group_text/group_text.php b/group_text/group_text.php
index 3f91ff35..506ad93b 100644
--- a/group_text/group_text.php
+++ b/group_text/group_text.php
@@ -5,6 +5,7 @@
  * Version: 1.0
  * Author: Thomas Willingham <https://kakste.com/profile/beardyunixer>
  */
+use Friendica\Content\Text;
 use Friendica\Core\Addon;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
@@ -14,7 +15,7 @@ function group_text_install() {
 	Addon::registerHook('addon_settings', 'addon/group_text/group_text.php', 'group_text_settings');
 	Addon::registerHook('addon_settings_post', 'addon/group_text/group_text.php', 'group_text_settings_post');
 
-	logger("installed group_text");
+	Text::logger("installed group_text");
 }
 
 
@@ -24,7 +25,7 @@ function group_text_uninstall() {
 	Addon::unregisterHook('addon_settings_post', 'addon/group_text/group_text.php', 'group_text_settings_post');
 
 
-	logger("removed group_text");
+	Text::logger("removed group_text");
 }
 
 
diff --git a/ifttt/ifttt.php b/ifttt/ifttt.php
index 2e48319a..780d6ad2 100644
--- a/ifttt/ifttt.php
+++ b/ifttt/ifttt.php
@@ -11,6 +11,7 @@ require_once 'include/items.php';
 require_once 'include/text.php';
 
 use Friendica\App;
+use Friendica\Content\Text;
 use Friendica\Core\Addon;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
@@ -103,16 +104,16 @@ function ifttt_post(App $a)
 
 	$user = DBA::selectFirst('user', ['uid'], ['nickname' => $nickname]);
 	if (!DBA::isResult($user)) {
-		logger('User ' . $nickname . ' not found.', LOGGER_DEBUG);
+		Text::logger('User ' . $nickname . ' not found.', LOGGER_DEBUG);
 		return;
 	}
 
 	$uid = $user['uid'];
 
-	logger('Received a post for user ' . $uid . ' from ifttt ' . print_r($_REQUEST, true), LOGGER_DEBUG);
+	Text::logger('Received a post for user ' . $uid . ' from ifttt ' . print_r($_REQUEST, true), LOGGER_DEBUG);
 
 	if (!isset($_REQUEST['key'])) {
-		logger('No key found.');
+		Text::logger('No key found.');
 		return;
 	}
 
@@ -120,7 +121,7 @@ function ifttt_post(App $a)
 
 	// Check the key
 	if ($key != PConfig::get($uid, 'ifttt', 'key')) {
-		logger('Invalid key for user ' . $uid, LOGGER_DEBUG);
+		Text::logger('Invalid key for user ' . $uid, LOGGER_DEBUG);
 		return;
 	}
 
@@ -131,7 +132,7 @@ function ifttt_post(App $a)
 	}
 
 	if (!in_array($item['type'], ['status', 'link', 'photo'])) {
-		logger('Unknown item type ' . $item['type'], LOGGER_DEBUG);
+		Text::logger('Unknown item type ' . $item['type'], LOGGER_DEBUG);
 		return;
 	}
 
diff --git a/ijpost/ijpost.php b/ijpost/ijpost.php
index 3dcfb31f..ee17c5ca 100644
--- a/ijpost/ijpost.php
+++ b/ijpost/ijpost.php
@@ -8,6 +8,7 @@
  * Author: Cat Gray <https://free-haven.org/profile/catness>
  */
 
+use Friendica\Content\Text;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Addon;
 use Friendica\Core\L10n;
@@ -184,7 +185,7 @@ function ijpost_send(&$a, &$b)
 	if ($ij_username && $ij_password && $ij_blog) {
 		$title = $b['title'];
 		$post = BBCode::convert($b['body']);
-		$post = xmlify($post);
+		$post = Text::xmlify($post);
 		$tags = ijpost_get_tags($b['tag']);
 
 		$date = DateTimeFormat::convert($b['created'], $tz);
@@ -221,12 +222,12 @@ function ijpost_send(&$a, &$b)
 
 EOT;
 
-		logger('ijpost: data: ' . $xml, LOGGER_DATA);
+		Text::logger('ijpost: data: ' . $xml, LOGGER_DATA);
 
 		if ($ij_blog !== 'test') {
 			$x = Network::post($ij_blog, $xml, ["Content-Type: text/xml"])->getBody();
 		}
-		logger('posted to insanejournal: ' . $x ? $x : '', LOGGER_DEBUG);
+		Text::logger('posted to insanejournal: ' . $x ? $x : '', LOGGER_DEBUG);
 	}
 }
 
diff --git a/impressum/impressum.php b/impressum/impressum.php
index 90775116..43de556f 100644
--- a/impressum/impressum.php
+++ b/impressum/impressum.php
@@ -7,6 +7,7 @@
  * License: 3-clause BSD license
  */
 
+use Friendica\Content\Text;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
@@ -17,14 +18,14 @@ function impressum_install() {
 	Addon::registerHook('load_config', 'addon/impressum/impressum.php', 'impressum_load_config');
     Addon::registerHook('about_hook', 'addon/impressum/impressum.php', 'impressum_show');
     Addon::registerHook('page_end', 'addon/impressum/impressum.php', 'impressum_footer');
-    logger("installed impressum Addon");
+    Text::logger("installed impressum Addon");
 }
 
 function impressum_uninstall() {
 	Addon::unregisterHook('load_config', 'addon/impressum/impressum.php', 'impressum_load_config');
     Addon::unregisterHook('about_hook', 'addon/impressum/impressum.php', 'impressum_show');
     Addon::unregisterHook('page_end', 'addon/impressum/impressum.php', 'impressum_footer');
-    logger("uninstalled impressum Addon");
+    Text::logger("uninstalled impressum Addon");
 }
 
 function impressum_module() {
@@ -84,11 +85,11 @@ function impressum_show($a,&$b) {
 }
 
 function impressum_addon_admin_post (&$a) {
-    $owner = ((x($_POST, 'owner')) ? notags(trim($_POST['owner'])) : '');
-    $ownerprofile = ((x($_POST, 'ownerprofile')) ? notags(trim($_POST['ownerprofile'])) : '');
+    $owner = ((x($_POST, 'owner')) ? Text::noTags(trim($_POST['owner'])) : '');
+    $ownerprofile = ((x($_POST, 'ownerprofile')) ? Text::noTags(trim($_POST['ownerprofile'])) : '');
     $postal = ((x($_POST, 'postal')) ? (trim($_POST['postal'])) : '');
     $notes = ((x($_POST, 'notes')) ? (trim($_POST['notes'])) : '');
-    $email = ((x($_POST, 'email')) ? notags(trim($_POST['email'])) : '');
+    $email = ((x($_POST, 'email')) ? Text::noTags(trim($_POST['email'])) : '');
     $footer_text = ((x($_POST, 'footer_text')) ? (trim($_POST['footer_text'])) : '');
     Config::set('impressum','owner',strip_tags($owner));
     Config::set('impressum','ownerprofile',strip_tags($ownerprofile));
@@ -99,8 +100,8 @@ function impressum_addon_admin_post (&$a) {
     info(L10n::t('Settings updated.'). EOL );
 }
 function impressum_addon_admin (&$a, &$o) {
-    $t = get_markup_template( "admin.tpl", "addon/impressum/" );
-    $o = replace_macros($t, [
+    $t = Text::getMarkupTemplate( "admin.tpl", "addon/impressum/" );
+    $o = Text::replaceMacros($t, [
         '$submit' => L10n::t('Save Settings'),
         '$owner' => ['owner', L10n::t('Site Owner'), Config::get('impressum','owner'), L10n::t('The page operators name.')],
         '$ownerprofile' => ['ownerprofile', L10n::t('Site Owners Profile'), Config::get('impressum','ownerprofile'), L10n::t('Profile address of the operator.')],
diff --git a/irc/irc.php b/irc/irc.php
index 38ce5f24..31ae7668 100644
--- a/irc/irc.php
+++ b/irc/irc.php
@@ -6,6 +6,8 @@
 * Author: tony baldwin <https://free-haven.org/profile/tony>
 * Author: Tobias Diekershoff <https://f.diekershoff.de/u/tobias>
 */
+
+use Friendica\Content\Text;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
@@ -36,8 +38,8 @@ function irc_addon_settings(&$a,&$s) {
 	$sitechats = PConfig::get( local_user(), 'irc','sitechats'); /* popular channels */
 	$autochans = PConfig::get( local_user(), 'irc','autochans');  /* auto connect chans */
 
-	$t = get_markup_template( "settings.tpl", "addon/irc/" );
-	$s .= replace_macros($t, [
+	$t = Text::getMarkupTemplate( "settings.tpl", "addon/irc/" );
+	$s .= Text::replaceMacros($t, [
 	    	'$header' => L10n::t('IRC Settings'),
 		'$info' => L10n::t('Here you can change the system wide settings for the channels to automatically join and access via the side bar. Note the changes you do here, only effect the channel selection if you are logged in.'),
 		'$submit' => L10n::t('Save Settings'),
@@ -135,8 +137,8 @@ function irc_addon_admin_post (&$a) {
 function irc_addon_admin (&$a, &$o) {
 	$sitechats = Config::get('irc','sitechats'); /* popular channels */
 	$autochans = Config::get('irc','autochans');  /* auto connect chans */
-	$t = get_markup_template( "admin.tpl", "addon/irc/" );
-	$o = replace_macros($t, [
+	$t = Text::getMarkupTemplate( "admin.tpl", "addon/irc/" );
+	$o = Text::replaceMacros($t, [
 		'$submit' => L10n::t('Save Settings'),
 		'$autochans' => [ 'autochans', L10n::t('Channel(s) to auto connect (comma separated)'), $autochans, L10n::t('List of channels that shall automatically connected to when the app is launched.')],
 		'$sitechats' => [ 'sitechats', L10n::t('Popular Channels (comma separated)'), $sitechats, L10n::t('List of popular channels, will be displayed at the side and hotlinked for easy joining.') ]
diff --git a/jappixmini/jappixmini.php b/jappixmini/jappixmini.php
index 8111f9fd..75a5073f 100644
--- a/jappixmini/jappixmini.php
+++ b/jappixmini/jappixmini.php
@@ -63,6 +63,7 @@
  */
 
 use Friendica\App;
+use Friendica\Content\Text;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
@@ -584,7 +585,7 @@ function jappixmini_cron(App $a, $d)
 
 	// go through list of users with jabber enabled
 	$users = q("SELECT `uid` FROM `pconfig` WHERE `cat`='jappixmini' AND (`k`='autosubscribe' OR `k`='autoapprove') AND `v`='1'");
-	logger("jappixmini: Update list of contacts' jabber accounts for " . count($users) . " users.");
+	Text::logger("jappixmini: Update list of contacts' jabber accounts for " . count($users) . " users.");
 
 	if (!count($users)) {
 		return;
diff --git a/js_upload/js_upload.php b/js_upload/js_upload.php
index adeba838..b93d4714 100644
--- a/js_upload/js_upload.php
+++ b/js_upload/js_upload.php
@@ -14,6 +14,7 @@
  * Module Author: Chris Case
  *
  */
+use Friendica\Content\Text;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
@@ -159,7 +160,7 @@ function js_upload_post_init(&$a,&$b) {
 	$a->data['upload_jsonresponse'] =  htmlspecialchars(json_encode($result), ENT_NOQUOTES);
 
 	if(isset($result['error'])) {
-		logger('mod/photos.php: photos_post(): error uploading photo: ' . $result['error'] , 'LOGGER_DEBUG');
+		Text::logger('mod/photos.php: photos_post(): error uploading photo: ' . $result['error'] , 'LOGGER_DEBUG');
 		echo json_encode($result);
 		killme();
 	}
@@ -181,7 +182,7 @@ function js_upload_post_file(&$a,&$b) {
 
 function js_upload_post_end(&$a,&$b) {
 
-logger('upload_post_end');
+Text::logger('upload_post_end');
 	if(x($a->data,'upload_jsonresponse')) {
 		echo $a->data['upload_jsonresponse'];
 		killme();
diff --git a/krynn/krynn.php b/krynn/krynn.php
index 4b6e1f7f..93a85a0f 100644
--- a/krynn/krynn.php
+++ b/krynn/krynn.php
@@ -9,6 +9,7 @@
  *
  *"My body was my sacrifice... for my magic. This damage is permanent." - Raistlin Majere
  */
+use Friendica\Content\Text;
 use Friendica\Core\Addon;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
@@ -35,7 +36,7 @@ function krynn_install() {
 	Addon::registerHook('addon_settings', 'addon/krynn/krynn.php', 'krynn_settings');
 	Addon::registerHook('addon_settings_post', 'addon/krynn/krynn.php', 'krynn_settings_post');
 
-	logger("installed krynn");
+	Text::logger("installed krynn");
 }
 
 
@@ -54,7 +55,7 @@ function krynn_uninstall() {
 	Addon::unregisterHook('addon_settings_post', 'addon/krynn/krynn.php', 'krynn_settings_post');
 
 
-	logger("removed krynn");
+	Text::logger("removed krynn");
 }
 
 
@@ -70,7 +71,7 @@ function krynn_post_hook($a, &$item) {
 	 *
 	 */
 
-	logger('krynn invoked');
+	Text::logger('krynn invoked');
 
 	if(! local_user())   /* non-zero if this is a logged in user of this system */
 		return;
diff --git a/langfilter/langfilter.php b/langfilter/langfilter.php
index 6922ac82..48eaa181 100644
--- a/langfilter/langfilter.php
+++ b/langfilter/langfilter.php
@@ -8,6 +8,7 @@
  */
 
 use Friendica\App;
+use Friendica\Content\Text;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Addon;
 use Friendica\Core\L10n;
@@ -50,8 +51,8 @@ function langfilter_addon_settings(App $a, &$s)
 	$minconfidence  = PConfig::get(local_user(), 'langfilter', 'minconfidence') * 100;
 	$minlength      = PConfig::get(local_user(), 'langfilter', 'minlength');
 
-	$t = get_markup_template("settings.tpl", "addon/langfilter/");
-	$s .= replace_macros($t, [
+	$t = Text::getMarkupTemplate("settings.tpl", "addon/langfilter/");
+	$s .= Text::replaceMacros($t, [
 		'$title'         => L10n::t("Language Filter"),
 		'$intro'         => L10n::t('This addon tries to identify the language posts are writen in. If it does not match any language specifed below, posts will be hidden by collapsing them.'),
 		'$enabled'       => ['langfilter_enable', L10n::t('Use the language filter'), $enable_checked, ''],
diff --git a/ldapauth/ldapauth.php b/ldapauth/ldapauth.php
index 514fb1d1..f801f547 100644
--- a/ldapauth/ldapauth.php
+++ b/ldapauth/ldapauth.php
@@ -53,6 +53,7 @@
  *
  * ...etc.
  */
+use Friendica\Content\Text;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Model\User;
@@ -99,28 +100,28 @@ function ldapauth_authenticate($username, $password)
 	$ldap_autocreateaccount_nameattribute  = Config::get('ldapauth', 'ldap_autocreateaccount_nameattribute');
 
 	if (!(strlen($password) && function_exists('ldap_connect') && strlen($ldap_server))) {
-		logger("ldapauth: not configured or missing php-ldap module");
+		Text::logger("ldapauth: not configured or missing php-ldap module");
 		return false;
 	}
 
 	$connect = @ldap_connect($ldap_server);
 
 	if ($connect === false) {
-		logger("ldapauth: could not connect to $ldap_server");
+		Text::logger("ldapauth: could not connect to $ldap_server");
 		return false;
 	}
 
 	@ldap_set_option($connect, LDAP_OPT_PROTOCOL_VERSION, 3);
 	@ldap_set_option($connect, LDAP_OPT_REFERRALS, 0);
 	if ((@ldap_bind($connect, $ldap_binddn, $ldap_bindpw)) === false) {
-		logger("ldapauth: could not bind $ldap_server as $ldap_binddn");
+		Text::logger("ldapauth: could not bind $ldap_server as $ldap_binddn");
 		return false;
 	}
 
 	$res = @ldap_search($connect, $ldap_searchdn, $ldap_userattr . '=' . $username);
 
 	if (!$res) {
-		logger("ldapauth: $ldap_userattr=$username,$ldap_searchdn not found");
+		Text::logger("ldapauth: $ldap_userattr=$username,$ldap_searchdn not found");
 		return false;
 	}
 
@@ -161,13 +162,13 @@ function ldapauth_authenticate($username, $password)
 		@ldap_close($connect);
 
 		if ($eno === 32) {
-			logger("ldapauth: access control group Does Not Exist");
+			Text::logger("ldapauth: access control group Does Not Exist");
 			return false;
 		} elseif ($eno === 16) {
-			logger('ldapauth: membership attribute does not exist in access control group');
+			Text::logger('ldapauth: membership attribute does not exist in access control group');
 			return false;
 		} else {
-			logger('ldapauth: error: ' . $err);
+			Text::logger('ldapauth: error: ' . $err);
 			return false;
 		}
 	} elseif ($r === false) {
@@ -189,12 +190,12 @@ function ldap_autocreateaccount($ldap_autocreateaccount, $username, $password, $
 
 				try {
 					User::create($arr);
-					logger("ldapauth: account " . $username . " created");
+					Text::logger("ldapauth: account " . $username . " created");
 				} catch (Exception $ex) {
-					logger("ldapauth: account " . $username . " was not created ! : " . $ex->getMessage());
+					Text::logger("ldapauth: account " . $username . " was not created ! : " . $ex->getMessage());
 				}
 			} else {
-				logger("ldapauth: unable to create account, no email or nickname found");
+				Text::logger("ldapauth: unable to create account, no email or nickname found");
 			}
 		}
 	}
diff --git a/leistungsschutzrecht/leistungsschutzrecht.php b/leistungsschutzrecht/leistungsschutzrecht.php
index c0625ccb..06668f87 100644
--- a/leistungsschutzrecht/leistungsschutzrecht.php
+++ b/leistungsschutzrecht/leistungsschutzrecht.php
@@ -5,6 +5,7 @@
  * Version: 0.1
  * Author: Michael Vogel <https://pirati.ca/profile/heluecht>
  */
+use Friendica\Content\Text;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Util\Network;
@@ -163,7 +164,7 @@ function leistungsschutzrecht_cron($a,$b) {
 	if($last) {
 		$next = $last + 86400;
 		if($next > time()) {
-			logger('poll intervall not reached');
+			Text::logger('poll intervall not reached');
 			return;
 		}
 	}
diff --git a/libertree/libertree.php b/libertree/libertree.php
index 19512bc5..5d28af51 100644
--- a/libertree/libertree.php
+++ b/libertree/libertree.php
@@ -6,6 +6,7 @@
  * Author: Tony Baldwin <https://free-haven.org/u/tony>
  */
 
+use Friendica\Content\Text;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Addon;
 use Friendica\Core\L10n;
@@ -157,7 +158,7 @@ function libertree_post_local(&$a,&$b) {
 
 function libertree_send(&$a,&$b) {
 
-	logger('libertree_send: invoked');
+	Text::logger('libertree_send: invoked');
 
 	if ($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited'])) {
 		return;
@@ -232,6 +233,6 @@ function libertree_send(&$a,&$b) {
 		];
 
 		$result = Network::post($ltree_blog, $params)->getBody();
-		logger('libertree: ' . $result);
+		Text::logger('libertree: ' . $result);
 	}
 }
diff --git a/libravatar/libravatar.php b/libravatar/libravatar.php
index bc671548..e09bff27 100644
--- a/libravatar/libravatar.php
+++ b/libravatar/libravatar.php
@@ -8,6 +8,7 @@
 
 use Friendica\App;
 use Friendica\BaseModule;
+use Friendica\Content\Text;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
@@ -21,7 +22,7 @@ function libravatar_install()
 {
 	Addon::registerHook('load_config',   'addon/libravatar/libravatar.php', 'libravatar_load_config');
 	Addon::registerHook('avatar_lookup', 'addon/libravatar/libravatar.php', 'libravatar_lookup');
-	logger("registered libravatar in avatar_lookup hook");
+	Text::logger("registered libravatar in avatar_lookup hook");
 }
 
 /**
@@ -31,7 +32,7 @@ function libravatar_uninstall()
 {
 	Addon::unregisterHook('load_config',   'addon/libravatar/libravatar.php', 'libravatar_load_config');
 	Addon::unregisterHook('avatar_lookup', 'addon/libravatar/libravatar.php', 'libravatar_lookup');
-	logger("unregistered libravatar in avatar_lookup hook");
+	Text::logger("unregistered libravatar in avatar_lookup hook");
 }
 
 function libravatar_load_config(App $a)
@@ -73,7 +74,7 @@ function libravatar_lookup($a, &$b)
  */
 function libravatar_addon_admin(&$a, &$o)
 {
-	$t = get_markup_template("admin.tpl", "addon/libravatar");
+	$t = Text::getMarkupTemplate("admin.tpl", "addon/libravatar");
 
 	$default_avatar = Config::get('libravatar', 'default_avatar');
 
@@ -109,7 +110,7 @@ function libravatar_addon_admin(&$a, &$o)
 
 	// output Libravatar settings
 	$o .= '<input type="hidden" name="form_security_token" value="' . BaseModule::getFormSecurityToken("libravatarsave") .'">';
-	$o .= replace_macros( $t, [
+	$o .= Text::replaceMacros( $t, [
 		'$submit' => L10n::t('Save Settings'),
 		'$default_avatar' => ['avatar', L10n::t('Default avatar image'), $default_avatar, L10n::t('Select default avatar image if none was found. See README'), $default_avatars],
 	]);
@@ -122,7 +123,7 @@ function libravatar_addon_admin_post(&$a)
 {
 	BaseModule::checkFormSecurityToken('libravatarrsave');
 
-	$default_avatar = ((x($_POST, 'avatar')) ? notags(trim($_POST['avatar'])) : 'identicon');
+	$default_avatar = ((x($_POST, 'avatar')) ? Text::noTags(trim($_POST['avatar'])) : 'identicon');
 	Config::set('libravatar', 'default_avatar', $default_avatar);
 	info(L10n::t('Libravatar settings updated.') .EOL);
 }
diff --git a/ljpost/ljpost.php b/ljpost/ljpost.php
index dfc1387b..940f8af0 100644
--- a/ljpost/ljpost.php
+++ b/ljpost/ljpost.php
@@ -8,6 +8,7 @@
  * Author: Cat Gray <https://free-haven.org/profile/catness>
  */
 
+use Friendica\Content\Text;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Addon;
 use Friendica\Core\L10n;
@@ -168,20 +169,20 @@ function ljpost_send(&$a,&$b) {
 	if($x && strlen($x[0]['timezone']))
 		$tz = $x[0]['timezone'];
 
-	$lj_username = xmlify(PConfig::get($b['uid'],'ljpost','lj_username'));
-	$lj_password = xmlify(PConfig::get($b['uid'],'ljpost','lj_password'));
-	$lj_journal = xmlify(PConfig::get($b['uid'],'ljpost','lj_journal'));
+	$lj_username = Text::xmlify(PConfig::get($b['uid'],'ljpost','lj_username'));
+	$lj_password = Text::xmlify(PConfig::get($b['uid'],'ljpost','lj_password'));
+	$lj_journal = Text::xmlify(PConfig::get($b['uid'],'ljpost','lj_journal'));
 //	if(! $lj_journal)
 //		$lj_journal = $lj_username;
 
-	$lj_blog = xmlify(PConfig::get($b['uid'],'ljpost','lj_blog'));
+	$lj_blog = Text::xmlify(PConfig::get($b['uid'],'ljpost','lj_blog'));
 	if(! strlen($lj_blog))
-		$lj_blog = xmlify('http://www.livejournal.com/interface/xmlrpc');
+		$lj_blog = Text::xmlify('http://www.livejournal.com/interface/xmlrpc');
 
 	if($lj_username && $lj_password && $lj_blog) {
-		$title = xmlify($b['title']);
+		$title = Text::xmlify($b['title']);
 		$post = BBCode::convert($b['body']);
-		$post = xmlify($post);
+		$post = Text::xmlify($post);
 		$tags = ljpost_get_tags($b['tag']);
 
 		$date = DateTimeFormat::convert($b['created'], $tz);
@@ -231,12 +232,12 @@ function ljpost_send(&$a,&$b) {
 
 EOT;
 
-		logger('ljpost: data: ' . $xml, LOGGER_DATA);
+		Text::logger('ljpost: data: ' . $xml, LOGGER_DATA);
 
 		if ($lj_blog !== 'test') {
 			$x = Network::post($lj_blog, $xml, ["Content-Type: text/xml"])->getBody();
 		}
-		logger('posted to livejournal: ' . ($x) ? $x : '', LOGGER_DEBUG);
+		Text::logger('posted to livejournal: ' . ($x) ? $x : '', LOGGER_DEBUG);
 	}
 }
 
diff --git a/mailstream/mailstream.php b/mailstream/mailstream.php
index dc44b931..211dfb69 100644
--- a/mailstream/mailstream.php
+++ b/mailstream/mailstream.php
@@ -6,6 +6,7 @@
  * Author: Matthew Exon <http://mat.exon.name>
  */
 
+use Friendica\Content\Text;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
@@ -73,12 +74,12 @@ function mailstream_module() {}
 
 function mailstream_addon_admin(&$a,&$o) {
 	$frommail = Config::get('mailstream', 'frommail');
-	$template = get_markup_template('admin.tpl', 'addon/mailstream/');
+	$template = Text::getMarkupTemplate('admin.tpl', 'addon/mailstream/');
 	$config = ['frommail',
 			L10n::t('From Address'),
 			$frommail,
 			L10n::t('Email address that stream items will appear to be from.')];
-	$o .= replace_macros($template, [
+	$o .= Text::replaceMacros($template, [
 				 '$frommail' => $config,
 				 '$submit' => L10n::t('Save Settings')]);
 }
@@ -94,7 +95,7 @@ function mailstream_generate_id($a, $uri) {
 	$host = $a->getHostName();
 	$resource = hash('md5', $uri);
 	$message_id = "<" . $resource . "@" . $host . ">";
-	logger('mailstream: Generated message ID ' . $message_id . ' for URI ' . $uri, LOGGER_DEBUG);
+	Text::logger('mailstream: Generated message ID ' . $message_id . ' for URI ' . $uri, LOGGER_DEBUG);
 	return $message_id;
 }
 
@@ -123,16 +124,16 @@ function mailstream_post_hook(&$a, &$item) {
 		intval($item['contact-id']), DBA::escape($item['uri']), DBA::escape($message_id));
 	$r = q('SELECT * FROM `mailstream_item` WHERE `uid` = %d AND `contact-id` = %d AND `uri` = "%s"', intval($item['uid']), intval($item['contact-id']), DBA::escape($item['uri']));
 	if (count($r) != 1) {
-		logger('mailstream_post_remote_hook: Unexpected number of items returned from mailstream_item', LOGGER_INFO);
+		Text::logger('mailstream_post_remote_hook: Unexpected number of items returned from mailstream_item', LOGGER_INFO);
 		return;
 	}
 	$ms_item = $r[0];
-	logger('mailstream_post_remote_hook: created mailstream_item '
+	Text::logger('mailstream_post_remote_hook: created mailstream_item '
 		. $ms_item['id'] . ' for item ' . $item['uri'] . ' '
 		. $item['uid'] . ' ' . $item['contact-id'], LOGGER_DATA);
 	$user = mailstream_get_user($item['uid']);
 	if (!$user) {
-		logger('mailstream_post_remote_hook: no user ' . $item['uid'], LOGGER_INFO);
+		Text::logger('mailstream_post_remote_hook: no user ' . $item['uid'], LOGGER_INFO);
 		return;
 	}
 	mailstream_send($a, $ms_item['message-id'], $item, $user);
@@ -141,7 +142,7 @@ function mailstream_post_hook(&$a, &$item) {
 function mailstream_get_user($uid) {
 	$r = q('SELECT * FROM `user` WHERE `uid` = %d', intval($uid));
 	if (count($r) != 1) {
-		logger('mailstream_post_remote_hook: Unexpected number of users returned', LOGGER_INFO);
+		Text::logger('mailstream_post_remote_hook: Unexpected number of users returned', LOGGER_INFO);
 		return;
 	}
 	return $r[0];
@@ -287,10 +288,10 @@ function mailstream_send($a, $message_id, $item, $user) {
 		}
 		$mail->IsHTML(true);
 		$mail->CharSet = 'utf-8';
-		$template = get_markup_template('mail.tpl', 'addon/mailstream/');
+		$template = Text::getMarkupTemplate('mail.tpl', 'addon/mailstream/');
 		$item['body'] = BBCode::convert($item['body']);
 		$item['url'] = $a->getBaseURL() . '/display/' . $user['nickname'] . '/' . $item['id'];
-		$mail->Body = replace_macros($template, [
+		$mail->Body = Text::replaceMacros($template, [
 						 '$upstream' => L10n::t('Upstream'),
 						 '$local' => L10n::t('Local'),
 						 '$item' => $item]);
@@ -298,11 +299,11 @@ function mailstream_send($a, $message_id, $item, $user) {
 		if (!$mail->Send()) {
 			throw new Exception($mail->ErrorInfo);
 		}
-		logger('mailstream_send sent message ' . $mail->MessageID . ' ' . $mail->Subject, LOGGER_DEBUG);
+		Text::logger('mailstream_send sent message ' . $mail->MessageID . ' ' . $mail->Subject, LOGGER_DEBUG);
 	} catch (phpmailerException $e) {
-		logger('mailstream_send PHPMailer exception sending message ' . $message_id . ': ' . $e->errorMessage(), LOGGER_INFO);
+		Text::logger('mailstream_send PHPMailer exception sending message ' . $message_id . ': ' . $e->errorMessage(), LOGGER_INFO);
 	} catch (Exception $e) {
-		logger('mailstream_send exception sending message ' . $message_id . ': ' . $e->getMessage(), LOGGER_INFO);
+		Text::logger('mailstream_send exception sending message ' . $message_id . ': ' . $e->getMessage(), LOGGER_INFO);
 	}
 	// In case of failure, still set the item to completed.  Otherwise
 	// we'll just try to send it over and over again and it'll fail
@@ -331,10 +332,10 @@ function mailstream_cron($a, $b) {
 	// mailstream_post_remote_hook fails for some reason will this get
 	// used, and in that case it's worth holding off a bit anyway.
 	$ms_item_ids = q("SELECT `mailstream_item`.`message-id`, `mailstream_item`.`uri`, `item`.`id` FROM `mailstream_item` JOIN `item` ON (`mailstream_item`.`uid` = `item`.`uid` AND `mailstream_item`.`uri` = `item`.`uri` AND `mailstream_item`.`contact-id` = `item`.`contact-id`) WHERE `mailstream_item`.`completed` IS NULL AND `mailstream_item`.`created` < DATE_SUB(NOW(), INTERVAL 1 HOUR) AND `item`.`visible` = 1 ORDER BY `mailstream_item`.`created` LIMIT 100");
-	logger('mailstream_cron processing ' . count($ms_item_ids) . ' items', LOGGER_DEBUG);
+	Text::logger('mailstream_cron processing ' . count($ms_item_ids) . ' items', LOGGER_DEBUG);
 	foreach ($ms_item_ids as $ms_item_id) {
 		if (!$ms_item_id['message-id'] || !strlen($ms_item_id['message-id'])) {
-			logger('mailstream_cron: Item ' . $ms_item_id['id'] . ' URI ' . $ms_item_id['uri'] . ' has no message-id', LOGGER_INFO);
+			Text::logger('mailstream_cron: Item ' . $ms_item_id['id'] . ' URI ' . $ms_item_id['uri'] . ' has no message-id', LOGGER_INFO);
 		}
 		$item = Item::selectFirst([], ['id' => $ms_item_id['id']]);
 		$users = q("SELECT * FROM `user` WHERE `uid` = %d", intval($item['uid']));
@@ -343,7 +344,7 @@ function mailstream_cron($a, $b) {
 			mailstream_send($a, $ms_item_id['message-id'], $item, $user);
 		}
 		else {
-			logger('mailstream_cron: Unable to find item ' . $ms_item_id['id'], LOGGER_INFO);
+			Text::logger('mailstream_cron: Unable to find item ' . $ms_item_id['id'], LOGGER_INFO);
 			q("UPDATE `mailstream_item` SET `completed` = now() WHERE `message-id` = %d", intval($ms_item['message-id']));
 		}
 	}
@@ -355,8 +356,8 @@ function mailstream_addon_settings(&$a,&$s) {
 	$address = PConfig::get(local_user(), 'mailstream', 'address');
 	$nolikes = PConfig::get(local_user(), 'mailstream', 'nolikes');
 	$attachimg= PConfig::get(local_user(), 'mailstream', 'attachimg');
-	$template = get_markup_template('settings.tpl', 'addon/mailstream/');
-	$s .= replace_macros($template, [
+	$template = Text::getMarkupTemplate('settings.tpl', 'addon/mailstream/');
+	$s .= Text::replaceMacros($template, [
 				 '$enabled' => [
 					'mailstream_enabled',
 					L10n::t('Enabled'),
@@ -412,5 +413,5 @@ function mailstream_tidy() {
 	foreach ($r as $rr) {
 		q('DELETE FROM mailstream_item WHERE id = %d', intval($rr['id']));
 	}
-	logger('mailstream_tidy: deleted ' . count($r) . ' old items', LOGGER_DEBUG);
+	Text::logger('mailstream_tidy: deleted ' . count($r) . ' old items', LOGGER_DEBUG);
 }
diff --git a/mathjax/mathjax.php b/mathjax/mathjax.php
index 9aa07027..ad07fd48 100644
--- a/mathjax/mathjax.php
+++ b/mathjax/mathjax.php
@@ -9,6 +9,7 @@
  */
 
 use Friendica\App;
+use Friendica\Content\Text;
 use Friendica\Core\Addon;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
@@ -49,8 +50,8 @@ function mathjax_settings(App $a, &$s)
 
 	$use = PConfig::get(local_user(), 'mathjax', 'use', false);
 
-	$tpl = get_markup_template('settings.tpl', __DIR__);
-	$s .= replace_macros($tpl, [
+	$tpl = Text::getMarkupTemplate('settings.tpl', __DIR__);
+	$s .= Text::replaceMacros($tpl, [
 		'$title'        => 'MathJax',
 		'$description'  => L10n::t('The MathJax addon renders mathematical formulae written using the LaTeX syntax surrounded by the usual $$ or an eqnarray block in the postings of your wall,network tab and private mail.'),
 		'$mathjax_use'  => ['mathjax_use', L10n::t('Use the MathJax renderer'), $use, ''],
diff --git a/newmemberwidget/newmemberwidget.php b/newmemberwidget/newmemberwidget.php
index d7f38068..e4e27691 100644
--- a/newmemberwidget/newmemberwidget.php
+++ b/newmemberwidget/newmemberwidget.php
@@ -6,6 +6,7 @@
  * Author: Tobias Diekershoff <https://f.diekershoff.de/profile/tobias>
  ***/
 
+use Friendica\Content\Text;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
@@ -14,7 +15,7 @@ use Friendica\Core\L10n;
 function newmemberwidget_install()
 {
 	Addon::registerHook( 'network_mod_init', 'addon/newmemberwidget/newmemberwidget.php', 'newmemberwidget_network_mod_init');
-	logger('newmemberwidget installed');
+	Text::logger('newmemberwidget installed');
 }
 
 function newmemberwidget_uninstall()
@@ -52,7 +53,7 @@ function newmemberwidget_network_mod_init ($a, $b)
 function newmemberwidget_addon_admin_post(&$a)
 {
 	$ft = ((x($_POST, 'freetext')) ? trim($_POST['freetext']) : "");
-	$lsn = ((x($_POST, 'localsupportname')) ? notags(trim($_POST['localsupportname'])) : "");
+	$lsn = ((x($_POST, 'localsupportname')) ? Text::noTags(trim($_POST['localsupportname'])) : "");
 	$gs = intval($_POST['linkglobalsupport']);
 	$ls = intval($_POST['linklocalsupport']);
 	Config::set('newmemberwidget', 'freetext',           trim($ft));
@@ -63,8 +64,8 @@ function newmemberwidget_addon_admin_post(&$a)
 
 function newmemberwidget_addon_admin(&$a, &$o)
 {
-	$t = get_markup_template('admin.tpl', 'addon/newmemberwidget');
-	$o = replace_macros($t, [
+	$t = Text::getMarkupTemplate('admin.tpl', 'addon/newmemberwidget');
+	$o = Text::replaceMacros($t, [
 	'$submit' => L10n::t('Save Settings'),
 	'$freetext' => [ "freetext", L10n::t("Message"), Config::get("newmemberwidget", "freetext"), L10n::t("Your message for new members. You can use bbcode here.")],
 	'$linkglobalsupport' => [ "linkglobalsupport", L10n::t('Add a link to global support forum'), Config::get('newmemberwidget', 'linkglobalsupport'), L10n::t('Should a link to the global support forum be displayed?')." (<a href='https://forum.friendi.ca/profile/helpers'>@helpers</a>)"],
diff --git a/notifyall/notifyall.php b/notifyall/notifyall.php
index 852972c3..460dfd39 100644
--- a/notifyall/notifyall.php
+++ b/notifyall/notifyall.php
@@ -9,6 +9,7 @@
  */
 
 use Friendica\App;
+use Friendica\Content\Text;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
@@ -16,12 +17,12 @@ use Friendica\Util\Emailer;
 
 function notifyall_install()
 {
-	logger("installed notifyall");
+	Text::logger("installed notifyall");
 }
 
 function notifyall_uninstall()
 {
-	logger("removed notifyall");
+	Text::logger("removed notifyall");
 }
 
 function notifyall_module() {}
@@ -104,7 +105,7 @@ function notifyall_content(&$a)
 
 	$title = L10n::t('Send email to all members of this Friendica instance.');
 
-	$o = replace_macros(get_markup_template('notifyall_form.tpl', 'addon/notifyall/'), [
+	$o = Text::replaceMacros(Text::getMarkupTemplate('notifyall_form.tpl', 'addon/notifyall/'), [
 		'$title' => $title,
 		'$text' => htmlspecialchars(defaults($_REQUEST, 'text', '')),
 		'$subject' => ['subject', L10n::t('Message subject'), defaults($_REQUEST, 'subject', ''),''],
diff --git a/numfriends/numfriends.php b/numfriends/numfriends.php
index 0cfea736..5a7f5315 100644
--- a/numfriends/numfriends.php
+++ b/numfriends/numfriends.php
@@ -5,6 +5,7 @@
  * Version: 1.0
  * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
  */
+use Friendica\Content\Text;
 use Friendica\Core\Addon;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
@@ -14,7 +15,7 @@ function numfriends_install() {
 	Addon::registerHook('addon_settings', 'addon/numfriends/numfriends.php', 'numfriends_settings');
 	Addon::registerHook('addon_settings_post', 'addon/numfriends/numfriends.php', 'numfriends_settings_post');
 
-	logger("installed numfriends");
+	Text::logger("installed numfriends");
 }
 
 
@@ -24,7 +25,7 @@ function numfriends_uninstall() {
 	Addon::unregisterHook('addon_settings_post', 'addon/numfriends/numfriends.php', 'numfriends_settings_post');
 
 
-	logger("removed numfriends");
+	Text::logger("removed numfriends");
 }
 
 /**
diff --git a/openstreetmap/openstreetmap.php b/openstreetmap/openstreetmap.php
index c8eb43a9..a27dd3e0 100644
--- a/openstreetmap/openstreetmap.php
+++ b/openstreetmap/openstreetmap.php
@@ -8,6 +8,8 @@
  * Author: Klaus Weidenbach
  *
  */
+
+use Friendica\Content\Text;
 use Friendica\Core\Addon;
 use Friendica\Core\Cache;
 use Friendica\Core\Config;
@@ -29,7 +31,7 @@ function openstreetmap_install()
 	Addon::registerHook('Map::getCoordinates', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_get_coordinates');
 	Addon::registerHook('page_header', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_alterheader');
 
-	logger("installed openstreetmap");
+	Text::logger("installed openstreetmap");
 }
 
 function openstreetmap_uninstall()
@@ -41,7 +43,7 @@ function openstreetmap_uninstall()
 	Addon::unregisterHook('Map::getCoordinates', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_get_coordinates');
 	Addon::unregisterHook('page_header', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_alterheader');
 
-	logger("removed openstreetmap");
+	Text::logger("removed openstreetmap");
 }
 
 function openstreetmap_load_config(\Friendica\App $a)
@@ -165,8 +167,8 @@ function openstreetmap_generate_map(&$a, &$b)
 	$lat = $b['lat']; // round($b['lat'], 5);
 	$lon = $b['lon']; // round($b['lon'], 5);
 
-	logger('lat: ' . $lat, LOGGER_DATA);
-	logger('lon: ' . $lon, LOGGER_DATA);
+	Text::logger('lat: ' . $lat, LOGGER_DATA);
+	Text::logger('lon: ' . $lon, LOGGER_DATA);
 
 	$cardlink = '<a href="' . $tmsserver;
 
@@ -174,7 +176,7 @@ function openstreetmap_generate_map(&$a, &$b)
 		$cardlink .= '?mlat=' . $lat . '&mlon=' . $lon;
 	}
 
-	$cardlink .= '#map=' . $zoom . '/' . $lat . '/' . $lon . '">' . ($b['location'] ? escape_tags($b['location']) : L10n::t('View Larger')) . '</a>';
+	$cardlink .= '#map=' . $zoom . '/' . $lat . '/' . $lon . '">' . ($b['location'] ? Text::escapeTags($b['location']) : L10n::t('View Larger')) . '</a>';
 	if (empty($b['mode'])) {
 		$b['html'] = '<iframe style="width:100%; height:300px; border:1px solid #ccc" src="' . $tmsserver .
 				'/export/embed.html?bbox=' . ($lon - 0.01) . '%2C' . ($lat - 0.01) . '%2C' . ($lon + 0.01) . '%2C' . ($lat + 0.01) .
@@ -184,12 +186,12 @@ function openstreetmap_generate_map(&$a, &$b)
 		$b['html'] .= '<br/>' . $cardlink;
 	}
 
-	logger('generate_map: ' . $b['html'], LOGGER_DATA);
+	Text::logger('generate_map: ' . $b['html'], LOGGER_DATA);
 }
 
 function openstreetmap_addon_admin(&$a, &$o)
 {
-	$t = get_markup_template("admin.tpl", "addon/openstreetmap/");
+	$t = Text::getMarkupTemplate("admin.tpl", "addon/openstreetmap/");
 	$tmsserver = Config::get('openstreetmap', 'tmsserver', OSM_TMS);
 	$nomserver = Config::get('openstreetmap', 'nomserver', OSM_NOM);
 	$zoom = Config::get('openstreetmap', 'zoom', OSM_ZOOM);
@@ -200,7 +202,7 @@ function openstreetmap_addon_admin(&$a, &$o)
 		$nomserver = OSM_NOM;
 	}
 
-	$o = replace_macros($t, [
+	$o = Text::replaceMacros($t, [
 			'$submit' => L10n::t('Submit'),
 			'$tmsserver' => ['tmsserver', L10n::t('Tile Server URL'), $tmsserver, L10n::t('A list of <a href="http://wiki.openstreetmap.org/wiki/TMS" target="_blank">public tile servers</a>')],
 			'$nomserver' => ['nomserver', L10n::t('Nominatim (reverse geocoding) Server URL'), $nomserver, L10n::t('A list of <a href="http://wiki.openstreetmap.org/wiki/Nominatim" target="_blank">Nominatim servers</a>')],
diff --git a/pageheader/pageheader.php b/pageheader/pageheader.php
index ce0d6e2b..ff3111e3 100644
--- a/pageheader/pageheader.php
+++ b/pageheader/pageheader.php
@@ -7,6 +7,7 @@
  *         Hauke Altmann <https://snarl.de/profile/tugelblend>
  * 
  */
+use Friendica\Content\Text;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
@@ -48,8 +49,8 @@ function pageheader_addon_settings(&$a,&$s) {
 	if(! $words)
 		$words = '';
 
-	$t = get_markup_template("settings.tpl", "addon/pageheader/");
-	$s .= replace_macros($t, [
+	$t = Text::getMarkupTemplate("settings.tpl", "addon/pageheader/");
+	$s .= Text::replaceMacros($t, [
 					'$title' => L10n::t('"pageheader" Settings'),
 					'$phwords' => ['pageheader-words', L10n::t('Message'), $words, L10n::t('Message to display on every page on this server (or put a pageheader.html file in your docroot)')],
 					'$submit' => L10n::t('Save Settings')
diff --git a/piwik/piwik.php b/piwik/piwik.php
index b161382a..fa882bc3 100644
--- a/piwik/piwik.php
+++ b/piwik/piwik.php
@@ -30,6 +30,7 @@
  *     about http/https but beware to put the trailing / at the end of your
  *     setting.
  */
+use Friendica\Content\Text;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
@@ -38,14 +39,14 @@ function piwik_install() {
 	Addon::registerHook('load_config', 'addon/piwik/piwik.php', 'piwik_load_config');
 	Addon::registerHook('page_end', 'addon/piwik/piwik.php', 'piwik_analytics');
 
-	logger("installed piwik addon");
+	Text::logger("installed piwik addon");
 }
 
 function piwik_uninstall() {
 	Addon::unregisterHook('load_config', 'addon/piwik/piwik.php', 'piwik_load_config');
 	Addon::unregisterHook('page_end', 'addon/piwik/piwik.php', 'piwik_analytics');
 
-	logger("uninstalled piwik addon");
+	Text::logger("uninstalled piwik addon");
 }
 
 function piwik_load_config(\Friendica\App $a)
@@ -95,8 +96,8 @@ function piwik_analytics($a,&$b) {
 	}
 }
 function piwik_addon_admin (&$a, &$o) {
-	$t = get_markup_template( "admin.tpl", "addon/piwik/" );
-	$o = replace_macros( $t, [
+	$t = Text::getMarkupTemplate( "admin.tpl", "addon/piwik/" );
+	$o = Text::replaceMacros( $t, [
 		'$submit' => L10n::t('Save Settings'),
 		'$piwikbaseurl' => ['baseurl', L10n::t('Piwik Base URL'), Config::get('piwik','baseurl' ), L10n::t('Absolute path to your Piwik installation. (without protocol (http/s), with trailing slash)')],
 		'$siteid' => ['siteid', L10n::t('Site ID'), Config::get('piwik','siteid' ), ''],
@@ -105,7 +106,7 @@ function piwik_addon_admin (&$a, &$o) {
 	]);
 }
 function piwik_addon_admin_post (&$a) {
-	$url = ((x($_POST, 'baseurl')) ? notags(trim($_POST['baseurl'])) : '');
+	$url = ((x($_POST, 'baseurl')) ? Text::noTags(trim($_POST['baseurl'])) : '');
 	$id = ((x($_POST, 'siteid')) ? trim($_POST['siteid']) : '');
 	$optout = ((x($_POST, 'optout')) ? trim($_POST['optout']) : '');
 	$async = ((x($_POST, 'async')) ? trim($_POST['async']) : '');
diff --git a/planets/planets.php b/planets/planets.php
index 6a1b787f..494fe201 100644
--- a/planets/planets.php
+++ b/planets/planets.php
@@ -6,6 +6,7 @@
  * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
  * Author: Tony Baldwin <https://free-haven.org/profile/tony>
  */
+use Friendica\Content\Text;
 use Friendica\Core\Addon;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
@@ -32,7 +33,7 @@ function planets_install() {
 	Addon::registerHook('addon_settings', 'addon/planets/planets.php', 'planets_settings');
 	Addon::registerHook('addon_settings_post', 'addon/planets/planets.php', 'planets_settings_post');
 
-	logger("installed planets");
+	Text::logger("installed planets");
 }
 
 
@@ -51,7 +52,7 @@ function planets_uninstall() {
 	Addon::unregisterHook('addon_settings_post', 'addon/planets/planets.php', 'planets_settings_post');
 
 
-	logger("removed planets");
+	Text::logger("removed planets");
 }
 
 
@@ -67,7 +68,7 @@ function planets_post_hook($a, &$item) {
 	 *
 	 */
 
-	logger('planets invoked');
+	Text::logger('planets invoked');
 
 	if(! local_user())   /* non-zero if this is a logged in user of this system */
 		return;
diff --git a/public_server/public_server.php b/public_server/public_server.php
index 2b36f3f6..b33596fa 100644
--- a/public_server/public_server.php
+++ b/public_server/public_server.php
@@ -8,6 +8,7 @@
 
 use Friendica\App;
 use Friendica\BaseModule;
+use Friendica\Content\Text;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
@@ -53,7 +54,7 @@ function public_server_register_account($a, $b)
 
 function public_server_cron($a, $b)
 {
-	logger("public_server: cron start");
+	Text::logger("public_server: cron start");
 
 	require_once('include/enotify.php');
 	$r = q("SELECT * FROM `user` WHERE `account_expires_on` < UTC_TIMESTAMP() + INTERVAL 5 DAY AND
@@ -116,7 +117,7 @@ function public_server_cron($a, $b)
 		}
 	}
 
-	logger("public_server: cron end");
+	Text::logger("public_server: cron end");
 }
 
 function public_server_enotify(&$a, &$b)
@@ -145,12 +146,12 @@ function public_server_login($a, $b)
 function public_server_addon_admin_post(&$a)
 {
 	BaseModule::checkFormSecurityTokenRedirectOnError('/admin/addons/publicserver', 'publicserver');
-	$expiredays = (x($_POST, 'expiredays') ? notags(trim($_POST['expiredays'])) : '');
-	$expireposts = (x($_POST, 'expireposts') ? notags(trim($_POST['expireposts'])) : '');
-	$nologin = (x($_POST, 'nologin') ? notags(trim($_POST['nologin'])) : '');
-	$flagusers = (x($_POST, 'flagusers') ? notags(trim($_POST['flagusers'])) : '');
-	$flagposts = (x($_POST, 'flagposts') ? notags(trim($_POST['flagposts'])) : '');
-	$flagpostsexpire = (x($_POST, 'flagpostsexpire') ? notags(trim($_POST['flagpostsexpire'])) : '');
+	$expiredays = (x($_POST, 'expiredays') ? Text::noTags(trim($_POST['expiredays'])) : '');
+	$expireposts = (x($_POST, 'expireposts') ? Text::noTags(trim($_POST['expireposts'])) : '');
+	$nologin = (x($_POST, 'nologin') ? Text::noTags(trim($_POST['nologin'])) : '');
+	$flagusers = (x($_POST, 'flagusers') ? Text::noTags(trim($_POST['flagusers'])) : '');
+	$flagposts = (x($_POST, 'flagposts') ? Text::noTags(trim($_POST['flagposts'])) : '');
+	$flagpostsexpire = (x($_POST, 'flagpostsexpire') ? Text::noTags(trim($_POST['flagpostsexpire'])) : '');
 	Config::set('public_server', 'expiredays', $expiredays);
 	Config::set('public_server', 'expireposts', $expireposts);
 	Config::set('public_server', 'nologin', $nologin);
@@ -163,8 +164,8 @@ function public_server_addon_admin_post(&$a)
 function public_server_addon_admin(&$a, &$o)
 {
 	$token = BaseModule::getFormSecurityToken("publicserver");
-	$t = get_markup_template("admin.tpl", "addon/public_server");
-	$o = replace_macros($t, [
+	$t = Text::getMarkupTemplate("admin.tpl", "addon/public_server");
+	$o = Text::replaceMacros($t, [
 		'$submit' => L10n::t('Save Settings'),
 		'$form_security_token' => $token,
 		'$infotext' => L10n::t('Set any of these options to 0 to deactivate it.'),
diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php
index 6217f4d5..1bfa3073 100644
--- a/pumpio/pumpio.php
+++ b/pumpio/pumpio.php
@@ -7,6 +7,7 @@
  */
 
 use Friendica\App;
+use Friendica\Content\Text;
 use Friendica\Content\Text\BBCode;
 use Friendica\Content\Text\HTML;
 use Friendica\Core\Addon;
@@ -114,7 +115,7 @@ function pumpio_registerclient(App $a, $host)
 	$params["logo_url"] = $a->getBaseURL()."/images/friendica-256.png";
 	$params["redirect_uris"] = $a->getBaseURL()."/pumpio/connect";
 
-	logger("pumpio_registerclient: ".$url." parameters ".print_r($params, true), LOGGER_DEBUG);
+	Text::logger("pumpio_registerclient: ".$url." parameters ".print_r($params, true), LOGGER_DEBUG);
 
 	$ch = curl_init($url);
 	curl_setopt($ch, CURLOPT_HEADER, false);
@@ -128,10 +129,10 @@ function pumpio_registerclient(App $a, $host)
 
 	if ($curl_info["http_code"] == "200") {
 		$values = json_decode($s);
-		logger("pumpio_registerclient: success ".print_r($values, true), LOGGER_DEBUG);
+		Text::logger("pumpio_registerclient: success ".print_r($values, true), LOGGER_DEBUG);
 		return $values;
 	}
-	logger("pumpio_registerclient: failed: ".print_r($curl_info, true), LOGGER_DEBUG);
+	Text::logger("pumpio_registerclient: failed: ".print_r($curl_info, true), LOGGER_DEBUG);
 	return false;
 
 }
@@ -144,7 +145,7 @@ function pumpio_connect(App $a)
 	$hostname = PConfig::get(local_user(), 'pumpio', 'host');
 
 	if ((($consumer_key == "") || ($consumer_secret == "")) && ($hostname != "")) {
-		logger("pumpio_connect: register client");
+		Text::logger("pumpio_connect: register client");
 		$clientdata = pumpio_registerclient($a, $hostname);
 		PConfig::set(local_user(), 'pumpio', 'consumer_key', $clientdata->client_id);
 		PConfig::set(local_user(), 'pumpio', 'consumer_secret', $clientdata->client_secret);
@@ -152,11 +153,11 @@ function pumpio_connect(App $a)
 		$consumer_key = PConfig::get(local_user(), 'pumpio', 'consumer_key');
 		$consumer_secret = PConfig::get(local_user(), 'pumpio', 'consumer_secret');
 
-		logger("pumpio_connect: ckey: ".$consumer_key." csecrect: ".$consumer_secret, LOGGER_DEBUG);
+		Text::logger("pumpio_connect: ckey: ".$consumer_key." csecrect: ".$consumer_secret, LOGGER_DEBUG);
 	}
 
 	if (($consumer_key == "") || ($consumer_secret == "")) {
-		logger("pumpio_connect: ".sprintf("Unable to register the client at the pump.io server '%s'.", $hostname));
+		Text::logger("pumpio_connect: ".sprintf("Unable to register the client at the pump.io server '%s'.", $hostname));
 
 		$o .= L10n::t("Unable to register the client at the pump.io server '%s'.", $hostname);
 		return $o;
@@ -186,7 +187,7 @@ function pumpio_connect(App $a)
 	if (($success = $client->Initialize())) {
 		if (($success = $client->Process())) {
 			if (strlen($client->access_token)) {
-				logger("pumpio_connect: otoken: ".$client->access_token." osecrect: ".$client->access_token_secret, LOGGER_DEBUG);
+				Text::logger("pumpio_connect: otoken: ".$client->access_token." osecrect: ".$client->access_token_secret, LOGGER_DEBUG);
 				PConfig::set(local_user(), "pumpio", "oauth_token", $client->access_token);
 				PConfig::set(local_user(), "pumpio", "oauth_token_secret", $client->access_token_secret);
 			}
@@ -198,11 +199,11 @@ function pumpio_connect(App $a)
 	}
 
 	if ($success) {
-		logger("pumpio_connect: authenticated");
+		Text::logger("pumpio_connect: authenticated");
 		$o = L10n::t("You are now authenticated to pumpio.");
 		$o .= '<br /><a href="'.$a->getBaseURL().'/settings/connectors">'.L10n::t("return to the connector page").'</a>';
 	} else {
-		logger("pumpio_connect: could not connect");
+		Text::logger("pumpio_connect: could not connect");
 		$o = 'Could not connect to pumpio. Refresh the page or try again later.';
 	}
 
@@ -409,7 +410,7 @@ function pumpio_send(App $a, array &$b)
 		return;
 	}
 
-	logger("pumpio_send: parameter ".print_r($b, true), LOGGER_DATA);
+	Text::logger("pumpio_send: parameter ".print_r($b, true), LOGGER_DATA);
 
 	if ($b['parent'] != $b['id']) {
 		// Looking if its a reply to a pumpio post
@@ -417,7 +418,7 @@ function pumpio_send(App $a, array &$b)
 		$orig_post = Item::selectFirst([], $condition);
 
 		if (!DBA::isResult($orig_post)) {
-			logger("pumpio_send: no pumpio post ".$b["parent"]);
+			Text::logger("pumpio_send: no pumpio post ".$b["parent"]);
 			return;
 		} else {
 			$iscomment = true;
@@ -427,7 +428,7 @@ function pumpio_send(App $a, array &$b)
 
 		$receiver = pumpio_getreceiver($a, $b);
 
-		logger("pumpio_send: receiver ".print_r($receiver, true));
+		Text::logger("pumpio_send: receiver ".print_r($receiver, true));
 
 		if (!count($receiver) && ($b['private'] || !strstr($b['postopts'], 'pumpio'))) {
 			return;
@@ -559,13 +560,13 @@ function pumpio_send(App $a, array &$b)
 			}
 
 			$post_id = $user->object->id;
-			logger('pumpio_send '.$username.': success '.$post_id);
+			Text::logger('pumpio_send '.$username.': success '.$post_id);
 			if ($post_id && $iscomment) {
-				logger('pumpio_send '.$username.': Update extid '.$post_id." for post id ".$b['id']);
+				Text::logger('pumpio_send '.$username.': Update extid '.$post_id." for post id ".$b['id']);
 				Item::update(['extid' => $post_id], ['id' => $b['id']]);
 			}
 		} else {
-			logger('pumpio_send '.$username.': '.$url.' general error: ' . print_r($user, true));
+			Text::logger('pumpio_send '.$username.': '.$url.' general error: ' . print_r($user, true));
 
 			$r = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `self`", $b['uid']);
 			if (DBA::isResult($r)) {
@@ -640,9 +641,9 @@ function pumpio_action(App $a, $uid, $uri, $action, $content = "")
 	}
 
 	if ($success) {
-		logger('pumpio_action '.$username.' '.$action.': success '.$uri);
+		Text::logger('pumpio_action '.$username.' '.$action.': success '.$uri);
 	} else {
-		logger('pumpio_action '.$username.' '.$action.': general error: '.$uri.' '.print_r($user, true));
+		Text::logger('pumpio_action '.$username.' '.$action.': general error: '.$uri.' '.print_r($user, true));
 
 		$r = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `self`", $uid);
 		if (DBA::isResult($r)) {
@@ -671,16 +672,16 @@ function pumpio_sync(App $a)
 	if ($last) {
 		$next = $last + ($poll_interval * 60);
 		if ($next > time()) {
-			logger('pumpio: poll intervall not reached');
+			Text::logger('pumpio: poll intervall not reached');
 			return;
 		}
 	}
-	logger('pumpio: cron_start');
+	Text::logger('pumpio: cron_start');
 
 	$r = q("SELECT * FROM `pconfig` WHERE `cat` = 'pumpio' AND `k` = 'mirror' AND `v` = '1' ORDER BY RAND() ");
 	if (DBA::isResult($r)) {
 		foreach ($r as $rr) {
-			logger('pumpio: mirroring user '.$rr['uid']);
+			Text::logger('pumpio: mirroring user '.$rr['uid']);
 			pumpio_fetchtimeline($a, $rr['uid']);
 		}
 	}
@@ -698,12 +699,12 @@ function pumpio_sync(App $a)
 			if ($abandon_days != 0) {
 				$user = q("SELECT `login_date` FROM `user` WHERE uid=%d AND `login_date` >= '%s'", $rr['uid'], $abandon_limit);
 				if (!DBA::isResult($user)) {
-					logger('abandoned account: timeline from user '.$rr['uid'].' will not be imported');
+					Text::logger('abandoned account: timeline from user '.$rr['uid'].' will not be imported');
 					continue;
 				}
 			}
 
-			logger('pumpio: importing timeline from user '.$rr['uid']);
+			Text::logger('pumpio: importing timeline from user '.$rr['uid']);
 			pumpio_fetchinbox($a, $rr['uid']);
 
 			// check for new contacts once a day
@@ -721,7 +722,7 @@ function pumpio_sync(App $a)
 		}
 	}
 
-	logger('pumpio: cron_end');
+	Text::logger('pumpio: cron_end');
 
 	Config::set('pumpio', 'last_poll', time());
 }
@@ -766,7 +767,7 @@ function pumpio_fetchtimeline(App $a, $uid)
 
 	$url = 'https://'.$hostname.'/api/user/'.$username.'/feed/major';
 
-	logger('pumpio: fetching for user '.$uid.' '.$url.' C:'.$client->client_id.' CS:'.$client->client_secret.' T:'.$client->access_token.' TS:'.$client->access_token_secret);
+	Text::logger('pumpio: fetching for user '.$uid.' '.$url.' C:'.$client->client_id.' CS:'.$client->client_secret.' T:'.$client->access_token.' TS:'.$client->access_token_secret);
 
 	$useraddr = $username.'@'.$hostname;
 
@@ -778,7 +779,7 @@ function pumpio_fetchtimeline(App $a, $uid)
 	}
 
 	if (!$success) {
-		logger('pumpio: error fetching posts for user '.$uid." ".$useraddr." ".print_r($user, true));
+		Text::logger('pumpio: error fetching posts for user '.$uid." ".$useraddr." ".print_r($user, true));
 		return;
 	}
 
@@ -847,12 +848,12 @@ function pumpio_fetchtimeline(App $a, $uid)
 					}
 				}
 
-				logger('pumpio: posting for user '.$uid);
+				Text::logger('pumpio: posting for user '.$uid);
 
 				require_once('mod/item.php');
 
 				item_post($a);
-				logger('pumpio: posting done - user '.$uid);
+				Text::logger('pumpio: posting done - user '.$uid);
 			}
 		}
 	}
@@ -876,11 +877,11 @@ function pumpio_dounlike(App $a, $uid, $self, $post, $own_id)
 
 	$contactid = 0;
 
-	if (link_compare($post->actor->url, $own_id)) {
+	if (Text::linkCompare($post->actor->url, $own_id)) {
 		$contactid = $self[0]['id'];
 	} else {
 		$r = q("SELECT * FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d AND `blocked` = 0 AND `readonly` = 0 LIMIT 1",
-			DBA::escape(normalise_link($post->actor->url)),
+			DBA::escape(Text::normaliseLink($post->actor->url)),
 			intval($uid)
 		);
 
@@ -896,9 +897,9 @@ function pumpio_dounlike(App $a, $uid, $self, $post, $own_id)
 	Item::delete(['verb' => ACTIVITY_LIKE, 'uid' => $uid, 'contact-id' => $contactid, 'thr-parent' => $orig_post['uri']]);
 
 	if (DBA::isResult($r)) {
-		logger("pumpio_dounlike: unliked existing like. User ".$own_id." ".$uid." Contact: ".$contactid." Url ".$orig_post['uri']);
+		Text::logger("pumpio_dounlike: unliked existing like. User ".$own_id." ".$uid." Contact: ".$contactid." Url ".$orig_post['uri']);
 	} else {
-		logger("pumpio_dounlike: not found. User ".$own_id." ".$uid." Contact: ".$contactid." Url ".$orig_post['uri']);
+		Text::logger("pumpio_dounlike: not found. User ".$own_id." ".$uid." Contact: ".$contactid." Url ".$orig_post['uri']);
 	}
 }
 
@@ -907,7 +908,7 @@ function pumpio_dolike(App $a, $uid, $self, $post, $own_id, $threadcompletion =
 	require_once('include/items.php');
 
 	if (empty($post->object->id)) {
-		logger('Got empty like: '.print_r($post, true), LOGGER_DEBUG);
+		Text::logger('Got empty like: '.print_r($post, true), LOGGER_DEBUG);
 		return;
 	}
 
@@ -928,14 +929,14 @@ function pumpio_dolike(App $a, $uid, $self, $post, $own_id, $threadcompletion =
 
 	$contactid = 0;
 
-	if (link_compare($post->actor->url, $own_id)) {
+	if (Text::linkCompare($post->actor->url, $own_id)) {
 		$contactid = $self[0]['id'];
 		$post->actor->displayName = $self[0]['name'];
 		$post->actor->url = $self[0]['url'];
 		$post->actor->image->url = $self[0]['photo'];
 	} else {
 		$r = q("SELECT * FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d AND `blocked` = 0 AND `readonly` = 0 LIMIT 1",
-			DBA::escape(normalise_link($post->actor->url)),
+			DBA::escape(Text::normaliseLink($post->actor->url)),
 			intval($uid)
 		);
 
@@ -950,7 +951,7 @@ function pumpio_dolike(App $a, $uid, $self, $post, $own_id, $threadcompletion =
 
 	$condition = ['verb' => ACTIVITY_LIKE, 'uid' => $uid, 'contact-id' => $contactid, 'thr-parent' => $orig_post['uri']];
 	if (Item::exists($condition)) {
-		logger("pumpio_dolike: found existing like. User ".$own_id." ".$uid." Contact: ".$contactid." Url ".$orig_post['uri']);
+		Text::logger("pumpio_dolike: found existing like. User ".$own_id." ".$uid." Contact: ".$contactid." Url ".$orig_post['uri']);
 		return;
 	}
 
@@ -980,11 +981,11 @@ function pumpio_dolike(App $a, $uid, $self, $post, $own_id, $threadcompletion =
 	$likedata['body'] = L10n::t('%1$s likes %2$s\'s %3$s', $author, $objauthor, $plink);
 
 	$likedata['object'] = '<object><type>' . ACTIVITY_OBJ_NOTE . '</type><local>1</local>' .
-		'<id>' . $orig_post['uri'] . '</id><link>' . xmlify('<link rel="alternate" type="text/html" href="' . xmlify($orig_post['plink']) . '" />') . '</link><title>' . $orig_post['title'] . '</title><content>' . $orig_post['body'] . '</content></object>';
+		'<id>' . $orig_post['uri'] . '</id><link>' . Text::xmlify('<link rel="alternate" type="text/html" href="' . Text::xmlify($orig_post['plink']) . '" />') . '</link><title>' . $orig_post['title'] . '</title><content>' . $orig_post['body'] . '</content></object>';
 
 	$ret = Item::insert($likedata);
 
-	logger("pumpio_dolike: ".$ret." User ".$own_id." ".$uid." Contact: ".$contactid." Url ".$orig_post['uri']);
+	Text::logger("pumpio_dolike: ".$ret." User ".$own_id." ".$uid." Contact: ".$contactid." Url ".$orig_post['uri']);
 }
 
 function pumpio_get_contact($uid, $contact, $no_insert = false)
@@ -1014,7 +1015,7 @@ function pumpio_get_contact($uid, $contact, $no_insert = false)
 	}
 
 	$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `nurl` = '%s' LIMIT 1",
-		intval($uid), DBA::escape(normalise_link($contact->url)));
+		intval($uid), DBA::escape(Text::normaliseLink($contact->url)));
 
 	if (!DBA::isResult($r)) {
 		// create contact record
@@ -1025,7 +1026,7 @@ function pumpio_get_contact($uid, $contact, $no_insert = false)
 			intval($uid),
 			DBA::escape(DateTimeFormat::utcNow()),
 			DBA::escape($contact->url),
-			DBA::escape(normalise_link($contact->url)),
+			DBA::escape(Text::normaliseLink($contact->url)),
 			DBA::escape(str_replace("acct:", "", $contact->id)),
 			DBA::escape(''),
 			DBA::escape($contact->id), // What is it for?
@@ -1042,7 +1043,7 @@ function pumpio_get_contact($uid, $contact, $no_insert = false)
 		);
 
 		$r = q("SELECT * FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d LIMIT 1",
-			DBA::escape(normalise_link($contact->url)),
+			DBA::escape(Text::normaliseLink($contact->url)),
 			intval($uid)
 			);
 
@@ -1162,7 +1163,7 @@ function pumpio_dopost(App $a, $client, $uid, $self, $post, $own_id, $threadcomp
 	} else {
 		$contact_id = pumpio_get_contact($uid, $post->actor, true);
 
-		if (link_compare($post->actor->url, $own_id)) {
+		if (Text::linkCompare($post->actor->url, $own_id)) {
 			$contact_id = $self[0]['id'];
 			$post->actor->displayName = $self[0]['name'];
 			$post->actor->url = $self[0]['url'];
@@ -1170,7 +1171,7 @@ function pumpio_dopost(App $a, $client, $uid, $self, $post, $own_id, $threadcomp
 		} elseif ($contact_id == 0) {
 			// Take an existing contact, the contact of the note or - as a fallback - the id of the user
 			$r = q("SELECT * FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d AND `blocked` = 0 AND `readonly` = 0 LIMIT 1",
-				DBA::escape(normalise_link($post->actor->url)),
+				DBA::escape(Text::normaliseLink($post->actor->url)),
 				intval($uid)
 			);
 
@@ -1178,7 +1179,7 @@ function pumpio_dopost(App $a, $client, $uid, $self, $post, $own_id, $threadcomp
 				$contact_id = $r[0]['id'];
 			} else {
 				$r = q("SELECT * FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d AND `blocked` = 0 AND `readonly` = 0 LIMIT 1",
-					DBA::escape(normalise_link($post->actor->url)),
+					DBA::escape(Text::normaliseLink($post->actor->url)),
 					intval($uid)
 				);
 
@@ -1432,7 +1433,7 @@ function pumpio_queue_hook(App $a, array &$b)
 			continue;
 		}
 
-		logger('pumpio_queue: run');
+		Text::logger('pumpio_queue: run');
 
 		$r = q("SELECT `user`.* FROM `user` LEFT JOIN `contact` ON `contact`.`uid` = `user`.`uid`
 			WHERE `contact`.`self` = 1 AND `contact`.`id` = %d LIMIT 1",
@@ -1444,7 +1445,7 @@ function pumpio_queue_hook(App $a, array &$b)
 
 		$userdata = $r[0];
 
-		//logger('pumpio_queue: fetching userdata '.print_r($userdata, true));
+		//Text::logger('pumpio_queue: fetching userdata '.print_r($userdata, true));
 
 		$oauth_token        = PConfig::get($userdata['uid'], "pumpio", "oauth_token");
 		$oauth_token_secret = PConfig::get($userdata['uid'], "pumpio", "oauth_token_secret");
@@ -1460,7 +1461,7 @@ function pumpio_queue_hook(App $a, array &$b)
 			$consumer_key && $consumer_secret) {
 			$username = $user.'@'.$host;
 
-			logger('pumpio_queue: able to post for user '.$username);
+			Text::logger('pumpio_queue: able to post for user '.$username);
 
 			$z = unserialize($x['content']);
 
@@ -1481,21 +1482,21 @@ function pumpio_queue_hook(App $a, array &$b)
 
 			if ($success) {
 				$post_id = $user->object->id;
-				logger('pumpio_queue: send '.$username.': success '.$post_id);
+				Text::logger('pumpio_queue: send '.$username.': success '.$post_id);
 				if ($post_id && $iscomment) {
-					logger('pumpio_send '.$username.': Update extid '.$post_id." for post id ".$z['item']);
+					Text::logger('pumpio_send '.$username.': Update extid '.$post_id." for post id ".$z['item']);
 					Item::update(['extid' => $post_id], ['id' => $z['item']]);
 				}
 				Queue::removeItem($x['id']);
 			} else {
-				logger('pumpio_queue: send '.$username.': '.$z['url'].' general error: ' . print_r($user, true));
+				Text::logger('pumpio_queue: send '.$username.': '.$z['url'].' general error: ' . print_r($user, true));
 			}
 		} else {
-			logger("pumpio_queue: Error getting tokens for user ".$userdata['uid']);
+			Text::logger("pumpio_queue: Error getting tokens for user ".$userdata['uid']);
 		}
 
 		if (!$success) {
-			logger('pumpio_queue: delayed');
+			Text::logger('pumpio_queue: delayed');
 			Queue::updateTime($x['id']);
 		}
 	}
@@ -1595,7 +1596,7 @@ function pumpio_fetchallcomments(App $a, $uid, $id)
 	$hostname = PConfig::get($uid, 'pumpio', 'host');
 	$username = PConfig::get($uid, "pumpio", "user");
 
-	logger("pumpio_fetchallcomments: completing comment for user ".$uid." post id ".$id);
+	Text::logger("pumpio_fetchallcomments: completing comment for user ".$uid." post id ".$id);
 
 	$own_id = "https://".$hostname."/".$username;
 
@@ -1621,7 +1622,7 @@ function pumpio_fetchallcomments(App $a, $uid, $id)
 	$client->access_token = $otoken;
 	$client->access_token_secret = $osecret;
 
-	logger("pumpio_fetchallcomments: fetching comment for user ".$uid." url ".$url);
+	Text::logger("pumpio_fetchallcomments: fetching comment for user ".$uid." url ".$url);
 
 	if (pumpio_reachable($url)) {
 		$success = $client->CallAPI($url, 'GET', [], ['FailOnAccessError'=>true], $item);
@@ -1684,7 +1685,7 @@ function pumpio_fetchallcomments(App $a, $uid, $id)
 
 		$post->object = $item;
 
-		logger("pumpio_fetchallcomments: posting comment ".$post->object->id." ".print_r($post, true));
+		Text::logger("pumpio_fetchallcomments: posting comment ".$post->object->id." ".print_r($post, true));
 		pumpio_dopost($a, $client, $uid, $self, $post, $own_id, false);
 	}
 }
diff --git a/pumpio/pumpio_sync.php b/pumpio/pumpio_sync.php
index a8fa7b3c..eeef683d 100644
--- a/pumpio/pumpio_sync.php
+++ b/pumpio/pumpio_sync.php
@@ -1,4 +1,5 @@
 <?php
+use Friendica\Content\Text;
 use Friendica\Core\Config;
 
 function pumpio_sync_run(&$argv, &$argc) {
@@ -9,7 +10,7 @@ function pumpio_sync_run(&$argv, &$argc) {
 	if (function_exists('sys_getloadavg')) {
 		$load = sys_getloadavg();
 		if (intval($load[0]) > Config::get('system', 'maxloadavg', 50)) {
-			logger('system: load ' . $load[0] . ' too high. Pumpio sync deferred to next scheduled run.');
+			Text::logger('system: load ' . $load[0] . ' too high. Pumpio sync deferred to next scheduled run.');
 			return;
 		}
 	}
diff --git a/qcomment/qcomment.php b/qcomment/qcomment.php
index 2ce81d99..b87e69ed 100644
--- a/qcomment/qcomment.php
+++ b/qcomment/qcomment.php
@@ -17,6 +17,7 @@
  * them to open the comment window fully and insert the qcomment. Then "Submit" will submit it.
  *
  */
+use Friendica\Content\Text;
 use Friendica\Core\Addon;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
@@ -50,7 +51,7 @@ function qcomment_addon_settings(&$a, &$s)
 	$s .= '<div id="qcomment-wrapper">';
 	$s .= '<div id="qcomment-desc">' . L10n::t("Quick comments are found near comment boxes, sometimes hidden. Click them to provide simple replies.") . '</div>';
 	$s .= '<label id="qcomment-label" for="qcomment-words">' . L10n::t('Enter quick comments, one per line') . ' </label>';
-	$s .= '<textarea id="qcomment-words" type="text" name="qcomment-words" >' . htmlspecialchars(unxmlify($words)) . '</textarea>';
+	$s .= '<textarea id="qcomment-words" type="text" name="qcomment-words" >' . htmlspecialchars(unText::unxmlify($words)) . '</textarea>';
 	$s .= '</div><div class="clear"></div>';
 
 	$s .= '<div class="settings-submit-wrapper" ><input type="submit" id="qcomment-submit" name="qcomment-submit" class="settings-submit" value="' . L10n::t('Save Settings') . '" /></div>';
@@ -65,7 +66,7 @@ function qcomment_addon_settings_post(&$a,&$b) {
 		return;
 
 	if($_POST['qcomment-submit']) {
-		PConfig::set(local_user(),'qcomment','words',xmlify($_POST['qcomment-words']));
+		PConfig::set(local_user(), 'qcomment', 'words', Text::xmlify($_POST['qcomment-words']));
 		info(L10n::t('Quick Comment settings saved.') . EOL);
 	}
 }
diff --git a/randplace/randplace.php b/randplace/randplace.php
index 019d6f76..459e74a0 100644
--- a/randplace/randplace.php
+++ b/randplace/randplace.php
@@ -18,6 +18,7 @@
  * system will call the name_uninstall() function.
  *
  */
+use Friendica\Content\Text;
 use Friendica\Core\Addon;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
@@ -44,7 +45,7 @@ function randplace_install() {
 	Addon::registerHook('addon_settings', 'addon/randplace/randplace.php', 'randplace_settings');
 	Addon::registerHook('addon_settings_post', 'addon/randplace/randplace.php', 'randplace_settings_post');
 
-	logger("installed randplace");
+	Text::logger("installed randplace");
 }
 
 
@@ -63,7 +64,7 @@ function randplace_uninstall() {
 	Addon::unregisterHook('addon_settings_post', 'addon/randplace/randplace.php', 'randplace_settings_post');
 
 
-	logger("removed randplace");
+	Text::logger("removed randplace");
 }
 
 
@@ -79,7 +80,7 @@ function randplace_post_hook($a, &$item) {
 	 *
 	 */
 
-	logger('randplace invoked');
+	Text::logger('randplace invoked');
 
 	if(! local_user())   /* non-zero if this is a logged in user of this system */
 		return;
diff --git a/remote_permissions/remote_permissions.php b/remote_permissions/remote_permissions.php
index c883c5b8..09bd1dfc 100644
--- a/remote_permissions/remote_permissions.php
+++ b/remote_permissions/remote_permissions.php
@@ -7,6 +7,7 @@
  * Status: Unsupported
  */
 
+use Friendica\Content\Text;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
@@ -45,8 +46,8 @@ function remote_permissions_settings(&$a,&$o) {
 	/* Add some HTML to the existing form */
 
 //	$t = file_get_contents("addon/remote_permissions/settings.tpl" );
-	$t = get_markup_template("settings.tpl", "addon/remote_permissions/" );
-	$o .= replace_macros($t, [
+	$t = Text::getMarkupTemplate("settings.tpl", "addon/remote_permissions/" );
+	$o .= Text::replaceMacros($t, [
 		'$remote_perms_title' => L10n::t('Remote Permissions Settings'),
 		'$remote_perms_label' => L10n::t('Allow recipients of your private posts to see the other recipients of the posts'),
 		'$checked' => (($remote_perms == 1) ? 'checked="checked"' : ''),
@@ -121,10 +122,10 @@ function remote_permissions_content($a, $item_copy) {
 
 			$item = $r[0];
 
-			$allowed_users = expand_acl($item['allow_cid']);
-			$allowed_groups = expand_acl($item['allow_gid']);
-			$deny_users = expand_acl($item['deny_cid']);
-			$deny_groups = expand_acl($item['deny_gid']);
+			$allowed_users = Text::expandAcl($item['allow_cid']);
+			$allowed_groups = Text::expandAcl($item['allow_gid']);
+			$deny_users = Text::expandAcl($item['deny_cid']);
+			$deny_groups = Text::expandAcl($item['deny_gid']);
 
 			$o = L10n::t('Visible to:') . '<br />';
 			$allow = [];
@@ -196,8 +197,8 @@ function remote_permissions_content($a, $item_copy) {
 }
 
 function remote_permissions_addon_admin(&$a, &$o){
-	$t = get_markup_template( "admin.tpl", "addon/remote_permissions/" );
-	$o = replace_macros($t, [
+	$t = Text::getMarkupTemplate( "admin.tpl", "addon/remote_permissions/" );
+	$o = Text::replaceMacros($t, [
 		'$submit' => L10n::t('Save Settings'),
 		'$global' => ['remotepermschoice', L10n::t('Global'), 1, L10n::t('The posts of every user on this server show the post recipients'),  Config::get('remote_perms', 'global') == 1],
 		'$individual' => ['remotepermschoice', L10n::t('Individual'), 2, L10n::t('Each user chooses whether his/her posts show the post recipients'),  Config::get('remote_perms', 'global') == 0]
@@ -205,7 +206,7 @@ function remote_permissions_addon_admin(&$a, &$o){
 }
 
 function remote_permissions_addon_admin_post(&$a){
-	$choice	=	((x($_POST,'remotepermschoice'))		? notags(trim($_POST['remotepermschoice']))	: '');
+	$choice	=	((x($_POST,'remotepermschoice'))		? Text::noTags(trim($_POST['remotepermschoice']))	: '');
 	Config::set('remote_perms','global',($choice == 1 ? 1 : 0));
 	info(L10n::t('Settings updated.'). EOL);
 }
diff --git a/securemail/securemail.php b/securemail/securemail.php
index d935160e..e2abc811 100644
--- a/securemail/securemail.php
+++ b/securemail/securemail.php
@@ -7,6 +7,7 @@
  */
 
 use Friendica\App;
+use Friendica\Content\Text;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
@@ -31,7 +32,7 @@ function securemail_install() {
 
     Addon::registerHook('emailer_send_prepare', 'addon/securemail/securemail.php', 'securemail_emailer_send_prepare');
 
-    logger('installed securemail');
+    Text::logger('installed securemail');
 }
 
 function securemail_uninstall() {
@@ -40,7 +41,7 @@ function securemail_uninstall() {
 
     Addon::unregisterHook('emailer_send_prepare', 'addon/securemail/securemail.php', 'securemail_emailer_send_prepare');
 
-    logger('removed securemail');
+    Text::logger('removed securemail');
 }
 
 /**
@@ -61,9 +62,9 @@ function securemail_settings(App &$a, &$s){
     $enable = intval(PConfig::get(local_user(), 'securemail', 'enable'));
     $publickey = PConfig::get(local_user(), 'securemail', 'pkey');
 
-    $t = get_markup_template('admin.tpl', 'addon/securemail/');
+    $t = Text::getMarkupTemplate('admin.tpl', 'addon/securemail/');
 
-    $s .= replace_macros($t, [
+    $s .= Text::replaceMacros($t, [
         '$title' => L10n::t('"Secure Mail" Settings'),
         '$submit' => L10n::t('Save Settings'),
         '$test' => L10n::t('Save and send test'), //NOTE: update also in 'post'
diff --git a/smileybutton/smileybutton.php b/smileybutton/smileybutton.php
index e5aaef9c..45865086 100644
--- a/smileybutton/smileybutton.php
+++ b/smileybutton/smileybutton.php
@@ -5,13 +5,14 @@
  * Version: 0.2
  * Author: Johannes Schwab <https://friendica.jschwab.org/profile/ddorian>
  */
+use Friendica\Content\Text;
 use Friendica\Core\Addon;
 
 function smileybutton_install() {
 	//Register hooks
 	Addon::registerHook('jot_tool', 'addon/smileybutton/smileybutton.php', 'show_button');
 
-	logger("installed smileybutton");
+	Text::logger("installed smileybutton");
 }
 
 
@@ -19,7 +20,7 @@ function smileybutton_uninstall() {
 	//Delet registered hooks
 	Addon::unregisterHook('jot_tool',    'addon/smileybutton/smileybutton.php', 'show_button');
 
-	logger("removed smileybutton");
+	Text::logger("removed smileybutton");
 }
 
 
diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php
index 6cdc2372..b4f49985 100644
--- a/statusnet/statusnet.php
+++ b/statusnet/statusnet.php
@@ -41,6 +41,7 @@ require_once 'include/enotify.php';
 use CodebirdSN\CodebirdSN;
 use Friendica\App;
 use Friendica\Content\OEmbed;
+use Friendica\Content\Text;
 use Friendica\Content\Text\HTML;
 use Friendica\Content\Text\Plaintext;
 use Friendica\Core\Addon;
@@ -70,7 +71,7 @@ function statusnet_install()
 	Addon::registerHook('cron', 'addon/statusnet/statusnet.php', 'statusnet_cron');
 	Addon::registerHook('prepare_body', 'addon/statusnet/statusnet.php', 'statusnet_prepare_body');
 	Addon::registerHook('check_item_notification', 'addon/statusnet/statusnet.php', 'statusnet_check_item_notification');
-	logger("installed GNU Social");
+	Text::logger("installed GNU Social");
 }
 
 function statusnet_uninstall()
@@ -429,7 +430,7 @@ function statusnet_action(App $a, $uid, $pid, $action)
 
 	$connection = new StatusNetOAuth($api, $ckey, $csecret, $otoken, $osecret);
 
-	logger("statusnet_action '" . $action . "' ID: " . $pid, LOGGER_DATA);
+	Text::logger("statusnet_action '" . $action . "' ID: " . $pid, LOGGER_DATA);
 
 	switch ($action) {
 		case "delete":
@@ -442,7 +443,7 @@ function statusnet_action(App $a, $uid, $pid, $action)
 			$result = $connection->post("favorites/destroy/" . $pid);
 			break;
 	}
-	logger("statusnet_action '" . $action . "' send, result: " . print_r($result, true), LOGGER_DEBUG);
+	Text::logger("statusnet_action '" . $action . "' send, result: " . print_r($result, true), LOGGER_DEBUG);
 }
 
 function statusnet_post_hook(App $a, &$b)
@@ -459,19 +460,19 @@ function statusnet_post_hook(App $a, &$b)
 	$hostname = preg_replace("=https?://([\w\.]*)/.*=ism", "$1", $api);
 
 	if ($b['parent'] != $b['id']) {
-		logger("statusnet_post_hook: parameter " . print_r($b, true), LOGGER_DATA);
+		Text::logger("statusnet_post_hook: parameter " . print_r($b, true), LOGGER_DATA);
 
 		// Looking if its a reply to a GNU Social post
 		$hostlength = strlen($hostname) + 2;
 		if ((substr($b["parent-uri"], 0, $hostlength) != $hostname . "::") && (substr($b["extid"], 0, $hostlength) != $hostname . "::") && (substr($b["thr-parent"], 0, $hostlength) != $hostname . "::")) {
-			logger("statusnet_post_hook: no GNU Social post " . $b["parent"]);
+			Text::logger("statusnet_post_hook: no GNU Social post " . $b["parent"]);
 			return;
 		}
 
 		$condition = ['uri' => $b["thr-parent"], 'uid' => $b["uid"]];
 		$orig_post = Item::selectFirst(['author-link', 'uri'], $condition);
 		if (!DBA::isResult($orig_post)) {
-			logger("statusnet_post_hook: no parent found " . $b["thr-parent"]);
+			Text::logger("statusnet_post_hook: no parent found " . $b["thr-parent"]);
 			return;
 		} else {
 			$iscomment = true;
@@ -482,12 +483,12 @@ function statusnet_post_hook(App $a, &$b)
 		$nickname = "@[url=" . $orig_post["author-link"] . "]" . $nick . "[/url]";
 		$nicknameplain = "@" . $nick;
 
-		logger("statusnet_post_hook: comparing " . $nickname . " and " . $nicknameplain . " with " . $b["body"], LOGGER_DEBUG);
+		Text::logger("statusnet_post_hook: comparing " . $nickname . " and " . $nicknameplain . " with " . $b["body"], LOGGER_DEBUG);
 		if ((strpos($b["body"], $nickname) === false) && (strpos($b["body"], $nicknameplain) === false)) {
 			$b["body"] = $nickname . " " . $b["body"];
 		}
 
-		logger("statusnet_post_hook: parent found " . print_r($orig_post, true), LOGGER_DEBUG);
+		Text::logger("statusnet_post_hook: parent found " . print_r($orig_post, true), LOGGER_DEBUG);
 	} else {
 		$iscomment = false;
 
@@ -508,7 +509,7 @@ function statusnet_post_hook(App $a, &$b)
 	}
 
 	if ($b['verb'] == ACTIVITY_LIKE) {
-		logger("statusnet_post_hook: parameter 2 " . substr($b["thr-parent"], $hostlength), LOGGER_DEBUG);
+		Text::logger("statusnet_post_hook: parameter 2 " . substr($b["thr-parent"], $hostlength), LOGGER_DEBUG);
 		if ($b['deleted'])
 			statusnet_action($a, $b["uid"], substr($b["thr-parent"], $hostlength), "unlike");
 		else
@@ -529,7 +530,7 @@ function statusnet_post_hook(App $a, &$b)
 		return;
 	}
 
-	logger('GNU Socialpost invoked');
+	Text::logger('GNU Socialpost invoked');
 
 	PConfig::load($b['uid'], 'statusnet');
 
@@ -578,7 +579,7 @@ function statusnet_post_hook(App $a, &$b)
 		if (strlen($msg)) {
 			if ($iscomment) {
 				$postdata["in_reply_to_status_id"] = substr($orig_post["uri"], $hostlength);
-				logger('statusnet_post send reply ' . print_r($postdata, true), LOGGER_DEBUG);
+				Text::logger('statusnet_post send reply ' . print_r($postdata, true), LOGGER_DEBUG);
 			}
 
 			// New code that is able to post pictures
@@ -589,7 +590,7 @@ function statusnet_post_hook(App $a, &$b)
 			$cb->setToken($otoken, $osecret);
 			$result = $cb->statuses_update($postdata);
 			//$result = $dent->post('statuses/update', $postdata);
-			logger('statusnet_post send, result: ' . print_r($result, true) .
+			Text::logger('statusnet_post send, result: ' . print_r($result, true) .
 				"\nmessage: " . $msg . "\nOriginal post: " . print_r($b, true) . "\nPost Data: " . print_r($postdata, true), LOGGER_DEBUG);
 
 			if (!empty($result->source)) {
@@ -597,9 +598,9 @@ function statusnet_post_hook(App $a, &$b)
 			}
 
 			if (!empty($result->error)) {
-				logger('Send to GNU Social failed: "' . $result->error . '"');
+				Text::logger('Send to GNU Social failed: "' . $result->error . '"');
 			} elseif ($iscomment) {
-				logger('statusnet_post: Update extid ' . $result->id . " for post id " . $b['id']);
+				Text::logger('statusnet_post: Update extid ' . $result->id . " for post id " . $b['id']);
 				Item::update(['extid' => $hostname . "::" . $result->id, 'body' => $result->text], ['id' => $b['id']]);
 			}
 		}
@@ -621,7 +622,7 @@ function statusnet_addon_admin_post(App $a)
 		}
 		$secret = trim($_POST['secret'][$id]);
 		$key = trim($_POST['key'][$id]);
-		//$applicationname = ((x($_POST, 'applicationname')) ? notags(trim($_POST['applicationname'][$id])):'');
+		//$applicationname = ((x($_POST, 'applicationname')) ? Text::noTags(trim($_POST['applicationname'][$id])):'');
 		if ($sitename != "" &&
 			$apiurl != "" &&
 			$secret != "" &&
@@ -667,8 +668,8 @@ function statusnet_addon_admin(App $a, &$o)
 		//'applicationname' => Array("applicationname[$id]", L10n::t("Application name"), "", ""),
 	];
 
-	$t = get_markup_template("admin.tpl", "addon/statusnet/");
-	$o = replace_macros($t, [
+	$t = Text::getMarkupTemplate("admin.tpl", "addon/statusnet/");
+	$o = Text::replaceMacros($t, [
 		'$submit' => L10n::t('Save Settings'),
 		'$sites' => $sitesform,
 	]);
@@ -729,16 +730,16 @@ function statusnet_cron(App $a, $b)
 	if ($last) {
 		$next = $last + ($poll_interval * 60);
 		if ($next > time()) {
-			logger('statusnet: poll intervall not reached');
+			Text::logger('statusnet: poll intervall not reached');
 			return;
 		}
 	}
-	logger('statusnet: cron_start');
+	Text::logger('statusnet: cron_start');
 
 	$r = q("SELECT * FROM `pconfig` WHERE `cat` = 'statusnet' AND `k` = 'mirror_posts' AND `v` = '1' ORDER BY RAND() ");
 	if (DBA::isResult($r)) {
 		foreach ($r as $rr) {
-			logger('statusnet: fetching for user ' . $rr['uid']);
+			Text::logger('statusnet: fetching for user ' . $rr['uid']);
 			statusnet_fetchtimeline($a, $rr['uid']);
 		}
 	}
@@ -756,17 +757,17 @@ function statusnet_cron(App $a, $b)
 			if ($abandon_days != 0) {
 				$user = q("SELECT `login_date` FROM `user` WHERE uid=%d AND `login_date` >= '%s'", $rr['uid'], $abandon_limit);
 				if (!DBA::isResult($user)) {
-					logger('abandoned account: timeline from user ' . $rr['uid'] . ' will not be imported');
+					Text::logger('abandoned account: timeline from user ' . $rr['uid'] . ' will not be imported');
 					continue;
 				}
 			}
 
-			logger('statusnet: importing timeline from user ' . $rr['uid']);
+			Text::logger('statusnet: importing timeline from user ' . $rr['uid']);
 			statusnet_fetchhometimeline($a, $rr["uid"], $rr["v"]);
 		}
 	}
 
-	logger('statusnet: cron_end');
+	Text::logger('statusnet: cron_end');
 
 	Config::set('statusnet', 'last_poll', time());
 }
@@ -871,7 +872,7 @@ function statusnet_fetchtimeline(App $a, $uid)
 
 				//print_r($_REQUEST);
 				if ($_REQUEST["body"] != "") {
-					logger('statusnet: posting for user ' . $uid);
+					Text::logger('statusnet: posting for user ' . $uid);
 
 					item_post($a);
 				}
@@ -883,7 +884,7 @@ function statusnet_fetchtimeline(App $a, $uid)
 
 function statusnet_address($contact)
 {
-	$hostname = normalise_link($contact->statusnet_profile_url);
+	$hostname = Text::normaliseLink($contact->statusnet_profile_url);
 	$nickname = $contact->screen_name;
 
 	$hostname = preg_replace("=https?://([\w\.]*)/.*=ism", "$1", $contact->statusnet_profile_url);
@@ -905,14 +906,14 @@ function statusnet_fetch_contact($uid, $contact, $create_user)
 		"location" => $contact->location, "about" => $contact->description,
 		"addr" => statusnet_address($contact), "generation" => 3]);
 
-	$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `alias` = '%s' AND `network` = '%s'LIMIT 1", intval($uid), DBA::escape(normalise_link($contact->statusnet_profile_url)), DBA::escape(Protocol::STATUSNET));
+	$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `alias` = '%s' AND `network` = '%s'LIMIT 1", intval($uid), DBA::escape(Text::normaliseLink($contact->statusnet_profile_url)), DBA::escape(Protocol::STATUSNET));
 
 	if (!DBA::isResult($r) && !$create_user) {
 		return 0;
 	}
 
 	if (DBA::isResult($r) && ($r[0]["readonly"] || $r[0]["blocked"])) {
-		logger("statusnet_fetch_contact: Contact '" . $r[0]["nick"] . "' is blocked or readonly.", LOGGER_DEBUG);
+		Text::logger("statusnet_fetch_contact: Contact '" . $r[0]["nick"] . "' is blocked or readonly.", LOGGER_DEBUG);
 		return -1;
 	}
 
@@ -925,9 +926,9 @@ function statusnet_fetch_contact($uid, $contact, $create_user)
 			intval($uid),
 			DBA::escape(DateTimeFormat::utcNow()),
 			DBA::escape($contact->statusnet_profile_url),
-			DBA::escape(normalise_link($contact->statusnet_profile_url)),
+			DBA::escape(Text::normaliseLink($contact->statusnet_profile_url)),
 			DBA::escape(statusnet_address($contact)),
-			DBA::escape(normalise_link($contact->statusnet_profile_url)),
+			DBA::escape(Text::normaliseLink($contact->statusnet_profile_url)),
 			DBA::escape(''),
 			DBA::escape(''),
 			DBA::escape($contact->name),
@@ -974,7 +975,7 @@ function statusnet_fetch_contact($uid, $contact, $create_user)
 
 		// check that we have all the photos, this has been known to fail on occasion
 		if ((!$r[0]['photo']) || (!$r[0]['thumb']) || (!$r[0]['micro']) || ($update_photo)) {
-			logger("statusnet_fetch_contact: Updating contact " . $contact->screen_name, LOGGER_DEBUG);
+			Text::logger("statusnet_fetch_contact: Updating contact " . $contact->screen_name, LOGGER_DEBUG);
 
 			$photos = Photo::importProfilePhoto($contact->profile_image_url, $uid, $r[0]['id']);
 
@@ -999,7 +1000,7 @@ function statusnet_fetch_contact($uid, $contact, $create_user)
 				DBA::escape(DateTimeFormat::utcNow()),
 				DBA::escape(DateTimeFormat::utcNow()),
 				DBA::escape($contact->statusnet_profile_url),
-				DBA::escape(normalise_link($contact->statusnet_profile_url)),
+				DBA::escape(Text::normaliseLink($contact->statusnet_profile_url)),
 				DBA::escape(statusnet_address($contact)),
 				DBA::escape($contact->name),
 				DBA::escape($contact->screen_name),
@@ -1060,7 +1061,7 @@ function statusnet_fetchuser(App $a, $uid, $screen_name = "", $user_id = "")
 
 function statusnet_createpost(App $a, $uid, $post, $self, $create_user, $only_existing_contact)
 {
-	logger("statusnet_createpost: start", LOGGER_DEBUG);
+	Text::logger("statusnet_createpost: start", LOGGER_DEBUG);
 
 	$api = PConfig::get($uid, 'statusnet', 'baseapi');
 	$hostname = preg_replace("=https?://([\w\.]*)/.*=ism", "$1", $api);
@@ -1187,7 +1188,7 @@ function statusnet_createpost(App $a, $uid, $post, $self, $create_user, $only_ex
 		$postarray["coord"] = $content->coordinates->coordinates[1] . " " . $content->coordinates->coordinates[0];
 	}
 
-	logger("statusnet_createpost: end", LOGGER_DEBUG);
+	Text::logger("statusnet_createpost: end", LOGGER_DEBUG);
 
 	return $postarray;
 }
@@ -1206,7 +1207,7 @@ function statusnet_fetchhometimeline(App $a, $uid, $mode = 1)
 	// "create_user" is deactivated, since currently you cannot add users manually by now
 	$create_user = true;
 
-	logger("statusnet_fetchhometimeline: Fetching for user " . $uid, LOGGER_DEBUG);
+	Text::logger("statusnet_fetchhometimeline: Fetching for user " . $uid, LOGGER_DEBUG);
 
 	require_once 'include/items.php';
 
@@ -1221,7 +1222,7 @@ function statusnet_fetchhometimeline(App $a, $uid, $mode = 1)
 	if (DBA::isResult($r)) {
 		$nick = $r[0]["nick"];
 	} else {
-		logger("statusnet_fetchhometimeline: Own GNU Social contact not found for user " . $uid, LOGGER_DEBUG);
+		Text::logger("statusnet_fetchhometimeline: Own GNU Social contact not found for user " . $uid, LOGGER_DEBUG);
 		return;
 	}
 
@@ -1231,14 +1232,14 @@ function statusnet_fetchhometimeline(App $a, $uid, $mode = 1)
 	if (DBA::isResult($r)) {
 		$self = $r[0];
 	} else {
-		logger("statusnet_fetchhometimeline: Own contact not found for user " . $uid, LOGGER_DEBUG);
+		Text::logger("statusnet_fetchhometimeline: Own contact not found for user " . $uid, LOGGER_DEBUG);
 		return;
 	}
 
 	$u = q("SELECT * FROM user WHERE uid = %d LIMIT 1",
 		intval($uid));
 	if (!DBA::isResult($u)) {
-		logger("statusnet_fetchhometimeline: Own user not found for user " . $uid, LOGGER_DEBUG);
+		Text::logger("statusnet_fetchhometimeline: Own user not found for user " . $uid, LOGGER_DEBUG);
 		return;
 	}
 
@@ -1269,13 +1270,13 @@ function statusnet_fetchhometimeline(App $a, $uid, $mode = 1)
 				$errormsg = "Unknown error";
 			}
 
-			logger("statusnet_fetchhometimeline: Error fetching home timeline: " . $errormsg, LOGGER_DEBUG);
+			Text::logger("statusnet_fetchhometimeline: Error fetching home timeline: " . $errormsg, LOGGER_DEBUG);
 			return;
 		}
 
 		$posts = array_reverse($items);
 
-		logger("statusnet_fetchhometimeline: Fetching timeline for user " . $uid . " " . sizeof($posts) . " items", LOGGER_DEBUG);
+		Text::logger("statusnet_fetchhometimeline: Fetching timeline for user " . $uid . " " . sizeof($posts) . " items", LOGGER_DEBUG);
 
 		if (count($posts)) {
 			foreach ($posts as $post) {
@@ -1303,7 +1304,7 @@ function statusnet_fetchhometimeline(App $a, $uid, $mode = 1)
 					$item = Item::insert($postarray);
 					$postarray["id"] = $item;
 
-					logger('statusnet_fetchhometimeline: User ' . $self["nick"] . ' posted home timeline item ' . $item);
+					Text::logger('statusnet_fetchhometimeline: User ' . $self["nick"] . ' posted home timeline item ' . $item);
 				}
 			}
 		}
@@ -1321,13 +1322,13 @@ function statusnet_fetchhometimeline(App $a, $uid, $mode = 1)
 	$items = $connection->get('statuses/mentions_timeline', $parameters);
 
 	if (!is_array($items)) {
-		logger("statusnet_fetchhometimeline: Error fetching mentions: " . print_r($items, true), LOGGER_DEBUG);
+		Text::logger("statusnet_fetchhometimeline: Error fetching mentions: " . print_r($items, true), LOGGER_DEBUG);
 		return;
 	}
 
 	$posts = array_reverse($items);
 
-	logger("statusnet_fetchhometimeline: Fetching mentions for user " . $uid . " " . sizeof($posts) . " items", LOGGER_DEBUG);
+	Text::logger("statusnet_fetchhometimeline: Fetching mentions for user " . $uid . " " . sizeof($posts) . " items", LOGGER_DEBUG);
 
 	if (count($posts)) {
 		foreach ($posts as $post) {
@@ -1353,7 +1354,7 @@ function statusnet_fetchhometimeline(App $a, $uid, $mode = 1)
 
 				$item = Item::insert($postarray);
 
-				logger('statusnet_fetchhometimeline: User ' . $self["nick"] . ' posted mention timeline item ' . $item);
+				Text::logger('statusnet_fetchhometimeline: User ' . $self["nick"] . ' posted mention timeline item ' . $item);
 			}
 		}
 	}
@@ -1388,7 +1389,7 @@ function statusnet_complete_conversation(App $a, $uid, $self, $create_user, $nic
 			$item = Item::insert($postarray);
 			$postarray["id"] = $item;
 
-			logger('statusnet_complete_conversation: User ' . $self["nick"] . ' posted home timeline item ' . $item);
+			Text::logger('statusnet_complete_conversation: User ' . $self["nick"] . ' posted home timeline item ' . $item);
 		}
 	}
 }
@@ -1411,15 +1412,15 @@ function statusnet_convertmsg(App $a, $body, $no_tags = false)
 		foreach ($matches AS $match) {
 			$search = "[url=" . $match[1] . "]" . $match[2] . "[/url]";
 
-			logger("statusnet_convertmsg: expanding url " . $match[1], LOGGER_DEBUG);
+			Text::logger("statusnet_convertmsg: expanding url " . $match[1], LOGGER_DEBUG);
 
 			$expanded_url = Network::finalUrl($match[1]);
 
-			logger("statusnet_convertmsg: fetching data for " . $expanded_url, LOGGER_DEBUG);
+			Text::logger("statusnet_convertmsg: fetching data for " . $expanded_url, LOGGER_DEBUG);
 
 			$oembed_data = OEmbed::fetchURL($expanded_url, true);
 
-			logger("statusnet_convertmsg: fetching data: done", LOGGER_DEBUG);
+			Text::logger("statusnet_convertmsg: fetching data: done", LOGGER_DEBUG);
 
 			if ($type == "") {
 				$type = $oembed_data->type;
@@ -1521,7 +1522,7 @@ function statusnet_fetch_own_contact(App $a, $uid)
 		// Fetching user data
 		$user = $connection->get('account/verify_credentials');
 
-		PConfig::set($uid, 'statusnet', 'own_url', normalise_link($user->statusnet_profile_url));
+		PConfig::set($uid, 'statusnet', 'own_url', Text::normaliseLink($user->statusnet_profile_url));
 
 		$contact_id = statusnet_fetch_contact($uid, $user, true);
 	} else {
@@ -1581,13 +1582,13 @@ function statusnet_is_retweet(App $a, $uid, $body)
 		return false;
 	}
 
-	logger('statusnet_is_retweet: Retweeting id ' . $id . ' for user ' . $uid, LOGGER_DEBUG);
+	Text::logger('statusnet_is_retweet: Retweeting id ' . $id . ' for user ' . $uid, LOGGER_DEBUG);
 
 	$connection = new StatusNetOAuth($api, $ckey, $csecret, $otoken, $osecret);
 
 	$result = $connection->post('statuses/retweet/' . $id);
 
-	logger('statusnet_is_retweet: result ' . print_r($result, true), LOGGER_DEBUG);
+	Text::logger('statusnet_is_retweet: result ' . print_r($result, true), LOGGER_DEBUG);
 
 	return isset($result->id);
 }
diff --git a/superblock/superblock.php b/superblock/superblock.php
index 8e42d473..d779a8e4 100644
--- a/superblock/superblock.php
+++ b/superblock/superblock.php
@@ -6,6 +6,7 @@
  * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
  *
  */
+use Friendica\Content\Text;
 use Friendica\Core\Addon;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
@@ -88,7 +89,7 @@ function superblock_enotify_store(&$a,&$b) {
 				continue;
 			}
 
-			if (link_compare($b['url'], $word)) {
+			if (Text::linkCompare($b['url'], $word)) {
 				$found = true;
 				break;
 			}
@@ -134,7 +135,7 @@ function superblock_item_photo_menu(&$a, &$b)
 	$author = $b['item']['author-link'];
 	if (!empty($a->data['superblock'])) {
 		foreach ($a->data['superblock'] as $bloke) {
-			if (link_compare($bloke, $author)) {
+			if (Text::linkCompare($bloke, $author)) {
 				$blocked = true;
 				break;
 			}
diff --git a/tumblr/tumblr.php b/tumblr/tumblr.php
index 5862958d..fe4a1d8b 100644
--- a/tumblr/tumblr.php
+++ b/tumblr/tumblr.php
@@ -10,6 +10,7 @@
 require_once __DIR__ . DIRECTORY_SEPARATOR . 'library' . DIRECTORY_SEPARATOR . 'tumblroauth.php';
 
 use Friendica\App;
+use Friendica\Content\Text;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
@@ -69,9 +70,9 @@ function tumblr_content(App $a)
 
 function tumblr_addon_admin(App $a, &$o)
 {
-	$t = get_markup_template( "admin.tpl", "addon/tumblr/" );
+	$t = Text::getMarkupTemplate( "admin.tpl", "addon/tumblr/" );
 
-	$o = replace_macros($t, [
+	$o = Text::replaceMacros($t, [
 		'$submit' => L10n::t('Save Settings'),
 		// name, label, value, help, [extra values]
 		'$consumer_key' => ['consumer_key', L10n::t('Consumer Key'),  Config::get('tumblr', 'consumer_key' ), ''],
@@ -81,8 +82,8 @@ function tumblr_addon_admin(App $a, &$o)
 
 function tumblr_addon_admin_post(App $a)
 {
-	$consumer_key    =       ((!empty($_POST['consumer_key']))      ? notags(trim($_POST['consumer_key']))   : '');
-	$consumer_secret =       ((!empty($_POST['consumer_secret']))   ? notags(trim($_POST['consumer_secret'])): '');
+	$consumer_key    =       ((!empty($_POST['consumer_key']))      ? Text::noTags(trim($_POST['consumer_key']))   : '');
+	$consumer_secret =       ((!empty($_POST['consumer_secret']))   ? Text::noTags(trim($_POST['consumer_secret'])): '');
 
 	Config::set('tumblr', 'consumer_key',$consumer_key);
 	Config::set('tumblr', 'consumer_secret',$consumer_secret);
@@ -458,11 +459,11 @@ function tumblr_send(App $a, array &$b) {
 
 		//print_r($params);
 		if ($ret_code == 201) {
-			logger('tumblr_send: success');
+			Text::logger('tumblr_send: success');
 		} elseif ($ret_code == 403) {
-			logger('tumblr_send: authentication failure');
+			Text::logger('tumblr_send: authentication failure');
 		} else {
-			logger('tumblr_send: general error: ' . print_r($x,true));
+			Text::logger('tumblr_send: general error: ' . print_r($x,true));
 		}
 	}
 }
diff --git a/twitter/twitter.php b/twitter/twitter.php
index 597278ca..92b2df12 100644
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -65,6 +65,7 @@ use Abraham\TwitterOAuth\TwitterOAuth;
 use Abraham\TwitterOAuth\TwitterOAuthException;
 use Friendica\App;
 use Friendica\Content\OEmbed;
+use Friendica\Content\Text;
 use Friendica\Content\Text\Plaintext;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
@@ -109,7 +110,7 @@ function twitter_install()
 	Addon::registerHook('expire'                 , __FILE__, 'twitter_expire');
 	Addon::registerHook('prepare_body'           , __FILE__, 'twitter_prepare_body');
 	Addon::registerHook('check_item_notification', __FILE__, 'twitter_check_item_notification');
-	logger("installed twitter");
+	Text::logger("installed twitter");
 }
 
 function twitter_uninstall()
@@ -154,7 +155,7 @@ function twitter_check_item_notification(App $a, array &$notification_data)
 
 function twitter_follow(App $a, array &$contact)
 {
-	logger("twitter_follow: Check if contact is twitter contact. " . $contact["url"], LOGGER_DEBUG);
+	Text::logger("twitter_follow: Check if contact is twitter contact. " . $contact["url"], LOGGER_DEBUG);
 
 	if (!strstr($contact["url"], "://twitter.com") && !strstr($contact["url"], "@twitter.com")) {
 		return;
@@ -235,7 +236,7 @@ function twitter_settings_post(App $a)
 	} else {
 		if (isset($_POST['twitter-pin'])) {
 			//  if the user supplied us with a PIN from Twitter, let the magic of OAuth happen
-			logger('got a Twitter PIN');
+			Text::logger('got a Twitter PIN');
 			$ckey    = Config::get('twitter', 'consumerkey');
 			$csecret = Config::get('twitter', 'consumersecret');
 			//  the token and secret for which the PIN was generated were hidden in the settings
@@ -346,7 +347,7 @@ function twitter_settings(App $a, &$s)
 			try {
 				$details = $connection->get('account/verify_credentials');
 
-				$field_checkbox = get_markup_template('field_checkbox.tpl');
+				$field_checkbox = Text::getMarkupTemplate('field_checkbox.tpl');
 
 				$s .= '<div id="twitter-info" >
 					<p>' . L10n::t('Currently connected to: ') . '<a href="https://twitter.com/' . $details->screen_name . '" target="_twitter">' . $details->screen_name . '</a>
@@ -359,22 +360,22 @@ function twitter_settings(App $a, &$s)
 				</div>';
 				$s .= '<div class="clear"></div>';
 
-				$s .= replace_macros($field_checkbox, [
+				$s .= Text::replaceMacros($field_checkbox, [
 					'$field' => ['twitter-enable', L10n::t('Allow posting to Twitter'), $enabled, L10n::t('If enabled all your <strong>public</strong> postings can be posted to the associated Twitter account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry.')]
 				]);
 				if ($a->user['hidewall']) {
 					$s .= '<p>' . L10n::t('<strong>Note</strong>: Due to your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted.') . '</p>';
 				}
-				$s .= replace_macros($field_checkbox, [
+				$s .= Text::replaceMacros($field_checkbox, [
 					'$field' => ['twitter-default', L10n::t('Send public postings to Twitter by default'), $defenabled, '']
 				]);
-				$s .= replace_macros($field_checkbox, [
+				$s .= Text::replaceMacros($field_checkbox, [
 					'$field' => ['twitter-mirror', L10n::t('Mirror all posts from twitter that are no replies'), $mirrorenabled, '']
 				]);
-				$s .= replace_macros($field_checkbox, [
+				$s .= Text::replaceMacros($field_checkbox, [
 					'$field' => ['twitter-import', L10n::t('Import the remote timeline'), $importenabled, '']
 				]);
-				$s .= replace_macros($field_checkbox, [
+				$s .= Text::replaceMacros($field_checkbox, [
 					'$field' => ['twitter-create_user', L10n::t('Automatically create contacts'), $create_userenabled, L10n::t('This will automatically create a contact in Friendica as soon as you receive a message from an existing contact via the Twitter network. If you do not enable this, you need to manually add those Twitter contacts in Friendica from whom you would like to see posts here. However if enabled, you cannot merely remove a twitter contact from the Friendica contact list, as it will recreate this contact when they post again.')]
 				]);
 				$s .= '<div class="clear"></div>';
@@ -427,7 +428,7 @@ function twitter_action(App $a, $uid, $pid, $action)
 
 	$post = ['id' => $pid];
 
-	logger("twitter_action '" . $action . "' ID: " . $pid . " data: " . print_r($post, true), LOGGER_DATA);
+	Text::logger("twitter_action '" . $action . "' ID: " . $pid . " data: " . print_r($post, true), LOGGER_DATA);
 
 	switch ($action) {
 		case "delete":
@@ -441,10 +442,10 @@ function twitter_action(App $a, $uid, $pid, $action)
 			$result = $connection->post('favorites/destroy', $post);
 			break;
 		default:
-			logger('Unhandled action ' . $action, LOGGER_DEBUG);
+			Text::logger('Unhandled action ' . $action, LOGGER_DEBUG);
 			$result = [];
 	}
-	logger("twitter_action '" . $action . "' send, result: " . print_r($result, true), LOGGER_DEBUG);
+	Text::logger("twitter_action '" . $action . "' send, result: " . print_r($result, true), LOGGER_DEBUG);
 }
 
 function twitter_post_hook(App $a, array &$b)
@@ -456,21 +457,21 @@ function twitter_post_hook(App $a, array &$b)
 	}
 
 	if ($b['parent'] != $b['id']) {
-		logger("twitter_post_hook: parameter " . print_r($b, true), LOGGER_DATA);
+		Text::logger("twitter_post_hook: parameter " . print_r($b, true), LOGGER_DATA);
 
 		// Looking if its a reply to a twitter post
 		if ((substr($b["parent-uri"], 0, 9) != "twitter::")
 			&& (substr($b["extid"], 0, 9) != "twitter::")
 			&& (substr($b["thr-parent"], 0, 9) != "twitter::"))
 		{
-			logger("twitter_post_hook: no twitter post " . $b["parent"]);
+			Text::logger("twitter_post_hook: no twitter post " . $b["parent"]);
 			return;
 		}
 
 		$condition = ['uri' => $b["thr-parent"], 'uid' => $b["uid"]];
 		$orig_post = Item::selectFirst([], $condition);
 		if (!DBA::isResult($orig_post)) {
-			logger("twitter_post_hook: no parent found " . $b["thr-parent"]);
+			Text::logger("twitter_post_hook: no parent found " . $b["thr-parent"]);
 			return;
 		} else {
 			$iscomment = true;
@@ -481,12 +482,12 @@ function twitter_post_hook(App $a, array &$b)
 		$nickname = "@[url=" . $orig_post["author-link"] . "]" . $nicknameplain . "[/url]";
 		$nicknameplain = "@" . $nicknameplain;
 
-		logger("twitter_post_hook: comparing " . $nickname . " and " . $nicknameplain . " with " . $b["body"], LOGGER_DEBUG);
+		Text::logger("twitter_post_hook: comparing " . $nickname . " and " . $nicknameplain . " with " . $b["body"], LOGGER_DEBUG);
 		if ((strpos($b["body"], $nickname) === false) && (strpos($b["body"], $nicknameplain) === false)) {
 			$b["body"] = $nickname . " " . $b["body"];
 		}
 
-		logger("twitter_post_hook: parent found " . print_r($orig_post, true), LOGGER_DATA);
+		Text::logger("twitter_post_hook: parent found " . print_r($orig_post, true), LOGGER_DATA);
 	} else {
 		$iscomment = false;
 
@@ -507,7 +508,7 @@ function twitter_post_hook(App $a, array &$b)
 	}
 
 	if ($b['verb'] == ACTIVITY_LIKE) {
-		logger("twitter_post_hook: parameter 2 " . substr($b["thr-parent"], 9), LOGGER_DEBUG);
+		Text::logger("twitter_post_hook: parameter 2 " . substr($b["thr-parent"], 9), LOGGER_DEBUG);
 		if ($b['deleted']) {
 			twitter_action($a, $b["uid"], substr($b["thr-parent"], 9), "unlike");
 		} else {
@@ -530,7 +531,7 @@ function twitter_post_hook(App $a, array &$b)
 		return;
 	}
 
-	logger('twitter post invoked');
+	Text::logger('twitter post invoked');
 
 	PConfig::load($b['uid'], 'twitter');
 
@@ -540,7 +541,7 @@ function twitter_post_hook(App $a, array &$b)
 	$osecret = PConfig::get($b['uid'], 'twitter', 'oauthsecret');
 
 	if ($ckey && $csecret && $otoken && $osecret) {
-		logger('twitter: we have customer key and oauth stuff, going to send.', LOGGER_DEBUG);
+		Text::logger('twitter: we have customer key and oauth stuff, going to send.', LOGGER_DEBUG);
 
 		// If it's a repeated message from twitter then do a native retweet and exit
 		if (twitter_is_retweet($a, $b['uid'], $b['body'])) {
@@ -608,7 +609,7 @@ function twitter_post_hook(App $a, array &$b)
 					throw new Exception('Failed upload of ' . $image);
 				}
 			} catch (Exception $e) {
-				logger('Exception when trying to send to Twitter: ' . $e->getMessage());
+				Text::logger('Exception when trying to send to Twitter: ' . $e->getMessage());
 
 				// Workaround: Remove the picture link so that the post can be reposted without it
 				// When there is another url already added, a second url would be superfluous.
@@ -628,14 +629,14 @@ function twitter_post_hook(App $a, array &$b)
 
 		$url = 'statuses/update';
 		$result = $connection->post($url, $post);
-		logger('twitter_post send, result: ' . print_r($result, true), LOGGER_DEBUG);
+		Text::logger('twitter_post send, result: ' . print_r($result, true), LOGGER_DEBUG);
 
 		if (!empty($result->source)) {
 			Config::set("twitter", "application_name", strip_tags($result->source));
 		}
 
 		if (!empty($result->errors)) {
-			logger('Send to Twitter failed: "' . print_r($result->errors, true) . '"');
+			Text::logger('Send to Twitter failed: "' . print_r($result->errors, true) . '"');
 
 			$r = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `self`", intval($b['uid']));
 			if (DBA::isResult($r)) {
@@ -647,7 +648,7 @@ function twitter_post_hook(App $a, array &$b)
 			Queue::add($a->contact, Protocol::TWITTER, $s);
 			notice(L10n::t('Twitter post failed. Queued for retry.') . EOL);
 		} elseif ($iscomment) {
-			logger('twitter_post: Update extid ' . $result->id_str . " for post id " . $b['id']);
+			Text::logger('twitter_post: Update extid ' . $result->id_str . " for post id " . $b['id']);
 			Item::update(['extid' => "twitter::" . $result->id_str], ['id' => $b['id']]);
 		}
 	}
@@ -655,8 +656,8 @@ function twitter_post_hook(App $a, array &$b)
 
 function twitter_addon_admin_post(App $a)
 {
-	$consumerkey    = x($_POST, 'consumerkey')    ? notags(trim($_POST['consumerkey']))    : '';
-	$consumersecret = x($_POST, 'consumersecret') ? notags(trim($_POST['consumersecret'])) : '';
+	$consumerkey    = x($_POST, 'consumerkey')    ? Text::noTags(trim($_POST['consumerkey']))    : '';
+	$consumersecret = x($_POST, 'consumersecret') ? Text::noTags(trim($_POST['consumersecret'])) : '';
 	Config::set('twitter', 'consumerkey', $consumerkey);
 	Config::set('twitter', 'consumersecret', $consumersecret);
 	info(L10n::t('Settings updated.') . EOL);
@@ -664,9 +665,9 @@ function twitter_addon_admin_post(App $a)
 
 function twitter_addon_admin(App $a, &$o)
 {
-	$t = get_markup_template("admin.tpl", "addon/twitter/");
+	$t = Text::getMarkupTemplate("admin.tpl", "addon/twitter/");
 
-	$o = replace_macros($t, [
+	$o = Text::replaceMacros($t, [
 		'$submit' => L10n::t('Save Settings'),
 		// name, label, value, help, [extra values]
 		'$consumerkey' => ['consumerkey', L10n::t('Consumer key'), Config::get('twitter', 'consumerkey'), ''],
@@ -686,16 +687,16 @@ function twitter_cron(App $a)
 	if ($last) {
 		$next = $last + ($poll_interval * 60);
 		if ($next > time()) {
-			logger('twitter: poll intervall not reached');
+			Text::logger('twitter: poll intervall not reached');
 			return;
 		}
 	}
-	logger('twitter: cron_start');
+	Text::logger('twitter: cron_start');
 
 	$r = q("SELECT * FROM `pconfig` WHERE `cat` = 'twitter' AND `k` = 'mirror_posts' AND `v` = '1'");
 	if (DBA::isResult($r)) {
 		foreach ($r as $rr) {
-			logger('twitter: fetching for user ' . $rr['uid']);
+			Text::logger('twitter: fetching for user ' . $rr['uid']);
 			Worker::add(PRIORITY_MEDIUM, "addon/twitter/twitter_sync.php", 1, (int) $rr['uid']);
 		}
 	}
@@ -713,12 +714,12 @@ function twitter_cron(App $a)
 			if ($abandon_days != 0) {
 				$user = q("SELECT `login_date` FROM `user` WHERE uid=%d AND `login_date` >= '%s'", $rr['uid'], $abandon_limit);
 				if (!DBA::isResult($user)) {
-					logger('abandoned account: timeline from user ' . $rr['uid'] . ' will not be imported');
+					Text::logger('abandoned account: timeline from user ' . $rr['uid'] . ' will not be imported');
 					continue;
 				}
 			}
 
-			logger('twitter: importing timeline from user ' . $rr['uid']);
+			Text::logger('twitter: importing timeline from user ' . $rr['uid']);
 			Worker::add(PRIORITY_MEDIUM, "addon/twitter/twitter_sync.php", 2, (int) $rr['uid']);
 			/*
 			  // To-Do
@@ -737,7 +738,7 @@ function twitter_cron(App $a)
 		}
 	}
 
-	logger('twitter: cron_end');
+	Text::logger('twitter: cron_end');
 
 	Config::set('twitter', 'last_poll', time());
 }
@@ -758,17 +759,17 @@ function twitter_expire(App $a)
 
 	require_once "include/items.php";
 
-	logger('twitter_expire: expire_start');
+	Text::logger('twitter_expire: expire_start');
 
 	$r = q("SELECT * FROM `pconfig` WHERE `cat` = 'twitter' AND `k` = 'import' AND `v` = '1' ORDER BY RAND()");
 	if (DBA::isResult($r)) {
 		foreach ($r as $rr) {
-			logger('twitter_expire: user ' . $rr['uid']);
+			Text::logger('twitter_expire: user ' . $rr['uid']);
 			Item::expire($rr['uid'], $days, Protocol::TWITTER, true);
 		}
 	}
 
-	logger('twitter_expire: expire_end');
+	Text::logger('twitter_expire: expire_end');
 }
 
 function twitter_prepare_body(App $a, array &$b)
@@ -903,18 +904,18 @@ function twitter_fetchtimeline(App $a, $uid)
 	try {
 		$items = $connection->get('statuses/user_timeline', $parameters);
 	} catch (TwitterOAuthException $e) {
-		logger('Error fetching timeline for user ' . $uid . ': ' . $e->getMessage());
+		Text::logger('Error fetching timeline for user ' . $uid . ': ' . $e->getMessage());
 		return;
 	}
 
 	if (!is_array($items)) {
-		logger('No items for user ' . $uid, LOGGER_INFO);
+		Text::logger('No items for user ' . $uid, LOGGER_INFO);
 		return;
 	}
 
 	$posts = array_reverse($items);
 
-	logger('Starting from ID ' . $lastid . ' for user ' . $uid, LOGGER_DEBUG);
+	Text::logger('Starting from ID ' . $lastid . ' for user ' . $uid, LOGGER_DEBUG);
 
 	if (count($posts)) {
 		foreach ($posts as $post) {
@@ -931,7 +932,7 @@ function twitter_fetchtimeline(App $a, $uid)
 				$_SESSION["authenticated"] = true;
 				$_SESSION["uid"] = $uid;
 
-				logger('Preparing Twitter ID ' . $post->id_str . ' for user ' . $uid, LOGGER_DEBUG);
+				Text::logger('Preparing Twitter ID ' . $post->id_str . ' for user ' . $uid, LOGGER_DEBUG);
 
 				$_REQUEST = twitter_do_mirrorpost($a, $uid, $post);
 
@@ -939,14 +940,14 @@ function twitter_fetchtimeline(App $a, $uid)
 					continue;
 				}
 
-				logger('Posting Twitter ID ' . $post->id_str . ' for user ' . $uid);
+				Text::logger('Posting Twitter ID ' . $post->id_str . ' for user ' . $uid);
 
 				item_post($a);
 			}
 		}
 	}
 	PConfig::set($uid, 'twitter', 'lastid', $lastid);
-	logger('Last ID for user ' . $uid . ' is now ' . $lastid, LOGGER_DEBUG);
+	Text::logger('Last ID for user ' . $uid . ' is now ' . $lastid, LOGGER_DEBUG);
 }
 
 function twitter_queue_hook(App $a)
@@ -963,7 +964,7 @@ function twitter_queue_hook(App $a)
 			continue;
 		}
 
-		logger('twitter_queue: run');
+		Text::logger('twitter_queue: run');
 
 		$r = q("SELECT `user`.* FROM `user` LEFT JOIN `contact` on `contact`.`uid` = `user`.`uid`
 			WHERE `contact`.`self` = 1 AND `contact`.`id` = %d LIMIT 1",
@@ -983,27 +984,27 @@ function twitter_queue_hook(App $a)
 		$success = false;
 
 		if ($ckey && $csecret && $otoken && $osecret) {
-			logger('twitter_queue: able to post');
+			Text::logger('twitter_queue: able to post');
 
 			$z = unserialize($x['content']);
 
 			$connection = new TwitterOAuth($ckey, $csecret, $otoken, $osecret);
 			$result = $connection->post($z['url'], $z['post']);
 
-			logger('twitter_queue: post result: ' . print_r($result, true), LOGGER_DEBUG);
+			Text::logger('twitter_queue: post result: ' . print_r($result, true), LOGGER_DEBUG);
 
 			if ($result->errors) {
-				logger('twitter_queue: Send to Twitter failed: "' . print_r($result->errors, true) . '"');
+				Text::logger('twitter_queue: Send to Twitter failed: "' . print_r($result->errors, true) . '"');
 			} else {
 				$success = true;
 				Queue::removeItem($x['id']);
 			}
 		} else {
-			logger("twitter_queue: Error getting tokens for user " . $user['uid']);
+			Text::logger("twitter_queue: Error getting tokens for user " . $user['uid']);
 		}
 
 		if (!$success) {
-			logger('twitter_queue: delayed');
+			Text::logger('twitter_queue: delayed');
 			Queue::updateTime($x['id']);
 		}
 	}
@@ -1056,7 +1057,7 @@ function twitter_fetch_contact($uid, $data, $create_user)
 		// create contact record
 		$fields['uid'] = $uid;
 		$fields['created'] = DateTimeFormat::utcNow();
-		$fields['nurl'] = normalise_link($url);
+		$fields['nurl'] = Text::normaliseLink($url);
 		$fields['alias'] = 'twitter::' . $data->id_str;
 		$fields['poll'] = 'twitter::' . $data->id_str;
 		$fields['rel'] = Contact::FRIEND;
@@ -1077,7 +1078,7 @@ function twitter_fetch_contact($uid, $data, $create_user)
 		Contact::updateAvatar($avatar, $uid, $contact_id);
 	} else {
 		if ($contact["readonly"] || $contact["blocked"]) {
-			logger("twitter_fetch_contact: Contact '" . $contact["nick"] . "' is blocked or readonly.", LOGGER_DEBUG);
+			Text::logger("twitter_fetch_contact: Contact '" . $contact["nick"] . "' is blocked or readonly.", LOGGER_DEBUG);
 			return -1;
 		}
 
@@ -1088,7 +1089,7 @@ function twitter_fetch_contact($uid, $data, $create_user)
 
 		// check that we have all the photos, this has been known to fail on occasion
 		if (empty($contact['photo']) || empty($contact['thumb']) || empty($contact['micro']) || $update_photo) {
-			logger("twitter_fetch_contact: Updating contact " . $data->screen_name, LOGGER_DEBUG);
+			Text::logger("twitter_fetch_contact: Updating contact " . $data->screen_name, LOGGER_DEBUG);
 
 			Contact::updateAvatar($avatar, $uid, $contact['id']);
 
@@ -1133,7 +1134,7 @@ function twitter_fetchuser(App $a, $uid, $screen_name = "", $user_id = "")
 	try {
 		$user = $connection->get('users/show', $parameters);
 	} catch (TwitterOAuthException $e) {
-		logger('twitter_fetchuser: Error fetching user ' . $uid . ': ' . $e->getMessage());
+		Text::logger('twitter_fetchuser: Error fetching user ' . $uid . ': ' . $e->getMessage());
 		return;
 	}
 
@@ -1262,7 +1263,7 @@ function twitter_expand_entities(App $a, $body, $item, $picture)
 	}
 
 	// it seems as if the entities aren't always covering all mentions. So the rest will be checked here
-	$tags = get_tags($body);
+	$tags = Text::getTags($body);
 
 	if (count($tags)) {
 		foreach ($tags as $tag) {
@@ -1387,7 +1388,7 @@ function twitter_createpost(App $a, $uid, $post, array $self, $create_user, $onl
 
 	// Don't import our own comments
 	if (Item::exists(['extid' => $postarray['uri'], 'uid' => $uid])) {
-		logger("Item with extid " . $postarray['uri'] . " found.", LOGGER_DEBUG);
+		Text::logger("Item with extid " . $postarray['uri'] . " found.", LOGGER_DEBUG);
 		return [];
 	}
 
@@ -1427,7 +1428,7 @@ function twitter_createpost(App $a, $uid, $post, array $self, $create_user, $onl
 				$postarray['owner-link']   = $r[0]["url"];
 				$postarray['owner-avatar'] = $r[0]["photo"];
 			} else {
-				logger("No self contact for user " . $uid, LOGGER_DEBUG);
+				Text::logger("No self contact for user " . $uid, LOGGER_DEBUG);
 				return [];
 			}
 		}
@@ -1449,7 +1450,7 @@ function twitter_createpost(App $a, $uid, $post, array $self, $create_user, $onl
 	if (($contactid == 0) && !$only_existing_contact) {
 		$contactid = $self['id'];
 	} elseif ($contactid <= 0) {
-		logger("Contact ID is zero or less than zero.", LOGGER_DEBUG);
+		Text::logger("Contact ID is zero or less than zero.", LOGGER_DEBUG);
 		return [];
 	}
 
@@ -1546,7 +1547,7 @@ function twitter_createpost(App $a, $uid, $post, array $self, $create_user, $onl
 
 function twitter_fetchparentposts(App $a, $uid, $post, TwitterOAuth $connection, array $self)
 {
-	logger("twitter_fetchparentposts: Fetching for user " . $uid . " and post " . $post->id_str, LOGGER_DEBUG);
+	Text::logger("twitter_fetchparentposts: Fetching for user " . $uid . " and post " . $post->id_str, LOGGER_DEBUG);
 
 	$posts = [];
 
@@ -1556,17 +1557,17 @@ function twitter_fetchparentposts(App $a, $uid, $post, TwitterOAuth $connection,
 		try {
 			$post = $connection->get('statuses/show', $parameters);
 		} catch (TwitterOAuthException $e) {
-			logger('twitter_fetchparentposts: Error fetching for user ' . $uid . ' and post ' . $post->id_str . ': ' . $e->getMessage());
+			Text::logger('twitter_fetchparentposts: Error fetching for user ' . $uid . ' and post ' . $post->id_str . ': ' . $e->getMessage());
 			break;
 		}
 
 		if (empty($post)) {
-			logger("twitter_fetchparentposts: Can't fetch post " . $parameters->id, LOGGER_DEBUG);
+			Text::logger("twitter_fetchparentposts: Can't fetch post " . $parameters->id, LOGGER_DEBUG);
 			break;
 		}
 
 		if (empty($post->id_str)) {
-			logger("twitter_fetchparentposts: This is not a post " . json_encode($post), LOGGER_DEBUG);
+			Text::logger("twitter_fetchparentposts: This is not a post " . json_encode($post), LOGGER_DEBUG);
 			break;
 		}
 
@@ -1577,7 +1578,7 @@ function twitter_fetchparentposts(App $a, $uid, $post, TwitterOAuth $connection,
 		$posts[] = $post;
 	}
 
-	logger("twitter_fetchparentposts: Fetching " . count($posts) . " parents", LOGGER_DEBUG);
+	Text::logger("twitter_fetchparentposts: Fetching " . count($posts) . " parents", LOGGER_DEBUG);
 
 	$posts = array_reverse($posts);
 
@@ -1593,7 +1594,7 @@ function twitter_fetchparentposts(App $a, $uid, $post, TwitterOAuth $connection,
 
 			$postarray["id"] = $item;
 
-			logger('twitter_fetchparentpost: User ' . $self["nick"] . ' posted parent timeline item ' . $item);
+			Text::logger('twitter_fetchparentpost: User ' . $self["nick"] . ' posted parent timeline item ' . $item);
 		}
 	}
 }
@@ -1607,7 +1608,7 @@ function twitter_fetchhometimeline(App $a, $uid)
 	$create_user = PConfig::get($uid, 'twitter', 'create_user');
 	$mirror_posts = PConfig::get($uid, 'twitter', 'mirror_posts');
 
-	logger("Fetching timeline for user " . $uid, LOGGER_DEBUG);
+	Text::logger("Fetching timeline for user " . $uid, LOGGER_DEBUG);
 
 	$application_name = Config::get('twitter', 'application_name');
 
@@ -1622,7 +1623,7 @@ function twitter_fetchhometimeline(App $a, $uid)
 	try {
 		$own_contact = twitter_fetch_own_contact($a, $uid);
 	} catch (TwitterOAuthException $e) {
-		logger('Error fetching own contact for user ' . $uid . ': ' . $e->getMessage());
+		Text::logger('Error fetching own contact for user ' . $uid . ': ' . $e->getMessage());
 		return;
 	}
 
@@ -1633,13 +1634,13 @@ function twitter_fetchhometimeline(App $a, $uid)
 	if (DBA::isResult($r)) {
 		$own_id = $r[0]["nick"];
 	} else {
-		logger("Own twitter contact not found for user " . $uid);
+		Text::logger("Own twitter contact not found for user " . $uid);
 		return;
 	}
 
 	$self = User::getOwnerDataById($uid);
 	if ($self === false) {
-		logger("Own contact not found for user " . $uid);
+		Text::logger("Own contact not found for user " . $uid);
 		return;
 	}
 
@@ -1657,23 +1658,23 @@ function twitter_fetchhometimeline(App $a, $uid)
 	try {
 		$items = $connection->get('statuses/home_timeline', $parameters);
 	} catch (TwitterOAuthException $e) {
-		logger('Error fetching home timeline for user ' . $uid . ': ' . $e->getMessage());
+		Text::logger('Error fetching home timeline for user ' . $uid . ': ' . $e->getMessage());
 		return;
 	}
 
 	if (!is_array($items)) {
-		logger('No array while fetching home timeline for user ' . $uid . ': ' . print_r($items, true));
+		Text::logger('No array while fetching home timeline for user ' . $uid . ': ' . print_r($items, true));
 		return;
 	}
 
 	if (empty($items)) {
-		logger('No new timeline content for user ' . $uid, LOGGER_INFO);
+		Text::logger('No new timeline content for user ' . $uid, LOGGER_INFO);
 		return;
 	}
 
 	$posts = array_reverse($items);
 
-	logger('Fetching timeline from ID ' . $lastid . ' for user ' . $uid . ' ' . sizeof($posts) . ' items', LOGGER_DEBUG);
+	Text::logger('Fetching timeline from ID ' . $lastid . ' for user ' . $uid . ' ' . sizeof($posts) . ' items', LOGGER_DEBUG);
 
 	if (count($posts)) {
 		foreach ($posts as $post) {
@@ -1687,12 +1688,12 @@ function twitter_fetchhometimeline(App $a, $uid)
 			}
 
 			if (stristr($post->source, $application_name) && $post->user->screen_name == $own_id) {
-				logger("Skip previously sent post", LOGGER_DEBUG);
+				Text::logger("Skip previously sent post", LOGGER_DEBUG);
 				continue;
 			}
 
 			if ($mirror_posts && $post->user->screen_name == $own_id && $post->in_reply_to_status_id_str == "") {
-				logger("Skip post that will be mirrored", LOGGER_DEBUG);
+				Text::logger("Skip post that will be mirrored", LOGGER_DEBUG);
 				continue;
 			}
 
@@ -1700,12 +1701,12 @@ function twitter_fetchhometimeline(App $a, $uid)
 				twitter_fetchparentposts($a, $uid, $post, $connection, $self);
 			}
 
-			logger('Preparing post ' . $post->id_str . ' for user ' . $uid, LOGGER_DEBUG);
+			Text::logger('Preparing post ' . $post->id_str . ' for user ' . $uid, LOGGER_DEBUG);
 
 			$postarray = twitter_createpost($a, $uid, $post, $self, $create_user, true, false);
 
 			if (empty($postarray['body']) || trim($postarray['body']) == "") {
-				logger('Empty body for post ' . $post->id_str . ' and user ' . $uid, LOGGER_DEBUG);
+				Text::logger('Empty body for post ' . $post->id_str . ' and user ' . $uid, LOGGER_DEBUG);
 				continue;
 			}
 
@@ -1721,12 +1722,12 @@ function twitter_fetchhometimeline(App $a, $uid)
 			$item = Item::insert($postarray, false, $notify);
 			$postarray["id"] = $item;
 
-			logger('User ' . $uid . ' posted home timeline item ' . $item);
+			Text::logger('User ' . $uid . ' posted home timeline item ' . $item);
 		}
 	}
 	PConfig::set($uid, 'twitter', 'lasthometimelineid', $lastid);
 
-	logger('Last timeline ID for user ' . $uid . ' is now ' . $lastid, LOGGER_DEBUG);
+	Text::logger('Last timeline ID for user ' . $uid . ' is now ' . $lastid, LOGGER_DEBUG);
 
 	// Fetching mentions
 	$lastid = PConfig::get($uid, 'twitter', 'lastmentionid');
@@ -1740,18 +1741,18 @@ function twitter_fetchhometimeline(App $a, $uid)
 	try {
 		$items = $connection->get('statuses/mentions_timeline', $parameters);
 	} catch (TwitterOAuthException $e) {
-		logger('Error fetching mentions: ' . $e->getMessage());
+		Text::logger('Error fetching mentions: ' . $e->getMessage());
 		return;
 	}
 
 	if (!is_array($items)) {
-		logger("Error fetching mentions: " . print_r($items, true), LOGGER_DEBUG);
+		Text::logger("Error fetching mentions: " . print_r($items, true), LOGGER_DEBUG);
 		return;
 	}
 
 	$posts = array_reverse($items);
 
-	logger("Fetching mentions for user " . $uid . " " . sizeof($posts) . " items", LOGGER_DEBUG);
+	Text::logger("Fetching mentions for user " . $uid . " " . sizeof($posts) . " items", LOGGER_DEBUG);
 
 	if (count($posts)) {
 		foreach ($posts as $post) {
@@ -1775,13 +1776,13 @@ function twitter_fetchhometimeline(App $a, $uid)
 
 			$item = Item::insert($postarray);
 
-			logger('User ' . $uid . ' posted mention timeline item ' . $item);
+			Text::logger('User ' . $uid . ' posted mention timeline item ' . $item);
 		}
 	}
 
 	PConfig::set($uid, 'twitter', 'lastmentionid', $lastid);
 
-	logger('Last mentions ID for user ' . $uid . ' is now ' . $lastid, LOGGER_DEBUG);
+	Text::logger('Last mentions ID for user ' . $uid . ' is now ' . $lastid, LOGGER_DEBUG);
 }
 
 function twitter_fetch_own_contact(App $a, $uid)
@@ -1856,7 +1857,7 @@ function twitter_is_retweet(App $a, $uid, $body)
 		return false;
 	}
 
-	logger('twitter_is_retweet: Retweeting id ' . $id . ' for user ' . $uid, LOGGER_DEBUG);
+	Text::logger('twitter_is_retweet: Retweeting id ' . $id . ' for user ' . $uid, LOGGER_DEBUG);
 
 	$ckey    = Config::get('twitter', 'consumerkey');
 	$csecret = Config::get('twitter', 'consumersecret');
@@ -1866,7 +1867,7 @@ function twitter_is_retweet(App $a, $uid, $body)
 	$connection = new TwitterOAuth($ckey, $csecret, $otoken, $osecret);
 	$result = $connection->post('statuses/retweet/' . $id);
 
-	logger('twitter_is_retweet: result ' . print_r($result, true), LOGGER_DEBUG);
+	Text::logger('twitter_is_retweet: result ' . print_r($result, true), LOGGER_DEBUG);
 
 	return !isset($result->errors);
 }
diff --git a/twitter/twitter_sync.php b/twitter/twitter_sync.php
index 60924acd..78e730ca 100644
--- a/twitter/twitter_sync.php
+++ b/twitter/twitter_sync.php
@@ -1,5 +1,6 @@
 <?php
 
+use Friendica\Content\Text;
 use Friendica\Core\Config;
 
 function twitter_sync_run($argv, $argc)
@@ -11,7 +12,7 @@ function twitter_sync_run($argv, $argc)
 	if (function_exists('sys_getloadavg')) {
 		$load = sys_getloadavg();
 		if (intval($load[0]) > Config::get('system', 'maxloadavg', 50)) {
-			logger('system: load ' . $load[0] . ' too high. Twitter sync deferred to next scheduled run.');
+			Text::logger('system: load ' . $load[0] . ' too high. Twitter sync deferred to next scheduled run.');
 			return;
 		}
 	}
diff --git a/webrtc/webrtc.php b/webrtc/webrtc.php
index 47cd734c..31eb2114 100644
--- a/webrtc/webrtc.php
+++ b/webrtc/webrtc.php
@@ -6,6 +6,7 @@
  * Author: Stephen Mahood <https://friends.mayfirst.org/profile/marxistvegan>
  * Author: Tobias Diekershoff <https://f.diekershoff.de/profile/tobias>
  */
+use Friendica\Content\Text;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
@@ -24,14 +25,14 @@ function webrtc_app_menu($a,&$b) {
 }
 
 function webrtc_addon_admin (&$a, &$o) {
-        $t = get_markup_template( "admin.tpl", "addon/webrtc/" );
-	$o = replace_macros( $t, [
+        $t = Text::getMarkupTemplate( "admin.tpl", "addon/webrtc/" );
+	$o = Text::replaceMacros( $t, [
 	    '$submit' => L10n::t('Save Settings'),
 	    '$webrtcurl' => ['webrtcurl', L10n::t('WebRTC Base URL'), Config::get('webrtc','webrtcurl' ), L10n::t('Page your users will create a WebRTC chat room on. For example you could use https://live.mayfirst.org .')],
 	]);
 }
 function webrtc_addon_admin_post (&$a) {
-        $url = ((x($_POST, 'webrtcurl')) ? notags(trim($_POST['webrtcurl'])) : '');
+        $url = ((x($_POST, 'webrtcurl')) ? Text::noTags(trim($_POST['webrtcurl'])) : '');
 	    Config::set('webrtc', 'webrtcurl', $url);
 	    info(L10n::t('Settings updated.'). EOL);
 }
diff --git a/widgets/widget_friendheader.php b/widgets/widget_friendheader.php
index df03419f..8d8d3c99 100644
--- a/widgets/widget_friendheader.php
+++ b/widgets/widget_friendheader.php
@@ -1,5 +1,6 @@
 <?php
 
+use Friendica\Content\Text;
 use Friendica\Core\L10n;
 
 function friendheader_widget_name()
@@ -45,7 +46,7 @@ function friendheader_widget_content(&$a, $conf)
 		.contact-block-div { display: block !important; float: left!important; width: 50px!important; height: 50px!important; margin: 2px!important;}
 
 	</style>";
-	$o .= _abs_url(contact_block());
+	$o .= _abs_url(Text::contactBlock());
 	$o .= "<a href='".$a->getBaseURL().'/profile/'.$a->profile['nickname']."' target=new>". L10n::t('Get added to this list!') ."</a>";
 
 	return $o;
diff --git a/widgets/widget_friends.php b/widgets/widget_friends.php
index 36212713..e9a858eb 100644
--- a/widgets/widget_friends.php
+++ b/widgets/widget_friends.php
@@ -1,5 +1,6 @@
 <?php
 
+use Friendica\Content\Text;
 use Friendica\Core\L10n;
 
 function friends_widget_name()
@@ -47,7 +48,7 @@ function friends_widget_content(&$a, $conf)
 		.contact-block-div { display: block !important; float: left!important; width: 50px!important; height: 50px!important; margin: 2px!important;}
 
 	</style>";
-	$o .= _abs_url(contact_block());
+	$o .= _abs_url(Text::contactBlock());
 	$o .= "<a href='".$a->getBaseURL().'/profile/'.$a->profile['nickname']."'>". L10n::t('Connect on Friendica!') ."</a>";
 	return $o;
 }
diff --git a/widgets/widget_like.php b/widgets/widget_like.php
index 238d15ad..f194b8ad 100644
--- a/widgets/widget_like.php
+++ b/widgets/widget_like.php
@@ -1,5 +1,6 @@
 <?php
 
+use Friendica\Content\Text;
 use Friendica\Core\L10n;
 use Friendica\Database\DBA;
 
@@ -56,8 +57,8 @@ function like_widget_content(&$a, $conf){
 	$o = "";
 
 #	$t = file_get_contents( dirname(__file__). "/widget_like.tpl" );
-	$t = get_markup_template("widget_like.tpl", "addon/widgets/");
-	$o .= replace_macros($t, [
+	$t = Text::getMarkupTemplate("widget_like.tpl", "addon/widgets/");
+	$o .= Text::replaceMacros($t, [
 		'$like'		=> $likes,
 		'$strlike'	=> L10n::tt("%d person likes this", "%d people like this", $likes),
 
diff --git a/widgets/widgets.php b/widgets/widgets.php
index 5cb8a279..2792a2dd 100644
--- a/widgets/widgets.php
+++ b/widgets/widgets.php
@@ -7,6 +7,7 @@
  * Status: Unsupported
  */
 
+use Friendica\Content\Text;
 use Friendica\Core\Addon;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
@@ -15,7 +16,7 @@ use Friendica\Database\DBA;
 function widgets_install() {
 	Addon::registerHook('addon_settings', 'addon/widgets/widgets.php', 'widgets_settings');
 	Addon::registerHook('addon_settings_post', 'addon/widgets/widgets.php', 'widgets_settings_post');
-	logger("installed widgets");
+	Text::logger("installed widgets");
 }
 
 function widgets_uninstall() {
@@ -57,8 +58,8 @@ function widgets_settings(&$a,&$o) {
 
 
 #	$t = file_get_contents( dirname(__file__). "/settings.tpl" );
-	$t = get_markup_template("settings.tpl", "addon/widgets/");
-	$o .= replace_macros($t, [
+	$t = Text::getMarkupTemplate("settings.tpl", "addon/widgets/");
+	$o .= Text::replaceMacros($t, [
 		'$submit' => L10n::t('Generate new key'),
 		'$baseurl' => $a->getBaseURL(),
 		'$title' => "Widgets",
@@ -141,7 +142,7 @@ function widgets_content(&$a) {
 		$widget_size = call_user_func($a->argv[1].'_widget_size');
 
 		$script = file_get_contents(dirname(__file__)."/widgets.js");
-		$o .= replace_macros($script, [
+		$o .= Text::replaceMacros($script, [
 			'$entrypoint' => $a->getBaseURL()."/widgets/".$a->argv[1]."/cb/",
 			'$key' => $conf['key'],
 			'$widget_id' => 'f9a_'.$a->argv[1]."_"._randomAlphaNum(6),
diff --git a/windowsphonepush/windowsphonepush.php b/windowsphonepush/windowsphonepush.php
index 38ab60b3..4e115b63 100644
--- a/windowsphonepush/windowsphonepush.php
+++ b/windowsphonepush/windowsphonepush.php
@@ -27,6 +27,7 @@
  */
 
 use Friendica\App;
+use Friendica\Content\Text;
 use Friendica\Content\Text\BBCode;
 use Friendica\Content\Text\HTML;
 use Friendica\Core\Addon;
@@ -53,7 +54,7 @@ function windowsphonepush_install()
 	Addon::registerHook('addon_settings', 'addon/windowsphonepush/windowsphonepush.php', 'windowsphonepush_settings');
 	Addon::registerHook('addon_settings_post', 'addon/windowsphonepush/windowsphonepush.php', 'windowsphonepush_settings_post');
 
-	logger("installed windowsphonepush");
+	Text::logger("installed windowsphonepush");
 }
 
 function windowsphonepush_uninstall()
@@ -65,7 +66,7 @@ function windowsphonepush_uninstall()
 	Addon::unregisterHook('addon_settings', 'addon/windowsphonepush/windowsphonepush.php', 'windowsphonepush_settings');
 	Addon::unregisterHook('addon_settings_post', 'addon/windowsphonepush/windowsphonepush.php', 'windowsphonepush_settings_post');
 
-	logger("removed windowsphonepush");
+	Text::logger("removed windowsphonepush");
 }
 
 /* declare the windowsphonepush function so that /windowsphonepush url requests will land here */
@@ -160,7 +161,7 @@ function windowsphonepush_cron()
 			// by app if user has switched the server setting in app - sending blank not possible as this would return an update error)
 			if (( $device_url == "" ) || ( $device_url == "NA" )) {
 				// no Device-URL for the user availabe, but addon is enabled --> write info to Logger
-				logger("WARN: windowsphonepush is enable for user " . $rr['uid'] . ", but no Device-URL is specified for the user.");
+				Text::logger("WARN: windowsphonepush is enable for user " . $rr['uid'] . ", but no Device-URL is specified for the user.");
 			} else {
 				// retrieve the number of unseen items and the id of the latest one (if there are more than
 				// one new entries since last poller run, only the latest one will be pushed)
@@ -177,11 +178,11 @@ function windowsphonepush_cron()
 						break;
 					case "QueueFull":
 						// maximum of 30 messages reached, server rejects any further push notification until device reconnects
-						logger("INFO: Device-URL '" . $device_url . "' returns a QueueFull.");
+						Text::logger("INFO: Device-URL '" . $device_url . "' returns a QueueFull.");
 						break;
 					case "Suppressed":
 						// notification received and dropped as something in app was not enabled
-						logger("WARN. Device-URL '" . $device_url . "' returns a Suppressed. Unexpected error in Mobile App?");
+						Text::logger("WARN. Device-URL '" . $device_url . "' returns a Suppressed. Unexpected error in Mobile App?");
 						break;
 					case "Dropped":
 						// mostly combines with Expired, in that case Device-URL will be deleted from pconfig (function send_push)
@@ -189,7 +190,7 @@ function windowsphonepush_cron()
 					default:
 						// error, mostly called by "" which means that the url (not "" which has been checked)
 						// didn't not received Microsoft Notification Server -> wrong url
-						logger("ERROR: specified Device-URL '" . $device_url . "' didn't produced any response.");
+						Text::logger("ERROR: specified Device-URL '" . $device_url . "' didn't produced any response.");
 				}
 
 				// additionally user receives the text of the newest item (function checks against last successfully pushed item)
@@ -306,7 +307,7 @@ function send_push($device_url, $headers, $msg)
 	$subscriptionStatus = get_header_value($output, 'X-SubscriptionStatus');
 	if ($subscriptionStatus == "Expired") {
 		PConfig::set(local_user(), 'windowsphonepush', 'device_url', "");
-		logger("ERROR: the stored Device-URL " . $device_url . "returned an 'Expired' error, it has been deleted now.");
+		Text::logger("ERROR: the stored Device-URL " . $device_url . "returned an 'Expired' error, it has been deleted now.");
 	}
 
 	// the notification status shall be returned to windowsphonepush_cron (will
@@ -407,7 +408,7 @@ function windowsphonepush_updatesettings()
 	// check if sent url is empty - don't save and send return code to app
 	$device_url = $_POST['deviceurl'];
 	if ($device_url == "") {
-		logger("ERROR: no valid Device-URL specified - client transferred '" . $device_url . "'");
+		Text::logger("ERROR: no valid Device-URL specified - client transferred '" . $device_url . "'");
 		return "No valid Device-URL specified";
 	}
 
@@ -422,13 +423,13 @@ function windowsphonepush_updatesettings()
 	if (count($r)) {
 		foreach ($r as $rr) {
 			PConfig::set($rr['uid'], 'windowsphonepush', 'device_url', '');
-			logger("WARN: the sent URL was already registered with user '" . $rr['uid'] . "'. Deleted for this user as we expect to be correct now for user '" . local_user() . "'.");
+			Text::logger("WARN: the sent URL was already registered with user '" . $rr['uid'] . "'. Deleted for this user as we expect to be correct now for user '" . local_user() . "'.");
 		}
 	}
 
 	PConfig::set(local_user(), 'windowsphonepush', 'device_url', $device_url);
 	// output the successfull update of the device URL to the logger for error analysis if necessary
-	logger("INFO: Device-URL for user '" . local_user() . "' has been updated with '" . $device_url . "'");
+	Text::logger("INFO: Device-URL for user '" . local_user() . "' has been updated with '" . $device_url . "'");
 	return "Device-URL updated successfully!";
 }
 
@@ -455,7 +456,7 @@ function windowsphonepush_updatecounterunseen()
 function windowsphonepush_login(App $a)
 {
 	if (!isset($_SERVER['PHP_AUTH_USER'])) {
-		logger('API_login: ' . print_r($_SERVER, true), LOGGER_DEBUG);
+		Text::logger('API_login: ' . print_r($_SERVER, true), LOGGER_DEBUG);
 		header('WWW-Authenticate: Basic realm="Friendica"');
 		header('HTTP/1.0 401 Unauthorized');
 		die('This api requires login');
@@ -466,7 +467,7 @@ function windowsphonepush_login(App $a)
 	if ($user_id) {
 		$record = DBA::selectFirst('user', [], ['uid' => $user_id]);
 	} else {
-		logger('API_login failure: ' . print_r($_SERVER, true), LOGGER_DEBUG);
+		Text::logger('API_login failure: ' . print_r($_SERVER, true), LOGGER_DEBUG);
 		header('WWW-Authenticate: Basic realm="Friendica"');
 		header('HTTP/1.0 401 Unauthorized');
 		die('This api requires login');
diff --git a/wppost/wppost.php b/wppost/wppost.php
index 76d928a2..9c6becc5 100644
--- a/wppost/wppost.php
+++ b/wppost/wppost.php
@@ -6,6 +6,7 @@
  * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
  */
 
+use Friendica\Content\Text;
 use Friendica\Content\Text\BBCode;
 use Friendica\Content\Text\HTML;
 use Friendica\Core\Addon;
@@ -147,7 +148,7 @@ function wppost_settings_post(&$a,&$b) {
 		PConfig::set(local_user(),'wppost','wp_blog',trim($_POST['wp_blog']));
 		PConfig::set(local_user(),'wppost','backlink',trim($_POST['wp_backlink']));
 		PConfig::set(local_user(),'wppost','shortcheck',trim($_POST['wp_shortcheck']));
-		$wp_backlink_text = notags(trim($_POST['wp_backlink_text']));
+		$wp_backlink_text = Text::noTags(trim($_POST['wp_backlink_text']));
 		$wp_backlink_text = BBCode::convert($wp_backlink_text, false, 8);
 		$wp_backlink_text = HTML::toPlaintext($wp_backlink_text, 0, true);
 		PConfig::set(local_user(),'wppost','wp_backlink_text', $wp_backlink_text);
@@ -215,8 +216,8 @@ function wppost_send(&$a,&$b) {
 		return;
 	}
 
-	$wp_username = xmlify(PConfig::get($b['uid'],'wppost','wp_username'));
-	$wp_password = xmlify(PConfig::get($b['uid'],'wppost','wp_password'));
+	$wp_username = Text::xmlify(PConfig::get($b['uid'],'wppost','wp_username'));
+	$wp_password = Text::xmlify(PConfig::get($b['uid'],'wppost','wp_password'));
 	$wp_blog = PConfig::get($b['uid'],'wppost','wp_blog');
 	$wp_backlink_text = PConfig::get($b['uid'],'wppost','wp_backlink_text');
 	if ($wp_backlink_text == '') {
@@ -293,7 +294,7 @@ function wppost_send(&$a,&$b) {
 				. $wp_backlink_text . '</a>' . EOL . EOL;
 		}
 
-		$post = xmlify($post);
+		$post = Text::xmlify($post);
 
 
 		$xml = <<< EOT
@@ -312,11 +313,11 @@ function wppost_send(&$a,&$b) {
 
 EOT;
 
-		logger('wppost: data: ' . $xml, LOGGER_DATA);
+		Text::logger('wppost: data: ' . $xml, LOGGER_DATA);
 
 		if ($wp_blog !== 'test') {
 			$x = Network::post($wp_blog, $xml)->getBody();
 		}
-		logger('posted to wordpress: ' . (($x) ? $x : ''), LOGGER_DEBUG);
+		Text::logger('posted to wordpress: ' . (($x) ? $x : ''), LOGGER_DEBUG);
 	}
 }
diff --git a/xmpp/xmpp.php b/xmpp/xmpp.php
index e45bd72e..96b1805c 100644
--- a/xmpp/xmpp.php
+++ b/xmpp/xmpp.php
@@ -7,6 +7,7 @@
  */
 
 use Friendica\App;
+use Friendica\Content\Text;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
@@ -104,9 +105,9 @@ function xmpp_login()
 
 function xmpp_addon_admin(App $a, &$o)
 {
-	$t = get_markup_template('admin.tpl', 'addon/xmpp/');
+	$t = Text::getMarkupTemplate('admin.tpl', 'addon/xmpp/');
 
-	$o = replace_macros($t, [
+	$o = Text::replaceMacros($t, [
 		'$submit' => L10n::t('Save Settings'),
 		'$bosh_proxy' => ['bosh_proxy', L10n::t('Jabber BOSH host'), Config::get('xmpp', 'bosh_proxy'), ''],
 		'$central_userbase' => ['central_userbase', L10n::t('Use central userbase'), Config::get('xmpp', 'central_userbase'), L10n::t('If enabled, users will automatically login to an ejabberd server that has to be installed on this machine with synchronized credentials via the "auth_ejabberd.php" script.')],