diff --git a/app/sidebar.js b/app/sidebar.js
index 322681b..f316345 100644
--- a/app/sidebar.js
+++ b/app/sidebar.js
@@ -133,7 +133,7 @@ var Command_MyThemes = Upfront.Views.Editor.Command.extend({
 
 var Command_BuilderHelp = Command_Help.extend({
 	on_click: function () {
-		var url = 'https://upfront.n3rds.work/upfront-framework/',
+		var url = 'https://cp-psource.github.io/upfront/',
 			win = window.open(url, "_blank")
 		;
 		win.focus();
diff --git a/README.md b/docs/README.md
similarity index 100%
rename from README.md
rename to docs/README.md
diff --git a/languages/upfront_thx-en_US.po b/languages/upfront_thx-en_US.po
index 13f1ede..9c468fd 100644
--- a/languages/upfront_thx-en_US.po
+++ b/languages/upfront_thx-en_US.po
@@ -572,8 +572,8 @@ msgid "Wird geladen..."
 msgstr "Loading..."
 
 #. Author of the plugin/theme
-msgid "WMS N@W"
-msgstr "WMS N@W"
+msgid "PSOURCE"
+msgstr "PSOURCE"
 
 #: lib/class_thx_l10n.php:85 lib/class_thx_l10n.php:86
 msgid "Wrapper"
diff --git a/languages/upfront_thx-fr_FR.po b/languages/upfront_thx-fr_FR.po
index 06875f4..97ac658 100644
--- a/languages/upfront_thx-fr_FR.po
+++ b/languages/upfront_thx-fr_FR.po
@@ -780,8 +780,8 @@ msgstr ""
 "des thèmes ClassicPress."
 
 #. Author of the plugin/theme
-msgid "WMS N@W"
-msgstr "WMS N@W"
+msgid "PSOURCE"
+msgstr "PSOURCE"
 
 #. Author URI of the plugin/theme
 msgid "https://n3rds.work"
diff --git a/languages/upfront_thx-it_IT.po b/languages/upfront_thx-it_IT.po
index b612099..71a5ad8 100644
--- a/languages/upfront_thx-it_IT.po
+++ b/languages/upfront_thx-it_IT.po
@@ -778,8 +778,8 @@ msgstr ""
 
 #. Author of the plugin/theme
 #, fuzzy
-msgid "WMS N@W"
-msgstr "WMS N@W"
+msgid "PSOURCE"
+msgstr "PSOURCE"
 
 #. Author URI of the plugin/theme
 #, fuzzy
diff --git a/languages/upfront_thx.pot b/languages/upfront_thx.pot
index b817b72..6d45436 100644
--- a/languages/upfront_thx.pot
+++ b/languages/upfront_thx.pot
@@ -1,4 +1,4 @@
-# Copyright (C) 2023 WMS N@W
+# Copyright (C) 2023 PSOURCE
 # This file is distributed under the GPLv2 or later.
 msgid ""
 msgstr ""
@@ -549,7 +549,7 @@ msgid ""
 msgstr ""
 
 #. Author of the plugin/theme
-msgid "WMS N@W"
+msgid "PSOURCE"
 msgstr ""
 
 #. Author URI of the plugin/theme
diff --git a/readme.txt b/readme.txt
index 3ffb420..a132b77 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,6 +1,5 @@
 === UpFront Builder ===
-Contributors: DerN3rd (WMS N@W)
-Donate link: https://n3rds.work/spendenaktionen/unterstuetze-unsere-psource-free-werke/
+Contributors: DerN3rd (PSOURCE)
 Plugin URI: https://cp-psource.github.io/upfront-builder/
 Tags: classicpress, theme, builder, framework
 Requires at least: 4.9
diff --git a/templates/plugin/compat_core_version.php b/templates/plugin/compat_core_version.php
index 2114856..da14bdd 100644
--- a/templates/plugin/compat_core_version.php
+++ b/templates/plugin/compat_core_version.php
@@ -9,7 +9,7 @@
 		<?php echo wp_kses(
 		sprintf(
 			__('Du benötigst UpFront Framework in Version v1.4 oder höher, damit UpFront Builder ordnungsgemäß funktioniert. <a href="%s" target="_blank">Hol es Dir hier.</a>', UpfrontThemeExporter::DOMAIN),
-			'https://upfront.n3rds.work/upfront-framework/'
+			'https://cp-psource.github.io/upfront/'
 		), array(
 			'a' => array(
 				'href' => array(),
diff --git a/templates/plugin/dependencies.php b/templates/plugin/dependencies.php
index 7693ff1..61a1123 100644
--- a/templates/plugin/dependencies.php
+++ b/templates/plugin/dependencies.php
@@ -13,7 +13,7 @@
 		current_layout_label: <?php echo json_encode($layout); ?>
 	};
 	upfrontrjs.require(['<?php echo esc_url($root_url) ?>app/main.js'], function () {
-		Upfront.Util.log("Booting exporter");
+		Upfront.Util.log("Boot-Exporteur");
 	});
 });
 </script>
diff --git a/templates/plugin/js/create_edit.js b/templates/plugin/js/create_edit.js
index 2eb95e0..502f040 100644
--- a/templates/plugin/js/create_edit.js
+++ b/templates/plugin/js/create_edit.js
@@ -97,7 +97,8 @@ function init_new () {
 				$.post(_thx.admin_ajax, {
 					action: 'upfront_thx-create-theme',
 					mode: "theme",
-					form: _.map(data, function(value, key){ return key + '=' + escape(value); }).join('&')
+					form: _.map(data, function(value, key){ return key + '=' + encodeURIComponent(value); }).join('&')
+					//form: _.map(data, function(value, key){ return key + '=' + encodeURIComponent(value); }).join('&')
 				}).done(function(response) {
 					if (!slug && response && "theme" in response) {
 						slug = (response.theme || {directory: false}).directory;
@@ -217,7 +218,7 @@ function init_existing () {
 			$.post(_thx.admin_ajax, {
 				action: 'upfront_thx-update-theme',
 				mode: "theme",
-				form: _.map(data, function(value, key){ return key + '=' + escape(value); }).join('&')
+				form: _.map(data, function(value, key){ return key + '=' + encodeURIComponent(value); }).join('&')
 			}).done(function(response) {
 				window.location.reload();
 			}).fail(function() {
@@ -240,7 +241,7 @@ function init_existing () {
 			$.post(_thx.admin_ajax, {
 				action: 'upfront_thx-clone-theme',
 				mode: "theme",
-				form: _.map(data, function(value, key){ return key + '=' + escape(value); }).join('&')
+				form: _.map(data, function(value, key){ return key + '=' + encodeURIComponent(value); }).join('&')
 			}).done(function (response) {
 				window.location.reload();
 			}).error(function (rsp) {
diff --git a/templates/plugin/kickstart_not_ready.php b/templates/plugin/kickstart_not_ready.php
index b761a84..ae0cd90 100644
--- a/templates/plugin/kickstart_not_ready.php
+++ b/templates/plugin/kickstart_not_ready.php
@@ -5,7 +5,7 @@
 		<?php echo wp_kses(
 			sprintf(
 				__('<a href="%s" target="_blank">Hol es Dir hier.</a>', UpfrontThemeExporter::DOMAIN),
-				'https://upfront.n3rds.work/upfront-framework/'
+				'https://cp-psource.github.io/upfront/'
 			), array(
 				'a' => array(
 					'href' => array(),
diff --git a/upfront-theme-exporter.php b/upfront-theme-exporter.php
index fa2f922..ec65ebb 100644
--- a/upfront-theme-exporter.php
+++ b/upfront-theme-exporter.php
@@ -3,17 +3,16 @@
 Plugin Name: Upfront Builder
 Plugin URI: https://cp-psource.github.io/upfront-builder/
 Description: Der schnellste und visuellste Weg, um ClassicPress-Themes zu erstellen. Jetzt kann jeder ClassicPress-Themes entwerfen, erstellen, exportieren, teilen und verkaufen.
-Donate link: https://n3rds.work/spendenaktionen/unterstuetze-unsere-psource-free-werke/
 Version: 1.2.4
-Author: WMS N@W
-Author URI: https://n3rds.work
+Author: PSOURCE
+Author URI: https://github.com/cp-psource
 Text Domain: upfront_thx
 Domain Path: /languages
 License: GPLv2 or later
 */
 
 /*
-Copyright 2014-2024 WMS N@W (https://n3rds.work)
+Copyright 2014-2024 PSOURCE (https://github.com/cp-psource)
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License (Version 2 - GPLv2) as published by