diff --git a/htmLawed.module b/htmlawed.module
similarity index 93%
rename from htmLawed.module
rename to htmlawed.module
index 95d2781..eb2c0c7 100644
--- a/htmLawed.module
+++ b/htmlawed.module
@@ -9,6 +9,7 @@
 
 use Drupal\Core\Routing\RouteMatchInterface;
 use Drupal\Core\Url;
+use Drupal\filter\FilterFormatInterface;
 
 /**
  * Implements hook_help().
@@ -67,3 +68,13 @@ function htmlawed_libraries_info() {
   );
   return $libraries;
 }
+
+/**
+ * Implements hook_editor_xss_filter_alter().
+ */
+function htmlawed_editor_xss_filter_alter(&$editor_xss_filter_class, FilterFormatInterface $format, FilterFormatInterface $original_format = NULL) {
+  $filters = $format->filters()->getAll();
+  if (isset($filters['filter_htmlawed']) && $filters['filter_htmlawed']->status) {
+    $editor_xss_filter_class = '\Drupal\htmlawed\EditorXssFilter\Filterhtmlawed';
+  }
+}
diff --git a/src/EditorXssFilter/Filterhtmlawed.php b/src/EditorXssFilter/Filterhtmlawed.php
new file mode 100644
index 0000000..33adc76
--- /dev/null
+++ b/src/EditorXssFilter/Filterhtmlawed.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * @file
+ * Contains Drupal\htmlawed\src\EditorXssFilter\Filterhtmlawed
+ */
+
+namespace Drupal\htmlawed\EditorXssFilter;
+
+use Drupal\filter\FilterFormatInterface;
+use Drupal\editor\EditorXssFilterInterface;
+
+/**
+ * Defines a new text editor XSS filter.
+ *
+ * The original filter ALWAYS strip the "style" attribute.
+ */
+class Filterhtmlawed implements EditorXssFilterInterface {
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function filterXss($html, FilterFormatInterface $format, FilterFormatInterface $original_format = NULL) {
+    // Apply all enabled filters to the html text. Secure (?).
+    return check_markup($html, $format->id());
+  }
+
+}