diff --git a/_locales/en/messages.json b/_locales/en/messages.json
new file mode 100644
index 0000000..8076052
--- /dev/null
+++ b/_locales/en/messages.json
@@ -0,0 +1,53 @@
+{
+    "extension_name": {
+        "message": "ShportRemover"
+    },
+
+    "extension_description": {
+        "message": "Remove Short videos from YouTube for a distraction-free experience."
+    },
+
+    "options_name": {
+        "message": "Settings"
+    },
+
+    "options_parameters": {
+        "message": "Parameters"
+    },
+
+    "options_themes": {
+        "message": "Themes"
+    },
+
+    "options_languages": {
+        "message": "Languages"
+    },
+
+    "param_NavbarButtonUndeployed": {
+        "message": "Navbar button undeployed"
+    },
+
+    "param_NavbarButtonDeployed": {
+        "message": "Navbar button deployed"
+    },
+
+    "param_ChannelTab": {
+        "message": "Channel short tab"
+    },
+
+    "param_HomePageRecommendedShort": {
+        "message": "Home page recommended Short"
+    },
+
+    "param_ShortInSearchResult": {
+        "message": "Short in search result"
+    },
+
+    "param_VideoPlayerRecommendedShort": {
+        "message": "Video Player recommended Short"
+    },
+
+    "param_SubscriptionShort": {
+        "message": "Subscription Short"
+    }
+}
\ No newline at end of file
diff --git a/_locales/fr/messages.json b/_locales/fr/messages.json
new file mode 100644
index 0000000..a511cd3
--- /dev/null
+++ b/_locales/fr/messages.json
@@ -0,0 +1,53 @@
+{
+    "extension_name": {
+        "message": "ShortRemover"
+    },
+
+    "extension_description": {
+        "message": "Supprimez les videos Short de YouTube pour une expérience sans distraction."
+    },
+
+    "options_name": {
+        "message": "Paramètres"
+    },
+
+    "options_parameters": {
+        "message": "Paramètres"
+    },
+
+    "options_themes": {
+        "message": "Thèmes"
+    },
+
+    "options_languages": {
+        "message": "Langues"
+    },
+
+    "param_NavbarButtonUndeployed": {
+        "message": "Bouton navbar replié"
+    },
+
+    "param_NavbarButtonDeployed": {
+        "message": "Bouton navbar déployé"
+    },
+
+    "param_ChannelTab": {
+        "message": "Onglet short des chaînes"
+    },
+
+    "param_HomePageRecommendedShort": {
+        "message": "Short recommandé dans l'accueil"
+    },
+
+    "param_ShortInSearchResult": {
+        "message": "Short dans les recherches"
+    },
+
+    "param_VideoPlayerRecommendedShort": {
+        "message": "Short recommandé dans le lecteur"
+    },
+
+    "param_SubscriptionShort": {
+        "message": "Short dans les abonnements"
+    }
+}
\ No newline at end of file
diff --git a/css/base.css b/css/base.css
index 656451f..9593345 100644
--- a/css/base.css
+++ b/css/base.css
@@ -10,6 +10,9 @@
   --color-subtext: #ff8a71;
   --slider-background: linear-gradient(114deg, #9b96a1e6 -13.86%, #838383e6 99.55%);
   --slider-thumb: #040c18;
+  --scrollbar-thumb: #09213a;
+  --scrollbar-thumb-hover: #0d2c4a;
+  --scrollbar-background: #040c18;
   --refresh-background: #868686e6;
   --refresh-hover: #707070e6;
 }
@@ -22,6 +25,9 @@
   --color-text-hover: #141418;
   --color-subtext: #ff8a71;
   --slider-thumb: #f5faff;
+  --scrollbar-thumb: #e1e2e3;
+  --scrollbar-thumb-hover: #cfcfcf;
+  --scrollbar-background: #efefef;
   --refresh-background: #868686e6;
   --refresh-hover: #707070e6;
 }
@@ -132,4 +138,19 @@
   background: var(--gradient-color);
   background-clip: text;
   -webkit-background-clip: text;
+}
+
+::-webkit-scrollbar {
+  width: 10px;
+  background-color: var(--scrollbar-background);
+}
+
+::-webkit-scrollbar-thumb {
+  background-color: var(--scrollbar-thumb);
+  -webkit-transition: 0.35s;
+  transition: 0.35s;
+  cursor: pointer;
+}
+::-webkit-scrollbar-thumb:hover {
+  opacity: var(--scrollbar-thumb-hover);
 }/*# sourceMappingURL=base.css.map */
\ No newline at end of file
diff --git a/css/options.css b/css/options.css
index 61ccee0..76a8e59 100644
--- a/css/options.css
+++ b/css/options.css
@@ -91,7 +91,7 @@ header .header-right__theme:hover {
 .themes__container {
   display: grid;
   margin: 40px;
-  grid-template-columns: repeat(auto-fill, minmax(200px, 1fr));
+  grid-template-columns: repeat(auto-fill, minmax(170px, 1fr));
   grid-gap: 1.5rem;
 }
 .themes__container--item {
@@ -111,7 +111,18 @@ header .header-right__theme:hover {
   grid-area: 1/1/2/2;
 }
 .themes__container--item:hover {
-  filter: brightness(0.6);
+  filter: brightness(0.8);
+}
+.themes__container--item svg {
+  position: absolute;
+  z-index: 2;
+  height: 100px;
+  width: 100px;
+  fill: var(--color-text);
+  display: none;
+}
+.themes__container--item.active svg {
+  display: block;
 }
 .themes__container--item:nth-child(1) {
   background: linear-gradient(89.97deg, #ae67fa 1.84%, #f49867 102.67%);
@@ -183,6 +194,52 @@ header .header-right__theme:hover {
   background: linear-gradient(to right, #3c3b3f, #605c3c);
 }
 
+.languages {
+  margin-top: 130px;
+}
+.languages__container {
+  display: grid;
+  margin: 40px;
+  grid-template-columns: repeat(auto-fill, minmax(170px, 1fr));
+  grid-gap: 1.5rem;
+}
+.languages__container--item {
+  padding: 3px;
+  display: grid;
+  place-items: center;
+  border-radius: 15px;
+  border: 3px solid var(--color-text);
+  cursor: pointer;
+  transition-duration: 0.4s;
+  overflow: hidden;
+}
+.languages__container--item::before {
+  content: "";
+  display: block;
+  grid-area: 1/1/2/2;
+}
+.languages__container--item:hover {
+  filter: brightness(0.8);
+}
+.languages__container--item img {
+  width: calc(100% + 10px);
+  height: calc(100% + 10px);
+  z-index: -1;
+  -o-object-fit: cover;
+  object-fit: cover;
+}
+.languages__container--item svg {
+  position: absolute;
+  z-index: 2;
+  height: 100px;
+  width: 100px;
+  fill: var(--color-text);
+  display: none;
+}
+.languages__container--item.active svg {
+  display: block;
+}
+
 .switch {
   position: relative;
   display: flex;
diff --git a/images/flags/de.png b/images/flags/de.png
new file mode 100644
index 0000000..5de386f
Binary files /dev/null and b/images/flags/de.png differ
diff --git a/images/flags/en.png b/images/flags/en.png
new file mode 100644
index 0000000..69693ca
Binary files /dev/null and b/images/flags/en.png differ
diff --git a/images/flags/es.png b/images/flags/es.png
new file mode 100644
index 0000000..5e7641e
Binary files /dev/null and b/images/flags/es.png differ
diff --git a/images/flags/fr.png b/images/flags/fr.png
new file mode 100644
index 0000000..feff210
Binary files /dev/null and b/images/flags/fr.png differ
diff --git a/images/flags/it.png b/images/flags/it.png
new file mode 100644
index 0000000..673cd94
Binary files /dev/null and b/images/flags/it.png differ
diff --git a/images/flags/jp.png b/images/flags/jp.png
new file mode 100644
index 0000000..e5a5cfb
Binary files /dev/null and b/images/flags/jp.png differ
diff --git a/images/flags/kr.png b/images/flags/kr.png
new file mode 100644
index 0000000..7c42d96
Binary files /dev/null and b/images/flags/kr.png differ
diff --git a/images/flags/pt.png b/images/flags/pt.png
new file mode 100644
index 0000000..16d5488
Binary files /dev/null and b/images/flags/pt.png differ
diff --git a/images/flags/ru.png b/images/flags/ru.png
new file mode 100644
index 0000000..f22461b
Binary files /dev/null and b/images/flags/ru.png differ
diff --git a/images/flags/sa.png b/images/flags/sa.png
new file mode 100644
index 0000000..8ec1bfa
Binary files /dev/null and b/images/flags/sa.png differ
diff --git a/manifest.json b/manifest.json
index c592d45..7d1a5e6 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,8 +1,9 @@
 {
     "manifest_version": 3,
-    "name": "ShortRemover",
-    "version": "0.5.5",
-    "description": "Remove short videos from YouTube for a distraction-free experience.",
+    "name": "__MSG_extension_name__",
+    "version": "0.6.0",
+    "description": "__MSG_extension_description__",
+    "default_locale": "en",
     "options_page": "pages/options.html",
     "icons": {
         "16": "images/icon-16.png",
@@ -10,7 +11,13 @@
         "128": "images/icon-128.png"
     },
     "action": {
-        "default_popup": "pages/popup.html"
+        "default_title": "ShortRemover",
+        "default_popup": "pages/popup.html",
+        "default_icon": {
+            "16": "images/icon-16.png",
+            "32": "images/icon-32.png",
+            "128": "images/icon-128.png"
+        }
     },
     "background": {
         "service_worker": "scripts/service-worker.js"
@@ -28,5 +35,6 @@
             "matches": ["*://*.youtube.com/*"],
             "run_at": "document_start"
         }
-      ]
+    ],
+    "key": "dbacfcfndghenkcjhfflilgnebcgodlk"
 }
\ No newline at end of file
diff --git a/pages/options.html b/pages/options.html
index 5ae3482..754aa31 100644
--- a/pages/options.html
+++ b/pages/options.html
@@ -8,7 +8,7 @@
     <link href="https://fonts.googleapis.com/css2?family=Manrope:wght@200..800&display=swap" rel="stylesheet">
     <link rel="stylesheet" href="../css/base.css">
     <link rel="stylesheet" href="../css/options.css">
-    <title>Document</title>
+    <title>ShortRemover - Options</title>
 
 
     <style id="disable-transitions">
@@ -36,7 +36,7 @@ <h1 class="header-left__text gradient__text">ShortRemover</h1>
     </header>
     <section class="parameters">
         <div class="section">
-            <h2 class="section__title">Parameters</h2>
+            <h2 class="section__title" i18n-data="options_parameters">Parameters</h2>
             <div class="section__separator"></div>
         </div>
         <div class="parameters_container">
@@ -47,7 +47,7 @@ <h2 class="section__title">Parameters</h2>
                         <div class="slider-thumb"></div>
                     </span>
                 </label>
-                <span class="param-name">Navbar button undeployed</span>
+                <span class="param-name" i18n-data="param_NavbarButtonUndeployed">Navbar button undeployed</span>
             </div>
     
             <div class="param">
@@ -57,12 +57,9 @@ <h2 class="section__title">Parameters</h2>
                         <div class="slider-thumb"></div>
                     </span>
                 </label>
-                <span class="param-name">Navbar button deployed</span>
+                <span class="param-name" i18n-data="param_NavbarButtonDeployed" >Navbar button deployed</span>
             </div>
     
-
-
-
             <div class="param">
                 <label id="param-button" class="switch param-button">
                     <input id="channel-tab" value="paramChannelTab" type="checkbox" />
@@ -70,13 +67,8 @@ <h2 class="section__title">Parameters</h2>
                         <div class="slider-thumb"></div>
                     </span>
                 </label>
-                <span class="param-name">Channel short tab</span>
+                <span class="param-name" i18n-data="param_ChannelTab">Channel short tab</span>
             </div>
-    
-
-
-
-
 
             <div class="param">
                 <label id="param-button" class="switch param-button">
@@ -85,7 +77,7 @@ <h2 class="section__title">Parameters</h2>
                         <div class="slider-thumb"></div>
                     </span>
                 </label>
-                <span class="param-name">Home page recommended Short</span>
+                <span class="param-name" i18n-data="param_HomePageRecommendedShort">Home page recommended Short</span>
             </div>
     
             <div class="param">
@@ -95,7 +87,7 @@ <h2 class="section__title">Parameters</h2>
                         <div class="slider-thumb"></div>
                     </span>
                 </label>
-                <span class="param-name">Short in search result</span>
+                <span class="param-name" i18n-data="param_ShortInSearchResult">Short in search result</span>
             </div>
     
             <div class="param">
@@ -105,7 +97,7 @@ <h2 class="section__title">Parameters</h2>
                         <div class="slider-thumb"></div>
                     </span>
                 </label>
-                <span class="param-name">Video Player recommended Short</span>
+                <span class="param-name" i18n-data="param_VideoPlayerRecommendedShort">Video Player recommended Short</span>
             </div>
     
             <div class="param">
@@ -115,42 +107,106 @@ <h2 class="section__title">Parameters</h2>
                         <div class="slider-thumb"></div>
                     </span>
                 </label>
-                <span class="param-name">Subscription short</span>
+                <span class="param-name" i18n-data="param_SubscriptionShort">Subscription short</span>
             </div>
         </div>
     </section>
     <section class="themes">
         <div class="section">
-            <h2 class="section__title">Themes</h2>
+            <h2 class="section__title" i18n-data="options_themes">Themes</h2>
             <div class="section__separator"></div>
         </div>
         <div class="themes__container">
-            <div class="themes__container--item"></div>
-            <div class="themes__container--item"></div>
-            <div class="themes__container--item"></div>
-            <div class="themes__container--item"></div>
-            <div class="themes__container--item"></div>
-            <div class="themes__container--item"></div>
-            <div class="themes__container--item"></div>
-            <div class="themes__container--item"></div>
-            <div class="themes__container--item"></div>
-            <div class="themes__container--item"></div>
-            <div class="themes__container--item"></div>
-            <div class="themes__container--item"></div>
-            <div class="themes__container--item"></div>
-            <div class="themes__container--item"></div>
-            <div class="themes__container--item"></div>
-            <div class="themes__container--item"></div>
-            <div class="themes__container--item"></div>
-            <div class="themes__container--item"></div>
-            <div class="themes__container--item"></div>
-            <div class="themes__container--item"></div>
-            <div class="themes__container--item"></div>
-            <div class="themes__container--item"></div>
-            <div class="themes__container--item"></div>
+            <div class="themes__container--item">
+                <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><path d="M438.6 105.4c12.5 12.5 12.5 32.8 0 45.3l-256 256c-12.5 12.5-32.8 12.5-45.3 0l-128-128c-12.5-12.5-12.5-32.8 0-45.3s32.8-12.5 45.3 0L160 338.7 393.4 105.4c12.5-12.5 32.8-12.5 45.3 0z"/></svg>
+            </div>
+            <div class="themes__container--item">
+                <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><path d="M438.6 105.4c12.5 12.5 12.5 32.8 0 45.3l-256 256c-12.5 12.5-32.8 12.5-45.3 0l-128-128c-12.5-12.5-12.5-32.8 0-45.3s32.8-12.5 45.3 0L160 338.7 393.4 105.4c12.5-12.5 32.8-12.5 45.3 0z"/></svg>
+            </div>
+            <div class="themes__container--item">
+                <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><path d="M438.6 105.4c12.5 12.5 12.5 32.8 0 45.3l-256 256c-12.5 12.5-32.8 12.5-45.3 0l-128-128c-12.5-12.5-12.5-32.8 0-45.3s32.8-12.5 45.3 0L160 338.7 393.4 105.4c12.5-12.5 32.8-12.5 45.3 0z"/></svg>
+            </div>
+            <div class="themes__container--item">
+                <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><path d="M438.6 105.4c12.5 12.5 12.5 32.8 0 45.3l-256 256c-12.5 12.5-32.8 12.5-45.3 0l-128-128c-12.5-12.5-12.5-32.8 0-45.3s32.8-12.5 45.3 0L160 338.7 393.4 105.4c12.5-12.5 32.8-12.5 45.3 0z"/></svg>
+            </div>
+            <div class="themes__container--item">
+                <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><path d="M438.6 105.4c12.5 12.5 12.5 32.8 0 45.3l-256 256c-12.5 12.5-32.8 12.5-45.3 0l-128-128c-12.5-12.5-12.5-32.8 0-45.3s32.8-12.5 45.3 0L160 338.7 393.4 105.4c12.5-12.5 32.8-12.5 45.3 0z"/></svg>
+            </div>
+            <div class="themes__container--item">
+                <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><path d="M438.6 105.4c12.5 12.5 12.5 32.8 0 45.3l-256 256c-12.5 12.5-32.8 12.5-45.3 0l-128-128c-12.5-12.5-12.5-32.8 0-45.3s32.8-12.5 45.3 0L160 338.7 393.4 105.4c12.5-12.5 32.8-12.5 45.3 0z"/></svg>
+            </div>
+            <div class="themes__container--item">
+                <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><path d="M438.6 105.4c12.5 12.5 12.5 32.8 0 45.3l-256 256c-12.5 12.5-32.8 12.5-45.3 0l-128-128c-12.5-12.5-12.5-32.8 0-45.3s32.8-12.5 45.3 0L160 338.7 393.4 105.4c12.5-12.5 32.8-12.5 45.3 0z"/></svg>
+            </div>
+            <div class="themes__container--item">
+                <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><path d="M438.6 105.4c12.5 12.5 12.5 32.8 0 45.3l-256 256c-12.5 12.5-32.8 12.5-45.3 0l-128-128c-12.5-12.5-12.5-32.8 0-45.3s32.8-12.5 45.3 0L160 338.7 393.4 105.4c12.5-12.5 32.8-12.5 45.3 0z"/></svg>
+            </div>
+            <div class="themes__container--item">
+                <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><path d="M438.6 105.4c12.5 12.5 12.5 32.8 0 45.3l-256 256c-12.5 12.5-32.8 12.5-45.3 0l-128-128c-12.5-12.5-12.5-32.8 0-45.3s32.8-12.5 45.3 0L160 338.7 393.4 105.4c12.5-12.5 32.8-12.5 45.3 0z"/></svg>
+            </div>
+            <div class="themes__container--item">
+                <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><path d="M438.6 105.4c12.5 12.5 12.5 32.8 0 45.3l-256 256c-12.5 12.5-32.8 12.5-45.3 0l-128-128c-12.5-12.5-12.5-32.8 0-45.3s32.8-12.5 45.3 0L160 338.7 393.4 105.4c12.5-12.5 32.8-12.5 45.3 0z"/></svg>
+            </div>
+            <div class="themes__container--item">
+                <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><path d="M438.6 105.4c12.5 12.5 12.5 32.8 0 45.3l-256 256c-12.5 12.5-32.8 12.5-45.3 0l-128-128c-12.5-12.5-12.5-32.8 0-45.3s32.8-12.5 45.3 0L160 338.7 393.4 105.4c12.5-12.5 32.8-12.5 45.3 0z"/></svg>
+            </div>
+            <div class="themes__container--item">
+                <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><path d="M438.6 105.4c12.5 12.5 12.5 32.8 0 45.3l-256 256c-12.5 12.5-32.8 12.5-45.3 0l-128-128c-12.5-12.5-12.5-32.8 0-45.3s32.8-12.5 45.3 0L160 338.7 393.4 105.4c12.5-12.5 32.8-12.5 45.3 0z"/></svg>
+            </div>
+            <div class="themes__container--item">
+                <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><path d="M438.6 105.4c12.5 12.5 12.5 32.8 0 45.3l-256 256c-12.5 12.5-32.8 12.5-45.3 0l-128-128c-12.5-12.5-12.5-32.8 0-45.3s32.8-12.5 45.3 0L160 338.7 393.4 105.4c12.5-12.5 32.8-12.5 45.3 0z"/></svg>
+            </div>
+            <div class="themes__container--item">
+                <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><path d="M438.6 105.4c12.5 12.5 12.5 32.8 0 45.3l-256 256c-12.5 12.5-32.8 12.5-45.3 0l-128-128c-12.5-12.5-12.5-32.8 0-45.3s32.8-12.5 45.3 0L160 338.7 393.4 105.4c12.5-12.5 32.8-12.5 45.3 0z"/></svg>
+            </div>
+            <div class="themes__container--item">
+                <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><path d="M438.6 105.4c12.5 12.5 12.5 32.8 0 45.3l-256 256c-12.5 12.5-32.8 12.5-45.3 0l-128-128c-12.5-12.5-12.5-32.8 0-45.3s32.8-12.5 45.3 0L160 338.7 393.4 105.4c12.5-12.5 32.8-12.5 45.3 0z"/></svg>
+            </div>
+            <div class="themes__container--item">
+                <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><path d="M438.6 105.4c12.5 12.5 12.5 32.8 0 45.3l-256 256c-12.5 12.5-32.8 12.5-45.3 0l-128-128c-12.5-12.5-12.5-32.8 0-45.3s32.8-12.5 45.3 0L160 338.7 393.4 105.4c12.5-12.5 32.8-12.5 45.3 0z"/></svg>
+            </div>
+            <div class="themes__container--item">
+                <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><path d="M438.6 105.4c12.5 12.5 12.5 32.8 0 45.3l-256 256c-12.5 12.5-32.8 12.5-45.3 0l-128-128c-12.5-12.5-12.5-32.8 0-45.3s32.8-12.5 45.3 0L160 338.7 393.4 105.4c12.5-12.5 32.8-12.5 45.3 0z"/></svg>
+            </div>
+            <div class="themes__container--item">
+                <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><path d="M438.6 105.4c12.5 12.5 12.5 32.8 0 45.3l-256 256c-12.5 12.5-32.8 12.5-45.3 0l-128-128c-12.5-12.5-12.5-32.8 0-45.3s32.8-12.5 45.3 0L160 338.7 393.4 105.4c12.5-12.5 32.8-12.5 45.3 0z"/></svg>
+            </div>
+            <div class="themes__container--item">
+                <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><path d="M438.6 105.4c12.5 12.5 12.5 32.8 0 45.3l-256 256c-12.5 12.5-32.8 12.5-45.3 0l-128-128c-12.5-12.5-12.5-32.8 0-45.3s32.8-12.5 45.3 0L160 338.7 393.4 105.4c12.5-12.5 32.8-12.5 45.3 0z"/></svg>
+            </div>
+            <div class="themes__container--item">
+                <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><path d="M438.6 105.4c12.5 12.5 12.5 32.8 0 45.3l-256 256c-12.5 12.5-32.8 12.5-45.3 0l-128-128c-12.5-12.5-12.5-32.8 0-45.3s32.8-12.5 45.3 0L160 338.7 393.4 105.4c12.5-12.5 32.8-12.5 45.3 0z"/></svg>
+            </div>
+            <div class="themes__container--item">
+                <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><path d="M438.6 105.4c12.5 12.5 12.5 32.8 0 45.3l-256 256c-12.5 12.5-32.8 12.5-45.3 0l-128-128c-12.5-12.5-12.5-32.8 0-45.3s32.8-12.5 45.3 0L160 338.7 393.4 105.4c12.5-12.5 32.8-12.5 45.3 0z"/></svg>
+            </div>
+            <div class="themes__container--item">
+                <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><path d="M438.6 105.4c12.5 12.5 12.5 32.8 0 45.3l-256 256c-12.5 12.5-32.8 12.5-45.3 0l-128-128c-12.5-12.5-12.5-32.8 0-45.3s32.8-12.5 45.3 0L160 338.7 393.4 105.4c12.5-12.5 32.8-12.5 45.3 0z"/></svg>
+            </div>
+            <div class="themes__container--item">
+                <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><!--!Font Awesome Free 6.6.0 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2024 Fonticons, Inc.--><path d="M438.6 105.4c12.5 12.5 12.5 32.8 0 45.3l-256 256c-12.5 12.5-32.8 12.5-45.3 0l-128-128c-12.5-12.5-12.5-32.8 0-45.3s32.8-12.5 45.3 0L160 338.7 393.4 105.4c12.5-12.5 32.8-12.5 45.3 0z"/></svg>
+            </div>
         </div>
     </section>
+    <section class="languages">
+        <div class="section">
+            <h2 class="section__title" i18n-data="options_languages">Languages</h2>
+            <div class="section__separator"></div>
+        </div>
+    </section>
+    <div class="languages__container">
+        <div lang-data="en" class="languages__container--item">
+            <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><path d="M438.6 105.4c12.5 12.5 12.5 32.8 0 45.3l-256 256c-12.5 12.5-32.8 12.5-45.3 0l-128-128c-12.5-12.5-12.5-32.8 0-45.3s32.8-12.5 45.3 0L160 338.7 393.4 105.4c12.5-12.5 32.8-12.5 45.3 0z"/></svg>
+            <img src="/images/flags/en.png">
+        </div>
+        <div lang-data="fr" class="languages__container--item">
+            <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><path d="M438.6 105.4c12.5 12.5 12.5 32.8 0 45.3l-256 256c-12.5 12.5-32.8 12.5-45.3 0l-128-128c-12.5-12.5-12.5-32.8 0-45.3s32.8-12.5 45.3 0L160 338.7 393.4 105.4c12.5-12.5 32.8-12.5 45.3 0z"/></svg>
+            <img src="/images/flags/fr.png">
+        </div>
+    </div>
+
 
     <script src="../scripts/options.js"></script>
+    <script src="../scripts/translation.js"></script>
 </body>
 </html>
\ No newline at end of file
diff --git a/pages/popup.html b/pages/popup.html
index 1c39e36..451bba5 100644
--- a/pages/popup.html
+++ b/pages/popup.html
@@ -45,7 +45,7 @@ <h1 class="head__left-name gradient__text">ShortRemover</h1>
                     <div class="slider-thumb"></div>
                 </span>
             </label>
-            <span class="param-name">Navbar button undeployed</span>
+            <span class="param-name" i18n-data="param_NavbarButtonUndeployed">Navbar button undeployed</span>
         </div>
 
         <div class="param">
@@ -55,7 +55,7 @@ <h1 class="head__left-name gradient__text">ShortRemover</h1>
                     <div class="slider-thumb"></div>
                 </span>
             </label>
-            <span class="param-name">Navbar button deployed</span>
+            <span class="param-name" i18n-data="param_NavbarButtonDeployed" >Navbar button deployed</span>
         </div>
 
         <div class="param">
@@ -65,7 +65,7 @@ <h1 class="head__left-name gradient__text">ShortRemover</h1>
                     <div class="slider-thumb"></div>
                 </span>
             </label>
-            <span class="param-name">Channel short tab</span>
+            <span class="param-name" i18n-data="param_ChannelTab">Channel short tab</span>
         </div>
 
         <div class="param">
@@ -75,7 +75,7 @@ <h1 class="head__left-name gradient__text">ShortRemover</h1>
                     <div class="slider-thumb"></div>
                 </span>
             </label>
-            <span class="param-name">Home page recommended Short</span>
+            <span class="param-name" i18n-data="param_HomePageRecommendedShort">Home page recommended Short</span>
         </div>
 
         <div class="param">
@@ -85,7 +85,7 @@ <h1 class="head__left-name gradient__text">ShortRemover</h1>
                     <div class="slider-thumb"></div>
                 </span>
             </label>
-            <span class="param-name">Short in search result</span>
+            <span class="param-name" i18n-data="param_ShortInSearchResult">Short in search result</span>
         </div>
 
         <div class="param">
@@ -95,7 +95,7 @@ <h1 class="head__left-name gradient__text">ShortRemover</h1>
                     <div class="slider-thumb"></div>
                 </span>
             </label>
-            <span class="param-name">Video Player recommended Short</span>
+            <span class="param-name" i18n-data="param_VideoPlayerRecommendedShort">Video Player recommended Short</span>
         </div>
 
         <div class="param">
@@ -105,9 +105,8 @@ <h1 class="head__left-name gradient__text">ShortRemover</h1>
                     <div class="slider-thumb"></div>
                 </span>
             </label>
-            <span class="param-name">Subscription short</span>
+            <span class="param-name" i18n-data="param_SubscriptionShort">Subscription short</span>
         </div>
-    </div>
 
     <footer>
         <div class="footer">
@@ -116,12 +115,12 @@ <h1 class="head__left-name gradient__text">ShortRemover</h1>
                     <a title="Chrome Extention" class="footer-container__left--button">
                         <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M0 256C0 209.4 12.5 165.6 34.3 127.1L144.1 318.3C166 357.5 207.9 384 256 384C270.3 384 283.1 381.7 296.8 377.4L220.5 509.6C95.9 492.3 0 385.3 0 256zM365.1 321.6C377.4 302.4 384 279.1 384 256C384 217.8 367.2 183.5 340.7 160H493.4C505.4 189.6 512 222.1 512 256C512 397.4 397.4 511.1 256 512L365.1 321.6zM477.8 128H256C193.1 128 142.3 172.1 130.5 230.7L54.2 98.5C101 38.5 174 0 256 0C350.8 0 433.5 51.5 477.8 128V128zM168 256C168 207.4 207.4 168 256 168C304.6 168 344 207.4 344 256C344 304.6 304.6 344 256 344C207.4 344 168 304.6 168 256z"/></svg>
                     </a>
-                    <a title="Github" href="" target="_blank" class="footer-container__left--button">
+                    <a title="Github" href="https://github.com/Wizi8914/ShortRemover" target="_blank" class="footer-container__left--button">
                         <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 496 512"><path d="M165.9 397.4c0 2-2.3 3.6-5.2 3.6-3.3 .3-5.6-1.3-5.6-3.6 0-2 2.3-3.6 5.2-3.6 3-.3 5.6 1.3 5.6 3.6zm-31.1-4.5c-.7 2 1.3 4.3 4.3 4.9 2.6 1 5.6 0 6.2-2s-1.3-4.3-4.3-5.2c-2.6-.7-5.5 .3-6.2 2.3zm44.2-1.7c-2.9 .7-4.9 2.6-4.6 4.9 .3 2 2.9 3.3 5.9 2.6 2.9-.7 4.9-2.6 4.6-4.6-.3-1.9-3-3.2-5.9-2.9zM244.8 8C106.1 8 0 113.3 0 252c0 110.9 69.8 205.8 169.5 239.2 12.8 2.3 17.3-5.6 17.3-12.1 0-6.2-.3-40.4-.3-61.4 0 0-70 15-84.7-29.8 0 0-11.4-29.1-27.8-36.6 0 0-22.9-15.7 1.6-15.4 0 0 24.9 2 38.6 25.8 21.9 38.6 58.6 27.5 72.9 20.9 2.3-16 8.8-27.1 16-33.7-55.9-6.2-112.3-14.3-112.3-110.5 0-27.5 7.6-41.3 23.6-58.9-2.6-6.5-11.1-33.3 2.6-67.9 20.9-6.5 69 27 69 27 20-5.6 41.5-8.5 62.8-8.5s42.8 2.9 62.8 8.5c0 0 48.1-33.6 69-27 13.7 34.7 5.2 61.4 2.6 67.9 16 17.7 25.8 31.5 25.8 58.9 0 96.5-58.9 104.2-114.8 110.5 9.2 7.9 17 22.9 17 46.4 0 33.7-.3 75.4-.3 83.6 0 6.5 4.6 14.4 17.3 12.1C428.2 457.8 496 362.9 496 252 496 113.3 383.5 8 244.8 8zM97.2 352.9c-1.3 1-1 3.3 .7 5.2 1.6 1.6 3.9 2.3 5.2 1 1.3-1 1-3.3-.7-5.2-1.6-1.6-3.9-2.3-5.2-1zm-10.8-8.1c-.7 1.3 .3 2.9 2.3 3.9 1.6 1 3.6 .7 4.3-.7 .7-1.3-.3-2.9-2.3-3.9-2-.6-3.6-.3-4.3 .7zm32.4 35.6c-1.6 1.3-1 4.3 1.3 6.2 2.3 2.3 5.2 2.6 6.5 1 1.3-1.3 .7-4.3-1.3-6.2-2.2-2.3-5.2-2.6-6.5-1zm-11.4-14.7c-1.6 1-1.6 3.6 0 5.9 1.6 2.3 4.3 3.3 5.6 2.3 1.6-1.3 1.6-3.9 0-6.2-1.4-2.3-4-3.3-5.6-2z"/></svg>
                     </a>
                 </div>
                 <div class="footer-container__right">
-                    <a title="Parameters" href="options.html" target="_blank" class="footer-container__right--button">
+                    <a title="settings" href="options.html" target="_blank" class="footer-container__right--button">
                         <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M495.9 166.6c3.2 8.7 .5 18.4-6.4 24.6l-43.3 39.4c1.1 8.3 1.7 16.8 1.7 25.4s-.6 17.1-1.7 25.4l43.3 39.4c6.9 6.2 9.6 15.9 6.4 24.6c-4.4 11.9-9.7 23.3-15.8 34.3l-4.7 8.1c-6.6 11-14 21.4-22.1 31.2c-5.9 7.2-15.7 9.6-24.5 6.8l-55.7-17.7c-13.4 10.3-28.2 18.9-44 25.4l-12.5 57.1c-2 9.1-9 16.3-18.2 17.8c-13.8 2.3-28 3.5-42.5 3.5s-28.7-1.2-42.5-3.5c-9.2-1.5-16.2-8.7-18.2-17.8l-12.5-57.1c-15.8-6.5-30.6-15.1-44-25.4L83.1 425.9c-8.8 2.8-18.6 .3-24.5-6.8c-8.1-9.8-15.5-20.2-22.1-31.2l-4.7-8.1c-6.1-11-11.4-22.4-15.8-34.3c-3.2-8.7-.5-18.4 6.4-24.6l43.3-39.4C64.6 273.1 64 264.6 64 256s.6-17.1 1.7-25.4L22.4 191.2c-6.9-6.2-9.6-15.9-6.4-24.6c4.4-11.9 9.7-23.3 15.8-34.3l4.7-8.1c6.6-11 14-21.4 22.1-31.2c5.9-7.2 15.7-9.6 24.5-6.8l55.7 17.7c13.4-10.3 28.2-18.9 44-25.4l12.5-57.1c2-9.1 9-16.3 18.2-17.8C227.3 1.2 241.5 0 256 0s28.7 1.2 42.5 3.5c9.2 1.5 16.2 8.7 18.2 17.8l12.5 57.1c15.8 6.5 30.6 15.1 44 25.4l55.7-17.7c8.8-2.8 18.6-.3 24.5 6.8c8.1 9.8 15.5 20.2 22.1 31.2l4.7 8.1c6.1 11 11.4 22.4 15.8 34.3zM256 336a80 80 0 1 0 0-160 80 80 0 1 0 0 160z"/></svg>
                     </a>
             </div>
@@ -129,6 +128,7 @@ <h1 class="head__left-name gradient__text">ShortRemover</h1>
     </footer>
 
     <script src="/scripts/popup.js"></script>
+    <script src="/scripts/translation.js"></script>
 </body>
 
 </html>
\ No newline at end of file
diff --git a/scripts/options.js b/scripts/options.js
index 21f6679..0ef136a 100644
--- a/scripts/options.js
+++ b/scripts/options.js
@@ -17,6 +17,7 @@ checkbox.forEach((box, i) => {
 });
 
 
+
 // Theme //
 
 const themes = document.querySelectorAll('.themes__container--item');
@@ -31,12 +32,20 @@ themes.forEach((theme, i) => {
 
         document.body.classList.add(`theme-${i+1}`);
         chrome.storage.local.set({ colorTheme: i+1 });
+        
+        themes.forEach((theme) => {
+            theme.classList.remove('active');
+        });
+
+        theme.classList.add('active');
     });
 });
 
 chrome.storage.local.get('colorTheme', function (result) {
     const colorTheme = result.colorTheme !== undefined ? result.colorTheme : 1;
     document.body.classList.add(`theme-${colorTheme}`);
+    
+    themes[colorTheme-1].classList.add('active');
 });
 
 
@@ -67,4 +76,29 @@ window.addEventListener('load', function() {
             styleTag.parentNode.removeChild(styleTag);
         }
     }, 50);
+});
+
+
+// Language //
+
+const language = document.querySelectorAll('.languages__container--item');
+
+
+language.forEach((lang, i) => {
+    lang.addEventListener('click', () => {
+        language.forEach((lang) => {
+            lang.classList.remove('active');
+        });
+
+        lang.classList.add('active');
+        chrome.storage.local.set({ language: lang.getAttribute('lang-data') });
+
+        changeLanguage(); // This function is defined in translation.js
+    });
+
+    chrome.storage.local.get('language', function (result) {
+        if (lang.getAttribute('lang-data') == result.language) {
+            lang.classList.add('active');
+        }
+    });
 });
\ No newline at end of file
diff --git a/scripts/service-worker.js b/scripts/service-worker.js
index b1c0923..88b3482 100644
--- a/scripts/service-worker.js
+++ b/scripts/service-worker.js
@@ -53,10 +53,6 @@ function setParamState(paramIsActive, paramName) {
   let obj = {};
   obj[paramName] = paramIsActive;
   chrome.storage.local.set(obj);
-
-  chrome.storage.local.get(paramName, function (result) {
-    console.log(result);
-  }); 
 }
 
 function toggleParams(paramName) {
diff --git a/scripts/translation.js b/scripts/translation.js
new file mode 100644
index 0000000..4ee52cd
--- /dev/null
+++ b/scripts/translation.js
@@ -0,0 +1,55 @@
+const availableLanguages = ['en', 'fr'];
+const defaultLanguage = navigator.language.split('-')[0];
+
+document.addEventListener('DOMContentLoaded', () => {
+    changeLanguage();
+});
+
+async function changeLanguage () {
+    const elements = document.querySelectorAll('[i18n-data]');
+    const language = await getLanguage();
+
+    elements.forEach((element) => {
+        let messageKey = element.getAttribute('i18n-data'); 
+
+        setMessage(element, messageKey, language);
+    });
+}
+
+function getLanguage() {
+    return new Promise((resolve, reject) => {
+        chrome.storage.local.get('language', function (result) {
+            let lang;
+            
+                
+            if (availableLanguages.includes(defaultLanguage)) {
+                lang = result.language !== undefined ? result.language : defaultLanguage;
+            } else {
+                lang = result.language !== undefined ? result.language : 'en';
+            }
+
+            chrome.storage.local.set({ language: lang });
+            resolve(lang);
+        });
+    });
+}
+
+function setMessage(element, messageKey, language) {    
+    fetch(`../_locales/${language}/messages.json`)
+        .then((response) => response.json())
+        .then((json) => {
+
+            element.textContent = json[messageKey]['message'];
+        })
+        .catch((error) => {
+            console.error('Error:', error);
+        });
+}
+
+async function getMessage(messageKey) {
+    const language = await getLanguage();
+    const response = await fetch(`../_locales/${language}/messages.json`);
+    const json = await response.json();
+
+    return json[messageKey]['message'];
+}
\ No newline at end of file
diff --git a/scss/base.scss b/scss/base.scss
index cd2cf91..6986a95 100644
--- a/scss/base.scss
+++ b/scss/base.scss
@@ -12,6 +12,10 @@
     --slider-background: linear-gradient(114deg, #9b96a1e6 -13.86%, #838383e6 99.55%);
     --slider-thumb: #040c18;
 
+    --scrollbar-thumb: #09213a;
+    --scrollbar-thumb-hover: #0d2c4a;
+    --scrollbar-background: #040c18;
+
     --refresh-background: #868686e6;
     --refresh-hover: #707070e6;
 }
@@ -26,6 +30,11 @@
 
     --slider-thumb: #f5faff;
 
+    --scrollbar-thumb: #e1e2e3;
+    --scrollbar-thumb-hover: #cfcfcf;
+    --scrollbar-background: #efefef;
+
+
     --refresh-background: #868686e6;
     --refresh-hover: #707070e6;
 }
@@ -125,7 +134,6 @@
 }
 
 
-
 * {
     margin: 0;
 	padding: 0;
@@ -141,4 +149,21 @@
     background: var(--gradient-color);
     background-clip: text;
     -webkit-background-clip: text;
-}
\ No newline at end of file
+}
+
+::-webkit-scrollbar {
+    width: 10px;
+    background-color: var(--scrollbar-background);
+}
+
+::-webkit-scrollbar-thumb {
+    background-color: var(--scrollbar-thumb);
+    //border-radius: 15px;
+    transition: 0.35s;
+    cursor: pointer;
+
+    &:hover {
+        opacity: var(--scrollbar-thumb-hover);
+    }
+}
+
diff --git a/scss/options.scss b/scss/options.scss
index c49d497..7dfff23 100644
--- a/scss/options.scss
+++ b/scss/options.scss
@@ -105,15 +105,13 @@ header {
     }
 }
 
-
-
 .themes {
     margin-top: 130px;
 
     &__container {
         display: grid;
         margin: 40px;
-        grid-template-columns: repeat(auto-fill, minmax(200px, 1fr));
+        grid-template-columns: repeat(auto-fill, minmax(170px, 1fr));
         grid-gap: 1.5rem;
 
         &--item {
@@ -132,10 +130,27 @@ header {
               display: block;
               padding-bottom: 100%;
               grid-area: 1 / 1 / 2 / 2;
+
             }
 
             &:hover {
-                filter: brightness(0.6);
+                filter: brightness(.8);
+            }
+
+            svg {
+                position: absolute;
+                z-index: 2;
+                height: 100px;
+                width: 100px;
+                fill: var(--color-text);
+                display: none;
+            }
+
+
+            &.active {
+                svg {
+                    display: block;
+                }
             }
 
             &:nth-child(1) {
@@ -233,6 +248,66 @@ header {
     }
 }
 
+.languages {
+    margin-top: 130px;
+
+    &__container {
+        display: grid;
+        margin: 40px;
+        grid-template-columns: repeat(auto-fill, minmax(170px, 1fr));
+        grid-gap: 1.5rem;
+
+        &--item {
+            padding: 3px;
+            display: grid;
+            place-items: center;
+            border-radius: 15px;
+            border: 3px solid var(--color-text);
+            cursor: pointer;
+            transition-duration: .4s;
+            overflow: hidden;
+
+
+            
+            &::before {
+              content: "";
+              display: block;
+              grid-area: 1 / 1 / 2 / 2;
+
+            }
+
+            &:hover {
+                filter: brightness(.8);
+            }
+            
+
+            img {
+                width: calc(100% + 10px);
+                height: calc(100% + 10px);
+                z-index: -1;
+                -o-object-fit: cover;
+                object-fit: cover;
+            }
+
+            svg {
+                position: absolute;
+                z-index: 2;
+                height: 100px;
+                width: 100px;
+                fill: var(--color-text);
+                display: none;
+            }
+
+
+            &.active {
+                svg {
+                    display: block;
+                }
+            }
+        }
+    }
+}
+
 .switch {
     position: relative;
     display: flex;