diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000..691851a
Binary files /dev/null and b/.DS_Store differ
diff --git a/_imagify-helper-plugin/imagify-helper-plugin.php b/_imagify-helper-plugin/imagify-helper-plugin.php
index 2918030..88d242b 100644
--- a/_imagify-helper-plugin/imagify-helper-plugin.php
+++ b/_imagify-helper-plugin/imagify-helper-plugin.php
@@ -8,7 +8,7 @@
  * License:     GNU General Public License v2 or later
  * License URI: http://www.gnu.org/licenses/gpl-2.0.html
  *
- * Copyright SAS WP MEDIA 2018
+ * Copyright SAS WP MEDIA 2020
  */
 
 // EDIT THIS: Replace `boilerplate` with your custom subnamespace.
diff --git a/debugging/.DS_Store b/debugging/.DS_Store
new file mode 100644
index 0000000..a6e84fb
Binary files /dev/null and b/debugging/.DS_Store differ
diff --git a/debugging/imagify-tools-1.1.2.zip b/debugging/imagify-tools-1.1.2.zip
new file mode 100644
index 0000000..826d607
Binary files /dev/null and b/debugging/imagify-tools-1.1.2.zip differ
diff --git a/optimization/.DS_Store b/optimization/.DS_Store
new file mode 100644
index 0000000..0c0182a
Binary files /dev/null and b/optimization/.DS_Store differ
diff --git a/optimization/dont-use-imagick/.DS_Store b/optimization/dont-use-imagick/.DS_Store
new file mode 100644
index 0000000..0239afa
Binary files /dev/null and b/optimization/dont-use-imagick/.DS_Store differ
diff --git a/optimization/dont-use-imagick/dont-use-imagick.php b/optimization/dont-use-imagick/dont-use-imagick.php
new file mode 100644
index 0000000..0e666ff
--- /dev/null
+++ b/optimization/dont-use-imagick/dont-use-imagick.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Plugin Name: Don’t use ImageMagick
+ * Description: Don't use the ImageMagick library to manipulate images (poor performances).
+ * Version: 1.0
+ * Author: WP Media
+ * Author URI: https://wp-media.me/
+ * Licence: GPLv2
+ *
+ * Copyright SAS WP MEDIA 2020
+ */
+
+defined( 'ABSPATH' ) || die( 'Cheatin\' uh?' );
+
+add_filter( 'wp_image_editors', function( $editors ) {
+	$editors = array_diff(
+		$editors,
+		[ 'WP_Image_Editor_Imagick' ]
+	);
+	$editors[] = 'WP_Image_Editor_Imagick';
+
+	return $editors;
+} );
diff --git a/optimization/dont-use-imagick/dont-use-imagick.zip b/optimization/dont-use-imagick/dont-use-imagick.zip
new file mode 100644
index 0000000..9d04e2e
Binary files /dev/null and b/optimization/dont-use-imagick/dont-use-imagick.zip differ
diff --git a/optimization/imagify-bulk-buffer-size/.DS_Store b/optimization/imagify-bulk-buffer-size/.DS_Store
new file mode 100644
index 0000000..e5840ea
Binary files /dev/null and b/optimization/imagify-bulk-buffer-size/.DS_Store differ
diff --git a/optimization/imagify-bulk-buffer-size/imagify-bulk-buffer-size.php b/optimization/imagify-bulk-buffer-size/imagify-bulk-buffer-size.php
index 9cb9d2a..401d5d0 100644
--- a/optimization/imagify-bulk-buffer-size/imagify-bulk-buffer-size.php
+++ b/optimization/imagify-bulk-buffer-size/imagify-bulk-buffer-size.php
@@ -1,32 +1,23 @@
 <?php
 /**
- * Plugin Name: Imagify | Change Bulk Buffer Size
- * Description: Helps to avoid CPU issues during bulk optimization.
- * Plugin URI:  https://github.com/wp-media/imagify-helpers/tree/master/optimization/imagify-bulk-buffer-size/
- * Author:      Imagify Support Team
- * Author URI:  http://imagify.io/
- * License:     GNU General Public License v2 or later
- * License URI: http://www.gnu.org/licenses/gpl-2.0.html
+ * Plugin Name: Imagify bulk optimization buffer size
+ * Description: In Imagify’s bulk optimization, set the number of parallel optimizations to 1 for all contexts.
+ * Version: 1.0
+ * Author: WP Media
+ * Author URI: https://wp-media.me/
+ * Licence: GPLv2
  *
- * Copyright SAS WP MEDIA 2018
+ * Copyright SAS WP MEDIA 2020
  */
-namespace ImagifyPlugin\Helpers\optimization\bulk;
 
-defined( 'ABSPATH' ) or die();
+defined( 'ABSPATH' ) || die( 'Cheatin\' uh?' );
 
-add_filter( 'imagify_bulk_buffer_sizes', __NAMESPACE__ . '\buffer_sizes', 10, 3 );
-/**
- * Prevent automatic optimization for PDF.
- *
- * @author Grégory Viguier
- * @author Caspar Hübinger
- *
- * @param  array $buffer_sizes An array of number of parallel queries
- * @return array               Modified array
- */
-function buffer_sizes( $buffer_sizes ) {
-
-	$buffer = array_keys( $buffer_sizes );
-
-	return array_fill_keys( $buffer_sizes, 1 );
-}
+add_filter(
+	'imagify_bulk_buffer_sizes',
+	function ( $buffer_sizes ) {
+		if ( ! $buffer_sizes || ! is_array( $buffer_sizes ) ) {
+			return [];
+		}
+		return array_fill_keys( array_keys( $buffer_sizes ), 1 );
+	}
+);
diff --git a/optimization/imagify-bulk-buffer-size/imagify-bulk-buffer-size.zip b/optimization/imagify-bulk-buffer-size/imagify-bulk-buffer-size.zip
deleted file mode 100644
index 277a187..0000000
Binary files a/optimization/imagify-bulk-buffer-size/imagify-bulk-buffer-size.zip and /dev/null differ
diff --git a/optimization/imagify-bulk-buffer-size/imagify-bulk-optimization-buffer-size.zip b/optimization/imagify-bulk-buffer-size/imagify-bulk-optimization-buffer-size.zip
new file mode 100644
index 0000000..61e924c
Binary files /dev/null and b/optimization/imagify-bulk-buffer-size/imagify-bulk-optimization-buffer-size.zip differ
diff --git a/optimization/imagify-no-auto-optimize-pdf/imagify-no-auto-optimize-pdf.php b/optimization/imagify-no-auto-optimize-pdf/imagify-no-auto-optimize-pdf.php
index c44e946..bb193f3 100644
--- a/optimization/imagify-no-auto-optimize-pdf/imagify-no-auto-optimize-pdf.php
+++ b/optimization/imagify-no-auto-optimize-pdf/imagify-no-auto-optimize-pdf.php
@@ -8,7 +8,7 @@
  * License:     GNU General Public License v2 or later
  * License URI: http://www.gnu.org/licenses/gpl-2.0.html
  *
- * Copyright SAS WP MEDIA 2018
+ * Copyright SAS WP MEDIA 2020
  */
 namespace ImagifyPlugin\Helpers\optimization\auto;
 
diff --git a/optimization/imagify-remove-thumbs/.DS_Store b/optimization/imagify-remove-thumbs/.DS_Store
new file mode 100644
index 0000000..cf4b5b8
Binary files /dev/null and b/optimization/imagify-remove-thumbs/.DS_Store differ
diff --git a/optimization/imagify-remove-thumbs/imagify-remove-thumbs.php b/optimization/imagify-remove-thumbs/imagify-remove-thumbs.php
index a4ef7df..141fe81 100644
--- a/optimization/imagify-remove-thumbs/imagify-remove-thumbs.php
+++ b/optimization/imagify-remove-thumbs/imagify-remove-thumbs.php
@@ -3,20 +3,22 @@
  * Plugin Name: Imagify helper - Remove image sizes 1536&2048px
  * Plugin URI: https://wordpress.org/plugins/imagify/
  * Description: A WordPress plugin that removes specific thumbnail sizes.
- * Version: 1.0
+ * Version: 1.1
  * Author: WP Media
  * Author URI: https://wp-media.me/
  * Licence: GPLv2
  *
  * Text Domain: imagify-remove-thumbs
  *
- * Copyright 2019 WP Media
+ * Copyright SAS WP MEDIA 2020
  */
 
 defined( 'ABSPATH' ) || die( 'Cheatin’ uh?' );
 
+add_filter( 'big_image_size_threshold', '__return_false' );
+
 function remove_default_image_sizes( $sizes) {
-	unset( $sizes['1536x1536']);
+    unset( $sizes['1536x1536']);
 	unset( $sizes['2048x2048']);
 	return $sizes;
 }
@@ -24,7 +26,7 @@ function remove_default_image_sizes( $sizes) {
 add_filter('intermediate_image_sizes_advanced', 'remove_default_image_sizes');
 	
 function remove_images_sizes() {
-	remove_image_size( '1536x1536' );
+    remove_image_size( '1536x1536' );
 	remove_image_size( '2048x2048' );
 }
 add_action('init', 'remove_images_sizes');
\ No newline at end of file
diff --git a/optimization/imagify-remove-thumbs/imagify-remove-thumbs.php.zip b/optimization/imagify-remove-thumbs/imagify-remove-thumbs.php.zip
deleted file mode 100644
index 56f1172..0000000
Binary files a/optimization/imagify-remove-thumbs/imagify-remove-thumbs.php.zip and /dev/null differ
diff --git a/optimization/imagify-remove-thumbs/imagify-remove-thumbs.zip b/optimization/imagify-remove-thumbs/imagify-remove-thumbs.zip
new file mode 100644
index 0000000..6e43d89
Binary files /dev/null and b/optimization/imagify-remove-thumbs/imagify-remove-thumbs.zip differ
diff --git a/optimization/imagify-reset-optimization-status/imagify-reset-optimization-status.php b/optimization/imagify-reset-optimization-status/imagify-reset-optimization-status.php
index a8d7646..f9c3668 100644
--- a/optimization/imagify-reset-optimization-status/imagify-reset-optimization-status.php
+++ b/optimization/imagify-reset-optimization-status/imagify-reset-optimization-status.php
@@ -8,7 +8,7 @@
  * License:     GNU General Public License v2 or later
  * License URI: http://www.gnu.org/licenses/gpl-2.0.html
  *
- * Copyright SAS WP MEDIA 2018
+ * Copyright SAS WP MEDIA 2020
  */
 namespace ImagifyPlugin\Helpers\optimization\status;
 
diff --git a/settings/.DS_Store b/settings/.DS_Store
new file mode 100644
index 0000000..a89db1d
Binary files /dev/null and b/settings/.DS_Store differ
diff --git a/settings/imagify-skip-gif/imagify-skip-gif.php b/settings/imagify-skip-gif/imagify-skip-gif.php
new file mode 100644
index 0000000..b469d32
--- /dev/null
+++ b/settings/imagify-skip-gif/imagify-skip-gif.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Plugin Name: Imagify | No Auto-Optimization for GIFs
+ * Description: Excludes GIF files from being auto-optimized once they’re uploaded.
+ * Plugin URI:  https://github.com/wp-media/imagify-helpers/tree/master/optimization/imagify-no-auto-optimize-gif/
+ * Author:      Imagify Support Team
+ * Author URI:  http://imagify.io/
+ * License:     GNU General Public License v2 or later
+ * License URI: http://www.gnu.org/licenses/gpl-2.0.html
+ *
+ * Copyright SAS WP MEDIA 2018
+ */
+namespace ImagifyPlugin\Helpers\optimization\auto;
+
+defined( 'ABSPATH' ) or die();
+
+add_filter( 'imagify_auto_optimize_attachment', __NAMESPACE__ . '\no_optimize_gif', 10, 3 );
+/**
+ * Prevent automatic optimization for GIF.
+ *
+ * @author Grégory Viguier
+ * @author Caspar Hübinger
+ *
+ * @param  bool  $optimize      True to optimize, false otherwise.
+ * @param  int   $attachment_id Attachment ID.
+ * @param  array $metadata      An array of attachment meta data.
+ * @return bool
+ */
+function no_optimize_gif( $optimize, $attachment_id, $metadata ) {
+	if ( ! $optimize ) {
+		return false;
+	}
+
+	$mime_type = get_post_mime_type( $attachment_id );
+
+	return 'image/gif' !== $mime_type;
+}
\ No newline at end of file
diff --git a/settings/imagify-skip-gif/imagify-skip-gif.zip b/settings/imagify-skip-gif/imagify-skip-gif.zip
new file mode 100644
index 0000000..fa273e8
Binary files /dev/null and b/settings/imagify-skip-gif/imagify-skip-gif.zip differ
diff --git a/settings/imagify-skip-pdf/imagify-skip-pdf.php b/settings/imagify-skip-pdf/imagify-skip-pdf.php
new file mode 100644
index 0000000..be64671
--- /dev/null
+++ b/settings/imagify-skip-pdf/imagify-skip-pdf.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Plugin Name: Imagify | No Auto-Optimization for PDFs
+ * Description: Excludes PDF files from being auto-optimized once they’re uploaded.
+ * Plugin URI:  https://github.com/wp-media/imagify-helpers/tree/master/optimization/imagify-no-auto-optimize-pdf/
+ * Author:      Imagify Support Team
+ * Author URI:  http://imagify.io/
+ * License:     GNU General Public License v2 or later
+ * License URI: http://www.gnu.org/licenses/gpl-2.0.html
+ *
+ * Copyright SAS WP MEDIA 2018
+ */
+namespace ImagifyPlugin\Helpers\optimization\auto;
+
+defined( 'ABSPATH' ) or die();
+
+add_filter( 'imagify_auto_optimize_attachment', __NAMESPACE__ . '\no_optimize_pdf', 10, 3 );
+/**
+ * Prevent automatic optimization for PDF.
+ *
+ * @author Grégory Viguier
+ * @author Caspar Hübinger
+ *
+ * @param  bool  $optimize      True to optimize, false otherwise.
+ * @param  int   $attachment_id Attachment ID.
+ * @param  array $metadata      An array of attachment meta data.
+ * @return bool
+ */
+function no_optimize_pdf( $optimize, $attachment_id, $metadata ) {
+	if ( ! $optimize ) {
+		return false;
+	}
+
+	$mime_type = get_post_mime_type( $attachment_id );
+
+	return 'application/pdf' !== $mime_type;
+}
\ No newline at end of file
diff --git a/settings/imagify-skip-pdf/imagify-skip-pdf.zip b/settings/imagify-skip-pdf/imagify-skip-pdf.zip
new file mode 100644
index 0000000..2ad230b
Binary files /dev/null and b/settings/imagify-skip-pdf/imagify-skip-pdf.zip differ
diff --git a/settings/imgf-custom-site-root/.DS_Store b/settings/imgf-custom-site-root/.DS_Store
new file mode 100644
index 0000000..272df9d
Binary files /dev/null and b/settings/imgf-custom-site-root/.DS_Store differ
diff --git a/settings/imgf-custom-site-root/imgf-custom-site-root.php b/settings/imgf-custom-site-root/imgf-custom-site-root.php
new file mode 100644
index 0000000..f35987c
--- /dev/null
+++ b/settings/imgf-custom-site-root/imgf-custom-site-root.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Plugin Name: Imagify Custom Site Root
+ * Description: Fix the site path in Imagify.
+ * Version: 1.0
+ * Author: WP Media
+ * Author URI: https://wp-media.me/
+ * Licence: GPLv2
+ *
+ * Copyright 2020 WP Media
+ */
+
+defined( 'ABSPATH' ) || die( 'Cheatin\' uh?' );
+
+add_filter( 'imagify_site_root', 'imgf_custom_site_root', 10001 );
+/**
+ * Filter the path to the site's root.
+ *
+ * @since  1.0
+ * @author Grégory Viguier
+ *
+ * @param string $root_path Path to the site's root. Default is null.
+ */
+function imgf_custom_site_root( $root_path ) {
+	$upload_basedir = imagify_get_filesystem()->get_upload_basedir( true );
+
+	if ( strpos( $upload_basedir, '/wp-content/' ) === false ) {
+		return $root_path;
+	}
+
+	$upload_basedir = explode( '/wp-content/', $upload_basedir );
+	$upload_basedir = reset( $upload_basedir );
+
+	return trailingslashit( $upload_basedir );
+}
diff --git a/settings/imgf-custom-site-root/imgf-custom-site-root.zip b/settings/imgf-custom-site-root/imgf-custom-site-root.zip
new file mode 100644
index 0000000..a9f0c94
Binary files /dev/null and b/settings/imgf-custom-site-root/imgf-custom-site-root.zip differ