diff --git a/patches/themes/0165-remove-google-fonts.patch b/patches/themes/0165-remove-google-fonts.patch
index a1eb0a4e454f58cf08fc7a503239d70b9287ff1d..27fe68f44f6f9a486babc86fe70cba4dd4d1935f 100644
--- a/patches/themes/0165-remove-google-fonts.patch
+++ b/patches/themes/0165-remove-google-fonts.patch
@@ -13,142 +13,6 @@ Subject: [PATCH 165/229] Remove Google API, google fonts, flash plugin and
wp-includes/script-loader.php | 9 ++++--
8 files changed, 24 insertions(+), 85 deletions(-)
-diff --git a/wp-content/themes/twentyeleven/footer.php b/wp-content/themes/twentyeleven/footer.php
-index 53fa696e..ad8a99d7 100644
---- a/wp-content/themes/twentyeleven/footer.php
-+++ b/wp-content/themes/twentyeleven/footer.php
-@@ -26,14 +26,13 @@
-
- <div id="site-generator">
- <?php do_action( 'twentyeleven_credits' ); ?>
-+
- <?php
- if ( function_exists( 'the_privacy_policy_link' ) ) {
- the_privacy_policy_link( '', '<span role="separator" aria-hidden="true"></span>' );
- }
- ?>
-- <a href="<?php echo esc_url( __( 'https://wordpress.org/', 'twentyeleven' ) ); ?>" class="imprint" title="<?php esc_attr_e( 'Semantic Personal Publishing Platform', 'twentyeleven' ); ?>">
-- <?php printf( __( 'Proudly powered by %s', 'twentyeleven' ), 'WordPress' ); ?>
-- </a>
-+ <strong>Proudly powered by <a href="http://www.autistici.org">R*</a></strong>
- </div>
- </footer><!-- #colophon -->
- </div><!-- #page -->
-diff --git a/wp-content/themes/twentythirteen/footer.php b/wp-content/themes/twentythirteen/footer.php
-index 858f110b..5bf69ea3 100644
---- a/wp-content/themes/twentythirteen/footer.php
-+++ b/wp-content/themes/twentythirteen/footer.php
-@@ -16,14 +16,14 @@
-
- <div class="site-info">
- <?php do_action( 'twentythirteen_credits' ); ?>
-+
- <?php
- if ( function_exists( 'the_privacy_policy_link' ) ) {
- the_privacy_policy_link( '', '<span role="separator" aria-hidden="true"></span>' );
- }
- ?>
-- <a href="<?php echo esc_url( __( 'https://wordpress.org/', 'twentythirteen' ) ); ?>" class="imprint">
-- <?php printf( __( 'Proudly powered by %s', 'twentythirteen' ), 'WordPress' ); ?>
-- </a>
-+ <strong>Proudly powered by <a href="http://www.autistici.org">R*</a></strong>
-+
- </div><!-- .site-info -->
- </footer><!-- #colophon -->
- </div><!-- #page -->
-diff --git a/wp-content/themes/twentythirteen/functions.php b/wp-content/themes/twentythirteen/functions.php
-index 5c021fbe..2b2eb72f 100644
---- a/wp-content/themes/twentythirteen/functions.php
-+++ b/wp-content/themes/twentythirteen/functions.php
-@@ -219,36 +219,6 @@ add_action( 'after_setup_theme', 'twentythirteen_setup' );
- function twentythirteen_fonts_url() {
- $fonts_url = '';
-
-- /* Translators: If there are characters in your language that are not
-- * supported by Source Sans Pro, translate this to 'off'. Do not translate
-- * into your own language.
-- */
-- $source_sans_pro = _x( 'on', 'Source Sans Pro font: on or off', 'twentythirteen' );
--
-- /* Translators: If there are characters in your language that are not
-- * supported by Bitter, translate this to 'off'. Do not translate into your
-- * own language.
-- */
-- $bitter = _x( 'on', 'Bitter font: on or off', 'twentythirteen' );
--
-- if ( 'off' !== $source_sans_pro || 'off' !== $bitter ) {
-- $font_families = array();
--
-- if ( 'off' !== $source_sans_pro ) {
-- $font_families[] = 'Source Sans Pro:300,400,700,300italic,400italic,700italic';
-- }
--
-- if ( 'off' !== $bitter ) {
-- $font_families[] = 'Bitter:400,700';
-- }
--
-- $query_args = array(
-- 'family' => urlencode( implode( '|', $font_families ) ),
-- 'subset' => urlencode( 'latin,latin-ext' ),
-- );
-- $fonts_url = add_query_arg( $query_args, 'https://fonts.googleapis.com/css' );
-- }
--
- return $fonts_url;
- }
-
-diff --git a/wp-content/themes/twentytwelve/footer.php b/wp-content/themes/twentytwelve/footer.php
-index 05e52e2b..2ca9b6c0 100644
---- a/wp-content/themes/twentytwelve/footer.php
-+++ b/wp-content/themes/twentytwelve/footer.php
-@@ -18,9 +18,7 @@
- the_privacy_policy_link( '', '<span role="separator" aria-hidden="true"></span>' );
- }
- ?>
-- <a href="<?php echo esc_url( __( 'https://wordpress.org/', 'twentytwelve' ) ); ?>" class="imprint" title="<?php esc_attr_e( 'Semantic Personal Publishing Platform', 'twentytwelve' ); ?>">
-- <?php printf( __( 'Proudly powered by %s', 'twentytwelve' ), 'WordPress' ); ?>
-- </a>
-+ <strong>Proudly powered by <a href="http://www.autistici.org">R*</a></strong>
- </div><!-- .site-info -->
- </footer><!-- #colophon -->
- </div><!-- #page -->
-diff --git a/wp-content/themes/twentytwelve/functions.php b/wp-content/themes/twentytwelve/functions.php
-index ad89b2ac..bdda0c64 100644
---- a/wp-content/themes/twentytwelve/functions.php
-+++ b/wp-content/themes/twentytwelve/functions.php
-@@ -145,31 +145,7 @@ require( get_template_directory() . '/inc/custom-header.php' );
- function twentytwelve_get_font_url() {
- $font_url = '';
-
-- /* translators: If there are characters in your language that are not supported
-- * by Open Sans, translate this to 'off'. Do not translate into your own language.
-- */
-- if ( 'off' !== _x( 'on', 'Open Sans font: on or off', 'twentytwelve' ) ) {
-- $subsets = 'latin,latin-ext';
--
-- /* translators: To add an additional Open Sans character subset specific to your language,
-- * translate this to 'greek', 'cyrillic' or 'vietnamese'. Do not translate into your own language.
-- */
-- $subset = _x( 'no-subset', 'Open Sans font: add new subset (greek, cyrillic, vietnamese)', 'twentytwelve' );
--
-- if ( 'cyrillic' == $subset ) {
-- $subsets .= ',cyrillic,cyrillic-ext';
-- } elseif ( 'greek' == $subset ) {
-- $subsets .= ',greek,greek-ext';
-- } elseif ( 'vietnamese' == $subset ) {
-- $subsets .= ',vietnamese';
-- }
--
-- $query_args = array(
-- 'family' => 'Open+Sans:400italic,700italic,400,700',
-- 'subset' => $subsets,
-- );
-- $font_url = add_query_arg( $query_args, 'https://fonts.googleapis.com/css' );
-- }
-+ /* REMOVED GoogleApis*/
-
- return $font_url;
- }
diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php
index 99ef20f3..dd8cabf8 100644
--- a/wp-includes/script-loader.php
diff --git a/patches/themes/0165-twentyeleven-footer.patch b/patches/themes/0165-twentyeleven-footer.patch
new file mode 100644
index 0000000000000000000000000000000000000000..18bcace3ba13603fc71aad1f461113037677cdb0
--- /dev/null
+++ b/patches/themes/0165-twentyeleven-footer.patch
@@ -0,0 +1,22 @@
+diff --git a/wp-content/themes/twentyeleven/footer.php b/wp-content/themes/twentyeleven/footer.php
+index 53fa696e..ad8a99d7 100644
+--- a/wp-content/themes/twentyeleven/footer.php
++++ b/wp-content/themes/twentyeleven/footer.php
+@@ -26,14 +26,13 @@
+
+ <div id="site-generator">
+ <?php do_action( 'twentyeleven_credits' ); ?>
++
+ <?php
+ if ( function_exists( 'the_privacy_policy_link' ) ) {
+ the_privacy_policy_link( '', '<span role="separator" aria-hidden="true"></span>' );
+ }
+ ?>
+- <a href="<?php echo esc_url( __( 'https://wordpress.org/', 'twentyeleven' ) ); ?>" class="imprint" title="<?php esc_attr_e( 'Semantic Personal Publishing Platform', 'twentyeleven' ); ?>">
+- <?php printf( __( 'Proudly powered by %s', 'twentyeleven' ), 'WordPress' ); ?>
+- </a>
++ <strong>Proudly powered by <a href="http://www.autistici.org">R*</a></strong>
+ </div>
+ </footer><!-- #colophon -->
+ </div><!-- #page -->
+
diff --git a/patches/themes/0165-twentythirteen-footer-and-google-fonts.patch b/patches/themes/0165-twentythirteen-footer-and-google-fonts.patch
new file mode 100644
index 0000000000000000000000000000000000000000..6b3a99baf3a1441857e61efa018d31c699380141
--- /dev/null
+++ b/patches/themes/0165-twentythirteen-footer-and-google-fonts.patch
@@ -0,0 +1,63 @@
+diff --git a/wp-content/themes/twentythirteen/footer.php b/wp-content/themes/twentythirteen/footer.php
+index 858f110b..5bf69ea3 100644
+--- a/wp-content/themes/twentythirteen/footer.php
++++ b/wp-content/themes/twentythirteen/footer.php
+@@ -16,14 +16,14 @@
+
+ <div class="site-info">
+ <?php do_action( 'twentythirteen_credits' ); ?>
++
+ <?php
+ if ( function_exists( 'the_privacy_policy_link' ) ) {
+ the_privacy_policy_link( '', '<span role="separator" aria-hidden="true"></span>' );
+ }
+ ?>
+- <a href="<?php echo esc_url( __( 'https://wordpress.org/', 'twentythirteen' ) ); ?>" class="imprint">
+- <?php printf( __( 'Proudly powered by %s', 'twentythirteen' ), 'WordPress' ); ?>
+- </a>
++ <strong>Proudly powered by <a href="http://www.autistici.org">R*</a></strong>
++
+ </div><!-- .site-info -->
+ </footer><!-- #colophon -->
+ </div><!-- #page -->
+diff --git a/wp-content/themes/twentythirteen/functions.php b/wp-content/themes/twentythirteen/functions.php
+index 5c021fbe..2b2eb72f 100644
+--- a/wp-content/themes/twentythirteen/functions.php
++++ b/wp-content/themes/twentythirteen/functions.php
+@@ -219,36 +219,6 @@ add_action( 'after_setup_theme', 'twentythirteen_setup' );
+ function twentythirteen_fonts_url() {
+ $fonts_url = '';
+
+- /* Translators: If there are characters in your language that are not
+- * supported by Source Sans Pro, translate this to 'off'. Do not translate
+- * into your own language.
+- */
+- $source_sans_pro = _x( 'on', 'Source Sans Pro font: on or off', 'twentythirteen' );
+-
+- /* Translators: If there are characters in your language that are not
+- * supported by Bitter, translate this to 'off'. Do not translate into your
+- * own language.
+- */
+- $bitter = _x( 'on', 'Bitter font: on or off', 'twentythirteen' );
+-
+- if ( 'off' !== $source_sans_pro || 'off' !== $bitter ) {
+- $font_families = array();
+-
+- if ( 'off' !== $source_sans_pro ) {
+- $font_families[] = 'Source Sans Pro:300,400,700,300italic,400italic,700italic';
+- }
+-
+- if ( 'off' !== $bitter ) {
+- $font_families[] = 'Bitter:400,700';
+- }
+-
+- $query_args = array(
+- 'family' => urlencode( implode( '|', $font_families ) ),
+- 'subset' => urlencode( 'latin,latin-ext' ),
+- );
+- $fonts_url = add_query_arg( $query_args, 'https://fonts.googleapis.com/css' );
+- }
+-
+ return $fonts_url;
+ }
+
diff --git a/patches/themes/0165-twentytwelve-footer-and-google-fonts.patch b/patches/themes/0165-twentytwelve-footer-and-google-fonts.patch
new file mode 100644
index 0000000000000000000000000000000000000000..9bbd1d6558b995aa6f95f85a24528663b1ffe2d0
--- /dev/null
+++ b/patches/themes/0165-twentytwelve-footer-and-google-fonts.patch
@@ -0,0 +1,52 @@
+diff --git a/wp-content/themes/twentytwelve/footer.php b/wp-content/themes/twentytwelve/footer.php
+index 05e52e2b..2ca9b6c0 100644
+--- a/wp-content/themes/twentytwelve/footer.php
++++ b/wp-content/themes/twentytwelve/footer.php
+@@ -18,9 +18,7 @@
+ the_privacy_policy_link( '', '<span role="separator" aria-hidden="true"></span>' );
+ }
+ ?>
+- <a href="<?php echo esc_url( __( 'https://wordpress.org/', 'twentytwelve' ) ); ?>" class="imprint" title="<?php esc_attr_e( 'Semantic Personal Publishing Platform', 'twentytwelve' ); ?>">
+- <?php printf( __( 'Proudly powered by %s', 'twentytwelve' ), 'WordPress' ); ?>
+- </a>
++ <strong>Proudly powered by <a href="http://www.autistici.org">R*</a></strong>
+ </div><!-- .site-info -->
+ </footer><!-- #colophon -->
+ </div><!-- #page -->
+diff --git a/wp-content/themes/twentytwelve/functions.php b/wp-content/themes/twentytwelve/functions.php
+index ad89b2ac..bdda0c64 100644
+--- a/wp-content/themes/twentytwelve/functions.php
++++ b/wp-content/themes/twentytwelve/functions.php
+@@ -145,31 +145,7 @@ require( get_template_directory() . '/inc/custom-header.php' );
+ function twentytwelve_get_font_url() {
+ $font_url = '';
+
+- /* translators: If there are characters in your language that are not supported
+- * by Open Sans, translate this to 'off'. Do not translate into your own language.
+- */
+- if ( 'off' !== _x( 'on', 'Open Sans font: on or off', 'twentytwelve' ) ) {
+- $subsets = 'latin,latin-ext';
+-
+- /* translators: To add an additional Open Sans character subset specific to your language,
+- * translate this to 'greek', 'cyrillic' or 'vietnamese'. Do not translate into your own language.
+- */
+- $subset = _x( 'no-subset', 'Open Sans font: add new subset (greek, cyrillic, vietnamese)', 'twentytwelve' );
+-
+- if ( 'cyrillic' == $subset ) {
+- $subsets .= ',cyrillic,cyrillic-ext';
+- } elseif ( 'greek' == $subset ) {
+- $subsets .= ',greek,greek-ext';
+- } elseif ( 'vietnamese' == $subset ) {
+- $subsets .= ',vietnamese';
+- }
+-
+- $query_args = array(
+- 'family' => 'Open+Sans:400italic,700italic,400,700',
+- 'subset' => $subsets,
+- );
+- $font_url = add_query_arg( $query_args, 'https://fonts.googleapis.com/css' );
+- }
++ /* REMOVED GoogleApis*/
+
+ return $font_url;
+ }