diff --git a/src/js/check-theme.js b/src/js/check-theme.js
new file mode 100644
index 0000000..7f59170
--- /dev/null
+++ b/src/js/check-theme.js
@@ -0,0 +1,51 @@
+/* eslint-disable linebreak-style */
+/* eslint-disable no-redeclare */
+/* eslint-disable quotes */
+/* eslint-disable no-var */
+/* eslint-disable indent */
+
+function getStyle(themeInfo) {
+  
+  if (themeInfo.colors.toolbar) 
+  {
+  
+    document.body.style.backgroundColor= themeInfo.colors.toolbar;
+  
+    document.getElementById('current-tab').style.color=themeInfo.colors.tab_background_text;
+   
+  const headers = document.getElementsByTagName('h3');
+  for (var i = 0; i < headers.length; i++) {
+  headers[i].style.color =themeInfo.colors.tab_background_text;
+  } 
+
+  const paras= document.getElementsByTagName('p');
+  for (var i = 0; i < paras.length; i++) {
+    paras[i].style.color =themeInfo.colors.tab_background_text;
+    } 
+   }
+   document.getElementById('sort-containers-link').style.color=themeInfo.colors.tab_background_text;
+
+   var legends1= document.getElementsByTagName('legend');
+  for (var i = 0; i < legends1.length; i++) {
+    legends1[i].style.color =themeInfo.colors.tab_background_text;
+    } 
+    
+    //this part of the code is for changing the popup's rows showing conatinerslist (it doesn't work)
+    
+    // var tabl= document.getElementsByClassName('container-info-list');
+    // for (var i = 0; i < tabl.length; i++) {
+    //   tabl[i].style.backgroundColor =themeInfo.colors.toolbar;
+    //   } 
+    
+    //or
+
+    //document.getElementById('container-info-table').style.color=themeInfo.colors.toolbar;
+
+}
+async function getCurrentThemeInfo() 
+{
+  var themeInfo = await browser.theme.getCurrent();
+  
+  getStyle(themeInfo);
+}
+getCurrentThemeInfo();
diff --git a/src/manifest.json b/src/manifest.json
index bab033b..239ce16 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -30,7 +30,8 @@
     "storage",
     "tabs",
     "webRequestBlocking",
-    "webRequest"
+    "webRequest",
+    "theme"
   ],
 
   "commands": {
diff --git a/src/popup.html b/src/popup.html
index 4cd8219..af21535 100644
--- a/src/popup.html
+++ b/src/popup.html
@@ -214,5 +214,6 @@
 
   <script src="js/utils.js"></script>
   <script src="js/popup.js"></script>
+  <script src="js/check-theme.js"></script>
 </body>
 </html>