diff --git a/Localization/ISO3166CharEnum.php b/Localization/ISO3166CharEnum.php
index 2871b6caa..3edfc092d 100755
--- a/Localization/ISO3166CharEnum.php
+++ b/Localization/ISO3166CharEnum.php
@@ -528,5 +528,5 @@ class ISO3166CharEnum extends Enum
 
     public const _XXX = 'XXX';
 
-    use ISO3166RegionTrait;
+    use ISO3166Trait;
 }
diff --git a/Localization/ISO3166NameEnum.php b/Localization/ISO3166NameEnum.php
index 5fb6b9f36..173533b8a 100755
--- a/Localization/ISO3166NameEnum.php
+++ b/Localization/ISO3166NameEnum.php
@@ -528,5 +528,5 @@ class ISO3166NameEnum extends Enum
 
     public const _XXX = 'XXX';
 
-    use ISO3166RegionTrait;
+    use ISO3166Trait;
 }
diff --git a/Localization/ISO3166NumEnum.php b/Localization/ISO3166NumEnum.php
index 35a6e5021..ea040e2d5 100755
--- a/Localization/ISO3166NumEnum.php
+++ b/Localization/ISO3166NumEnum.php
@@ -528,5 +528,5 @@ class ISO3166NumEnum extends Enum
 
     public const _XXX = '000';
 
-    use ISO3166RegionTrait;
+    use ISO3166Trait;
 }
diff --git a/Localization/ISO3166RegionTrait.php b/Localization/ISO3166Trait.php
old mode 100755
new mode 100644
similarity index 98%
rename from Localization/ISO3166RegionTrait.php
rename to Localization/ISO3166Trait.php
index 3ee93e786..6d8719c4a
--- a/Localization/ISO3166RegionTrait.php
+++ b/Localization/ISO3166Trait.php
@@ -22,8 +22,15 @@
  * @link    https://jingga.app
  * @since   1.0.0
  */
-trait ISO3166RegionTrait
+trait ISO3166Trait
 {
+    public static function getBy2Code(string $code)
+    {
+        $code3 = ISO3166TwoEnum::getName($code);
+
+        return self::getByName($code3);
+    }
+
     /**
      * Get countries in a region
      *
diff --git a/Localization/ISO3166TwoEnum.php b/Localization/ISO3166TwoEnum.php
index 0d1c9972a..5bb96e765 100755
--- a/Localization/ISO3166TwoEnum.php
+++ b/Localization/ISO3166TwoEnum.php
@@ -528,5 +528,5 @@ class ISO3166TwoEnum extends Enum
 
     public const _XXX = 'XX';
 
-    use ISO3166RegionTrait;
+    use ISO3166Trait;
 }
diff --git a/Localization/ISO639Enum.php b/Localization/ISO639Enum.php
index 27a769ed9..79ce4051f 100755
--- a/Localization/ISO639Enum.php
+++ b/Localization/ISO639Enum.php
@@ -396,5 +396,5 @@ class ISO639Enum extends Enum
 
     public const _ZU = 'Zulu';
 
-    use ISO639CountryTrait;
+    use ISO639Trait;
 }
diff --git a/Localization/ISO639CountryTrait.php b/Localization/ISO639Trait.php
old mode 100755
new mode 100644
similarity index 99%
rename from Localization/ISO639CountryTrait.php
rename to Localization/ISO639Trait.php
index c80560c47..1c1860634
--- a/Localization/ISO639CountryTrait.php
+++ b/Localization/ISO639Trait.php
@@ -22,12 +22,17 @@
  * @link    https://jingga.app
  * @since   1.0.0
  */
-trait ISO639CountryTrait
+trait ISO639Trait
 {
+    public static function getBy2Code(string $code)
+    {
+        return self::getByName('_' . \strtoupper($code));
+    }
+
     /**
      * Get language from country.
      *
-     * @param string $country Country
+     * @param string $country Country 2 code
      *
      * @return array
      *
diff --git a/Localization/ISO639x1Enum.php b/Localization/ISO639x1Enum.php
index 41ebf0954..9d96f1a33 100755
--- a/Localization/ISO639x1Enum.php
+++ b/Localization/ISO639x1Enum.php
@@ -396,5 +396,5 @@ class ISO639x1Enum extends Enum
 
     public const _ZH = 'zh';
 
-    use ISO639CountryTrait;
+    use ISO639Trait;
 }
diff --git a/Localization/ISO639x2Enum.php b/Localization/ISO639x2Enum.php
index 37be1eb8a..97daa23e3 100755
--- a/Localization/ISO639x2Enum.php
+++ b/Localization/ISO639x2Enum.php
@@ -396,5 +396,5 @@ class ISO639x2Enum extends Enum
 
     public const _ZU = 'zul';
 
-    use ISO639CountryTrait;
+    use ISO639Trait;
 }
diff --git a/Utils/Formatter/HtmlFormatter.php b/Utils/Formatter/HtmlFormatter.php
new file mode 100644
index 000000000..473cf42e8
--- /dev/null
+++ b/Utils/Formatter/HtmlFormatter.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Jingga
+ *
+ * PHP Version 8.1
+ *
+ * @package   phpOMS\Utils\Formatter
+ * @copyright Dennis Eichhorn
+ * @license   OMS License 2.0
+ * @version   1.0.0
+ * @link      https://jingga.app
+ */
+declare(strict_types=1);
+
+namespace phpOMS\Utils\Formatter;
+
+/**
+ * Gray encoding class
+ *
+ * @package phpOMS\Utils\Formatter
+ * @license OMS License 2.0
+ * @link    https://jingga.app
+ * @since   1.0.0
+ */
+class HtmlFormatter
+{
+    public static function format(string $text) : string
+    {
+        $dom = new \DOMDocument();
+
+        $dom->loadHTML($text);
+
+        $dom->preserveWhiteSpace = false;
+        $dom->formatOutput = true;
+
+        return $dom->saveXML($dom->documentElement);
+    }
+}