Merge remote-tracking branch 'refs/remotes/Aris-t2/master'

55 files changed, 408 insertions, 166 deletions

diff --git a/xpi/content/css/alt_autocompl_items2.css b/xpi/content/css/alt_autocompl_items2.css
index c82b7f1..55c2633 100644
--- a/xpi/content/css/alt_autocompl_items2.css
+++ b/xpi/content/css/alt_autocompl_items2.css
@@ -34,20 +34,14 @@
 	#PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistbox {
 	  transition: unset !important;
 	}
-	
-	panel[type="autocomplete-richlistbox"] .autocomplete-richlistbox[style="height: 0px;"],
-	#PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistbox[style="height: 0px;"],
-	panel[type="autocomplete-richlistbox"] .autocomplete-richlistbox[style="height: 8px;"],
-	#PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistbox[style="height: 8px;"] {
-	  padding-top: 0 !important;
-	  padding-bottom: 0 !important;
-	  margin-bottom: -1px !important;
-	  min-width: 0 !important;
-      width: 0 !important;
-      max-width: 0 !important;
-      padding-left: 0 !important;
-      padding-right: 0 !important;
-      margin-left: 0 !important;
-      margin-right: 0 !important;
+
+	/* this will remove the tiny popup lines visible after the "search with..." and "visit" items get hidden */
+	panel[type="autocomplete-richlistbox"][ctrsubboxstyle="height: 0px;"],
+	#PopupAutoCompleteRichResult[autocompleteinput="urlbar"][ctrsubboxstyle="height: 0px;"],
+	panel[type="autocomplete-richlistbox"][ctrsubboxstyle="height: 2px;"],
+	#PopupAutoCompleteRichResult[autocompleteinput="urlbar"][ctrsubboxstyle="height: 2px;"],
+	panel[type="autocomplete-richlistbox"][ctrsubboxstyle="height: 8px;"],
+	#PopupAutoCompleteRichResult[autocompleteinput="urlbar"][ctrsubboxstyle="height: 8px;"] {
+      margin-left: -10000000000px !important;
 	}
 }
\ No newline at end of file
diff --git a/xpi/content/css/alt_autocompl_rhl.css b/xpi/content/css/alt_autocompl_rhl.css
index ff53f81..552d4fe 100644
--- a/xpi/content/css/alt_autocompl_rhl.css
+++ b/xpi/content/css/alt_autocompl_rhl.css
@@ -56,5 +56,10 @@
 	  border-top: 1px solid transparent !important;
 	  border-bottom: 1px solid transparent !important;
 	}
+	
+	panel[type="autocomplete-richlistbox"] .autocomplete-richlistbox,
+	#PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistbox {
+	  padding: 1px !important;
+	}
 
 }
\ No newline at end of file
diff --git a/xpi/content/css/alt_autocomplete.css b/xpi/content/css/alt_autocomplete.css
index eb0fd0d..3512852 100644
--- a/xpi/content/css/alt_autocomplete.css
+++ b/xpi/content/css/alt_autocomplete.css
@@ -22,11 +22,11 @@
 	#main-window[fx51plus="true"] #PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistitem {
 	  -moz-binding: url("chrome://classic_theme_restorer/content/urlbarBindings51.xml#autocomplete-richlistitem") !important;
 	}
-	
+
 	panel[type="autocomplete-richlistbox"] .autocomplete-richlistitem,
 	#PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistitem {
 	  -moz-box-orient: vertical !important;
-	  overflow: -moz-hidden-unscrollable !important;
+	  /*overflow: -moz-hidden-unscrollable !important;*/
 	  min-height: unset !important;
 	  height: unset !important;
 	  max-height: unset !important;
@@ -39,7 +39,7 @@
 	  display:none !important;
 	  visibility: collapse !important;
 	}
-	
+
 	panel[type="autocomplete-richlistbox"] .autocomplete-richlistitem :-moz-any(.ac-site-icon,.ac-title,.ac-action,.ac-url),
 	#PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistitem :-moz-any(.ac-site-icon,.ac-title,.ac-action,.ac-url){
 	  -moz-margin-start: unset !important;
@@ -71,7 +71,7 @@
 	#PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistitem .ac-url{
 	  -moz-margin-start: 21px !important;
 	}
-	
+
 	panel[type="autocomplete-richlistbox"] .autocomplete-richlistitem .ac-action[actiontype=searchengine]:not([selected]),
 	#PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistitem .ac-action[actiontype=searchengine]:not([selected]) {
 	  display: block !important;
diff --git a/xpi/content/css/autocompl_no_title1.css b/xpi/content/css/autocompl_no_title1.css
new file mode 100644
index 0000000..4d85250
--- /dev/null
+++ b/xpi/content/css/autocompl_no_title1.css
@@ -0,0 +1,12 @@
+@namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
+
+@-moz-document url(chrome://browser/content/browser.xul) {
+
+	panel[type="autocomplete-richlistbox"] .autocomplete-richlistitem:not([collapse="true"]) .ac-title,
+	#PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistitem:not([collapse="true"]) .ac-title,
+	panel[type="autocomplete-richlistbox"] .autocomplete-richlistitem:not([collapse="true"]) .ac-separator,
+	#PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistitem:not([collapse="true"]) .ac-separator {
+	  display: none !important;
+	}
+
+}
\ No newline at end of file
diff --git a/xpi/content/css/autocompl_no_title2.css b/xpi/content/css/autocompl_no_title2.css
new file mode 100644
index 0000000..b4cc5c0
--- /dev/null
+++ b/xpi/content/css/autocompl_no_title2.css
@@ -0,0 +1,53 @@
+@namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
+
+@-moz-document url(chrome://browser/content/browser.xul) {
+
+	panel[type="autocomplete-richlistbox"],
+	#PopupAutoCompleteRichResult[autocompleteinput="urlbar"] {
+	  -moz-binding: url("chrome://classic_theme_restorer/content/urlbarBindings.xml#urlbar-rich-result-popup") !important;
+	}
+
+	#main-window[fx51plus="true"] panel[type="autocomplete-richlistbox"],
+	#main-window[fx51plus="true"] #PopupAutoCompleteRichResult[autocompleteinput="urlbar"] {
+	  -moz-binding: url("chrome://classic_theme_restorer/content/urlbarBindings51.xml#urlbar-rich-result-popup") !important;
+	}
+
+	panel[type="autocomplete-richlistbox"] .autocomplete-richlistitem:not([collapse="true"]) .ac-title,
+	#PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistitem:not([collapse="true"]) .ac-title,
+	panel[type="autocomplete-richlistbox"] .autocomplete-richlistitem:not([collapse="true"]) .ac-separator,
+	#PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistitem:not([collapse="true"]) .ac-separator {
+	  display: none !important;
+	}
+
+	panel[type="autocomplete-richlistbox"] .ac-type-icon,
+	  #PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .ac-type-icon {
+	  -moz-box-ordinal-group: 1000000 !important;
+	}
+
+	panel[type="autocomplete-richlistbox"] .autocomplete-richlistitem .ac-action,
+	panel[type="autocomplete-richlistbox"] .autocomplete-richlistitem .ac-url,
+	#PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistitem .ac-action,
+	#PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistitem .ac-url{
+	  -moz-margin-start: -6px !important;
+	  margin-top:-3px !important;
+	}
+	
+	panel[type="autocomplete-richlistbox"] .autocomplete-richlistitem .ac-action[actiontype=searchengine]:not([selected]),
+	#PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistitem .ac-action[actiontype=searchengine]:not([selected]) {
+	  display: block !important;
+	}
+	
+	panel[type="autocomplete-richlistbox"] .search-one-offs,
+	#PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .search-one-offs {
+	  visibility: collapse !important;
+	  display: none !important;
+	}
+	
+	@media all and (-moz-windows-classic) {
+	  panel[type="autocomplete-richlistbox"] .autocomplete-richlistbox,
+	  #PopupAutoCompleteRichResult[autocompleteinput="urlbar"] .autocomplete-richlistbox {
+		padding: 0 !important;
+	  }
+	}
+
+}
\ No newline at end of file
diff --git a/xpi/content/css/linux/bmbut_pmenu_extra.css b/xpi/content/css/linux/bmbut_pmenu_extra.css
index 3e95778..dfe5553 100644
--- a/xpi/content/css/linux/bmbut_pmenu_extra.css
+++ b/xpi/content/css/linux/bmbut_pmenu_extra.css
@@ -9,4 +9,16 @@
 	#ctraddon_BMB_bookmarksPopup *:not([disabled]) label{ 
 	  color: black !important;
 	}
+	
+	#main-window[fx51plus="true"] #ctraddon_BMB_bookmarksPopup menupopup[placespopup=true] > hbox,
+	#main-window[fx51plus="true"] #ctraddon_BMB_bookmarksPopup #ctraddon_BMB_subscribeToPageSubmenuMenupopup {
+	  border: 1px solid var(--panel-arrowcontent-border-color) !important;
+	}
+	
+	#main-window[fx52plus="true"] #ctraddon_BMB_bookmarksPopup menupopup[placespopup=true] > hbox,
+	#main-window[fx52plus="true"] #ctraddon_BMB_bookmarksPopup #ctraddon_BMB_subscribeToPageSubmenuMenupopup {
+	  background: var(--arrowpanel-background) !important;
+	  border: 1px solid var(--arrowpanel-border-color) !important;
+	}
+	
 }
\ No newline at end of file
diff --git a/xpi/content/css/linux/empty_favicon_g0.css b/xpi/content/css/linux/empty_favicon_g0.css
index aefe474..33abda9 100644
--- a/xpi/content/css/linux/empty_favicon_g0.css
+++ b/xpi/content/css/linux/empty_favicon_g0.css
@@ -16,8 +16,8 @@
 	-moz-image-region: rect(0px, 16px, 16px, 0px) !important;
   }
   
-  #main-window[fx48plus="true"] #PopupAutoCompleteRichResult .ac-site-icon:not([src]),
-  #main-window[fx48plus="true"] #PopupAutoCompleteRichResult .ac-site-icon[src=""],
+  #main-window[fx48plus="true"] #PopupAutoCompleteRichResult .ac-site-icon:not([src]):not([type="searchengine"]),
+  #main-window[fx48plus="true"] #PopupAutoCompleteRichResult .ac-site-icon[src=""]:not([type="searchengine"]),
   #PopupAutoCompleteRichResult .ac-site-icon[src^="chrome://mozapps/skin/places/defaultFavicon.png"] {
 	width: 0 !important;
 	-moz-padding-end: 16px !important;
diff --git a/xpi/content/css/linux/empty_favicon_g1.css b/xpi/content/css/linux/empty_favicon_g1.css
index 9a11198..d6ea15d 100644
--- a/xpi/content/css/linux/empty_favicon_g1.css
+++ b/xpi/content/css/linux/empty_favicon_g1.css
@@ -16,8 +16,8 @@
 	-moz-image-region: rect(0px, 16px, 16px, 0px) !important;
   }
   
-  #main-window[fx48plus="true"] #PopupAutoCompleteRichResult .ac-site-icon:not([src]),
-  #main-window[fx48plus="true"] #PopupAutoCompleteRichResult .ac-site-icon[src=""],
+  #main-window[fx48plus="true"] #PopupAutoCompleteRichResult .ac-site-icon:not([src]):not([type="searchengine"]),
+  #main-window[fx48plus="true"] #PopupAutoCompleteRichResult .ac-site-icon[src=""]:not([type="searchengine"]),
   #PopupAutoCompleteRichResult .ac-site-icon[src^="chrome://mozapps/skin/places/defaultFavicon.png"] {
 	width: 0 !important;
 	-moz-padding-end: 16px !important;
diff --git a/xpi/content/css/linux/empty_favicon_g1v2.css b/xpi/content/css/linux/empty_favicon_g1v2.css
index 4820c7f..b8557ab 100644
--- a/xpi/content/css/linux/empty_favicon_g1v2.css
+++ b/xpi/content/css/linux/empty_favicon_g1v2.css
@@ -16,8 +16,8 @@
 	-moz-image-region: rect(0px, 16px, 16px, 0px) !important;
   }
   
-  #main-window[fx48plus="true"] #PopupAutoCompleteRichResult .ac-site-icon:not([src]),
-  #main-window[fx48plus="true"] #PopupAutoCompleteRichResult .ac-site-icon[src=""],
+  #main-window[fx48plus="true"] #PopupAutoCompleteRichResult .ac-site-icon:not([src]):not([type="searchengine"]),
+  #main-window[fx48plus="true"] #PopupAutoCompleteRichResult .ac-site-icon[src=""]:not([type="searchengine"]),
   #PopupAutoCompleteRichResult .ac-site-icon[src^="chrome://mozapps/skin/places/defaultFavicon.png"] {
 	width: 0 !important;
 	-moz-padding-end: 16px !important;
diff --git a/xpi/content/css/linux/empty_favicon_g2.css b/xpi/content/css/linux/empty_favicon_g2.css
index e96fb4c..5e5f74c 100644
--- a/xpi/content/css/linux/empty_favicon_g2.css
+++ b/xpi/content/css/linux/empty_favicon_g2.css
@@ -16,8 +16,8 @@
 	-moz-image-region: rect(0px, 16px, 16px, 0px) !important;
   }
   
-  #main-window[fx48plus="true"] #PopupAutoCompleteRichResult .ac-site-icon:not([src]),
-  #main-window[fx48plus="true"] #PopupAutoCompleteRichResult .ac-site-icon[src=""],
+  #main-window[fx48plus="true"] #PopupAutoCompleteRichResult .ac-site-icon:not([src]):not([type="searchengine"]),
+  #main-window[fx48plus="true"] #PopupAutoCompleteRichResult .ac-site-icon[src=""]:not([type="searchengine"]),
   #PopupAutoCompleteRichResult .ac-site-icon[src^="chrome://mozapps/skin/places/defaultFavicon.png"] {
 	width: 0 !important;
 	-moz-padding-end: 16px !important;
diff --git a/xpi/content/css/mac/empty_favicon_g0.css b/xpi/content/css/mac/empty_favicon_g0.css
index 6d6cbd1..c578224 100644
--- a/xpi/content/css/mac/empty_favicon_g0.css
+++ b/xpi/content/css/mac/empty_favicon_g0.css
@@ -16,8 +16,8 @@
 	-moz-image-region: rect(0px, 16px, 16px, 0px) !important;
   }
   
-  #main-window[fx48plus="true"] #PopupAutoCompleteRichResult .ac-site-icon:not([src]),
-  #main-window[fx48plus="true"] #PopupAutoCompleteRichResult .ac-site-icon[src=""],
+  #main-window[fx48plus="true"] #PopupAutoCompleteRichResult .ac-site-icon:not([src]):not([type="searchengine"]),
+  #main-window[fx48plus="true"] #PopupAutoCompleteRichResult .ac-site-icon[src=""]:not([type="searchengine"]),
   #PopupAutoCompleteRichResult .ac-site-icon[src^="chrome://mozapps/skin/places/defaultFavicon.png"] {
 	width: 0 !important;
 	-moz-padding-end: 16px !important;
diff --git a/xpi/content/css/mac/empty_favicon_g1.css b/xpi/content/css/mac/empty_favicon_g1.css
index 4874504..03c386e 100644
--- a/xpi/content/css/mac/empty_favicon_g1.css
+++ b/xpi/content/css/mac/empty_favicon_g1.css
@@ -16,8 +16,8 @@
 	-moz-image-region: rect(0px, 16px, 16px, 0px) !important;
   }
   
-  #main-window[fx48plus="true"] #PopupAutoCompleteRichResult .ac-site-icon:not([src]),
-  #main-window[fx48plus="true"] #PopupAutoCompleteRichResult .ac-site-icon[src=""],
+  #main-window[fx48plus="true"] #PopupAutoCompleteRichResult .ac-site-icon:not([src]):not([type="searchengine"]),
+  #main-window[fx48plus="true"] #PopupAutoCompleteRichResult .ac-site-icon[src=""]:not([type="searchengine"]),
   #PopupAutoCompleteRichResult .ac-site-icon[src^="chrome://mozapps/skin/places/defaultFavicon.png"] {
 	width: 0 !important;
 	-moz-padding-end: 16px !important;
diff --git a/xpi/content/css/mac/empty_favicon_g1v2.css b/xpi/content/css/mac/empty_favicon_g1v2.css
index 3fa51fd..22b5d3f 100644
--- a/xpi/content/css/mac/empty_favicon_g1v2.css
+++ b/xpi/content/css/mac/empty_favicon_g1v2.css
@@ -16,8 +16,8 @@
 	-moz-image-region: rect(0px, 16px, 16px, 0px) !important;
   }
   
-  #main-window[fx48plus="true"] #PopupAutoCompleteRichResult .ac-site-icon:not([src]),
-  #main-window[fx48plus="true"] #PopupAutoCompleteRichResult .ac-site-icon[src=""],
+  #main-window[fx48plus="true"] #PopupAutoCompleteRichResult .ac-site-icon:not([src]):not([type="searchengine"]),
+  #main-window[fx48plus="true"] #PopupAutoCompleteRichResult .ac-site-icon[src=""]:not([type="searchengine"]),
   #PopupAutoCompleteRichResult .ac-site-icon[src^="chrome://mozapps/skin/places/defaultFavicon.png"] {
 	width: 0 !important;
 	-moz-padding-end: 16px !important;
diff --git a/xpi/content/css/mac/empty_favicon_g2.css b/xpi/content/css/mac/empty_favicon_g2.css
index 00630b4..f8054cf 100644
--- a/xpi/content/css/mac/empty_favicon_g2.css
+++ b/xpi/content/css/mac/empty_favicon_g2.css
@@ -16,8 +16,8 @@
 	-moz-image-region: rect(0px, 16px, 16px, 0px) !important;
   }
   
-  #main-window[fx48plus="true"] #PopupAutoCompleteRichResult .ac-site-icon:not([src]),
-  #main-window[fx48plus="true"] #PopupAutoCompleteRichResult .ac-site-icon[src=""],
+  #main-window[fx48plus="true"] #PopupAutoCompleteRichResult .ac-site-icon:not([src]):not([type="searchengine"]),
+  #main-window[fx48plus="true"] #PopupAutoCompleteRichResult .ac-site-icon[src=""]:not([type="searchengine"]),
   #PopupAutoCompleteRichResult .ac-site-icon[src^="chrome://mozapps/skin/places/defaultFavicon.png"] {
 	width: 0 !important;
 	-moz-padding-end: 16px !important;
diff --git a/xpi/content/css/win8/bmbut_pmenu_extra.css b/xpi/content/css/win8/bmbut_pmenu_extra.css
index a2f273b..a170b26 100644
--- a/xpi/content/css/win8/bmbut_pmenu_extra.css
+++ b/xpi/content/css/win8/bmbut_pmenu_extra.css
@@ -7,8 +7,15 @@
 	  background: var(--panel-arrowcontent-background) !important;
 	  border: var(--panel-arrowcontent-border) !important;
 	}
+
 	#main-window[fx51plus="true"] #ctraddon_BMB_bookmarksPopup menupopup[placespopup=true] > hbox,
 	#main-window[fx51plus="true"] #ctraddon_BMB_bookmarksPopup #ctraddon_BMB_subscribeToPageSubmenuMenupopup {
 	  border: 1px solid var(--panel-arrowcontent-border-color) !important;
 	}
+	
+	#main-window[fx52plus="true"] #ctraddon_BMB_bookmarksPopup menupopup[placespopup=true] > hbox,
+	#main-window[fx52plus="true"] #ctraddon_BMB_bookmarksPopup #ctraddon_BMB_subscribeToPageSubmenuMenupopup {
+	  background: var(--arrowpanel-background) !important;
+	  border: 1px solid var(--arrowpanel-border-color) !important;
+	}
 }
\ No newline at end of file
diff --git a/xpi/content/css/win8/empty_favicon_g0.css b/xpi/content/css/win8/empty_favicon_g0.css
index 8470ba4..1f4bff7 100644
--- a/xpi/content/css/win8/empty_favicon_g0.css
+++ b/xpi/content/css/win8/empty_favicon_g0.css
@@ -16,8 +16,8 @@
 	-moz-image-region: rect(0px, 16px, 16px, 0px) !important;
   }
   
-  #main-window[fx48plus="true"] #PopupAutoCompleteRichResult .ac-site-icon:not([src]),
-  #main-window[fx48plus="true"] #PopupAutoCompleteRichResult .ac-site-icon[src=""],
+  #main-window[fx48plus="true"] #PopupAutoCompleteRichResult .ac-site-icon:not([src]):not([type="searchengine"]),
+  #main-window[fx48plus="true"] #PopupAutoCompleteRichResult .ac-site-icon[src=""]:not([type="searchengine"]),
   #PopupAutoCompleteRichResult .ac-site-icon[src^="chrome://mozapps/skin/places/defaultFavicon.png"] {
 	width: 0 !important;
 	-moz-padding-end: 16px !important;
diff --git a/xpi/content/css/win8/empty_favicon_g1.css b/xpi/content/css/win8/empty_favicon_g1.css
index ed1aa89..ce3b6b1 100644
--- a/xpi/content/css/win8/empty_favicon_g1.css
+++ b/xpi/content/css/win8/empty_favicon_g1.css
@@ -16,8 +16,8 @@
 	-moz-image-region: rect(0px, 16px, 16px, 0px) !important;
   }
   
-  #main-window[fx48plus="true"] #PopupAutoCompleteRichResult .ac-site-icon:not([src]),
-  #main-window[fx48plus="true"] #PopupAutoCompleteRichResult .ac-site-icon[src=""],
+  #main-window[fx48plus="true"] #PopupAutoCompleteRichResult .ac-site-icon:not([src]):not([type="searchengine"]),
+  #main-window[fx48plus="true"] #PopupAutoCompleteRichResult .ac-site-icon[src=""]:not([type="searchengine"]),
   #PopupAutoCompleteRichResult .ac-site-icon[src^="chrome://mozapps/skin/places/defaultFavicon.png"] {
 	width: 0 !important;
 	-moz-padding-end: 16px !important;
diff --git a/xpi/content/css/win8/empty_favicon_g1v2.css b/xpi/content/css/win8/empty_favicon_g1v2.css
index 01e3b1e..8d3678b 100644
--- a/xpi/content/css/win8/empty_favicon_g1v2.css
+++ b/xpi/content/css/win8/empty_favicon_g1v2.css
@@ -16,8 +16,8 @@
 	-moz-image-region: rect(0px, 16px, 16px, 0px) !important;
   }
   
-  #main-window[fx48plus="true"] #PopupAutoCompleteRichResult .ac-site-icon:not([src]),
-  #main-window[fx48plus="true"] #PopupAutoCompleteRichResult .ac-site-icon[src=""],
+  #main-window[fx48plus="true"] #PopupAutoCompleteRichResult .ac-site-icon:not([src]):not([type="searchengine"]),
+  #main-window[fx48plus="true"] #PopupAutoCompleteRichResult .ac-site-icon[src=""]:not([type="searchengine"]),
   #PopupAutoCompleteRichResult .ac-site-icon[src^="chrome://mozapps/skin/places/defaultFavicon.png"] {
 	width: 0 !important;
 	-moz-padding-end: 16px !important;
diff --git a/xpi/content/css/win8/empty_favicon_g2.css b/xpi/content/css/win8/empty_favicon_g2.css
index c1070ff..a1ca717 100644
--- a/xpi/content/css/win8/empty_favicon_g2.css
+++ b/xpi/content/css/win8/empty_favicon_g2.css
@@ -16,8 +16,8 @@
 	-moz-image-region: rect(0px, 16px, 16px, 0px) !important;
   }
   
-  #main-window[fx48plus="true"] #PopupAutoCompleteRichResult .ac-site-icon:not([src]),
-  #main-window[fx48plus="true"] #PopupAutoCompleteRichResult .ac-site-icon[src=""],
+  #main-window[fx48plus="true"] #PopupAutoCompleteRichResult .ac-site-icon:not([src]):not([type="searchengine"]),
+  #main-window[fx48plus="true"] #PopupAutoCompleteRichResult .ac-site-icon[src=""]:not([type="searchengine"]),
   #PopupAutoCompleteRichResult .ac-site-icon[src^="chrome://mozapps/skin/places/defaultFavicon.png"] {
 	width: 0 !important;
 	-moz-padding-end: 16px !important;
diff --git a/xpi/content/css/winaero/bmbut_pmenu_extra.css b/xpi/content/css/winaero/bmbut_pmenu_extra.css
index 3ad347d..a170b26 100644
--- a/xpi/content/css/winaero/bmbut_pmenu_extra.css
+++ b/xpi/content/css/winaero/bmbut_pmenu_extra.css
@@ -12,5 +12,10 @@
 	#main-window[fx51plus="true"] #ctraddon_BMB_bookmarksPopup #ctraddon_BMB_subscribeToPageSubmenuMenupopup {
 	  border: 1px solid var(--panel-arrowcontent-border-color) !important;
 	}
-
+	
+	#main-window[fx52plus="true"] #ctraddon_BMB_bookmarksPopup menupopup[placespopup=true] > hbox,
+	#main-window[fx52plus="true"] #ctraddon_BMB_bookmarksPopup #ctraddon_BMB_subscribeToPageSubmenuMenupopup {
+	  background: var(--arrowpanel-background) !important;
+	  border: 1px solid var(--arrowpanel-border-color) !important;
+	}
 }
\ No newline at end of file
diff --git a/xpi/content/css/winaero/empty_favicon_g0.css b/xpi/content/css/winaero/empty_favicon_g0.css
index 487aa83..23c4706 100644
--- a/xpi/content/css/winaero/empty_favicon_g0.css
+++ b/xpi/content/css/winaero/empty_favicon_g0.css
@@ -16,8 +16,8 @@
 	-moz-image-region: rect(0px, 16px, 16px, 0px) !important;
   }
 
-  #main-window[fx48plus="true"] #PopupAutoCompleteRichResult .ac-site-icon:not([src]),
-  #main-window[fx48plus="true"] #PopupAutoCompleteRichResult .ac-site-icon[src=""],
+  #main-window[fx48plus="true"] #PopupAutoCompleteRichResult .ac-site-icon:not([src]):not([type="searchengine"]),
+  #main-window[fx48plus="true"] #PopupAutoCompleteRichResult .ac-site-icon[src=""]:not([type="searchengine"]),
   #PopupAutoCompleteRichResult .ac-site-icon[src^="chrome://mozapps/skin/places/defaultFavicon.png"] {
 	width: 0 !important;
 	-moz-padding-end: 16px !important;
diff --git a/xpi/content/css/winaero/empty_favicon_g1.css b/xpi/content/css/winaero/empty_favicon_g1.css
index ed1aa89..ce3b6b1 100644
--- a/xpi/content/css/winaero/empty_favicon_g1.css
+++ b/xpi/content/css/winaero/empty_favicon_g1.css
@@ -16,8 +16,8 @@
 	-moz-image-region: rect(0px, 16px, 16px, 0px) !important;
   }
   
-  #main-window[fx48plus="true"] #PopupAutoCompleteRichResult .ac-site-icon:not([src]),
-  #main-window[fx48plus="true"] #PopupAutoCompleteRichResult .ac-site-icon[src=""],
+  #main-window[fx48plus="true"] #PopupAutoCompleteRichResult .ac-site-icon:not([src]):not([type="searchengine"]),
+  #main-window[fx48plus="true"] #PopupAutoCompleteRichResult .ac-site-icon[src=""]:not([type="searchengine"]),
   #PopupAutoCompleteRichResult .ac-site-icon[src^="chrome://mozapps/skin/places/defaultFavicon.png"] {
 	width: 0 !important;
 	-moz-padding-end: 16px !important;
diff --git a/xpi/content/css/winaero/empty_favicon_g1v2.css b/xpi/content/css/winaero/empty_favicon_g1v2.css
index 01e3b1e..8d3678b 100644
--- a/xpi/content/css/winaero/empty_favicon_g1v2.css
+++ b/xpi/content/css/winaero/empty_favicon_g1v2.css
@@ -16,8 +16,8 @@
 	-moz-image-region: rect(0px, 16px, 16px, 0px) !important;
   }
   
-  #main-window[fx48plus="true"] #PopupAutoCompleteRichResult .ac-site-icon:not([src]),
-  #main-window[fx48plus="true"] #PopupAutoCompleteRichResult .ac-site-icon[src=""],
+  #main-window[fx48plus="true"] #PopupAutoCompleteRichResult .ac-site-icon:not([src]):not([type="searchengine"]),
+  #main-window[fx48plus="true"] #PopupAutoCompleteRichResult .ac-site-icon[src=""]:not([type="searchengine"]),
   #PopupAutoCompleteRichResult .ac-site-icon[src^="chrome://mozapps/skin/places/defaultFavicon.png"] {
 	width: 0 !important;
 	-moz-padding-end: 16px !important;
diff --git a/xpi/content/css/winaero/empty_favicon_g2.css b/xpi/content/css/winaero/empty_favicon_g2.css
index acbc59e..4a6b4dd 100644
--- a/xpi/content/css/winaero/empty_favicon_g2.css
+++ b/xpi/content/css/winaero/empty_favicon_g2.css
@@ -16,8 +16,8 @@
 	-moz-image-region: rect(0px, 16px, 16px, 0px) !important;
   }
 
-  #main-window[fx48plus="true"] #PopupAutoCompleteRichResult .ac-site-icon:not([src]),
-  #main-window[fx48plus="true"] #PopupAutoCompleteRichResult .ac-site-icon[src=""],
+  #main-window[fx48plus="true"] #PopupAutoCompleteRichResult .ac-site-icon:not([src]):not([type="searchengine"]),
+  #main-window[fx48plus="true"] #PopupAutoCompleteRichResult .ac-site-icon[src=""]:not([type="searchengine"]),
   #PopupAutoCompleteRichResult .ac-site-icon[src^="chrome://mozapps/skin/places/defaultFavicon.png"] {
 	width: 0 !important;
 	-moz-padding-end: 16px !important;
diff --git a/xpi/content/css/winxp/bmbut_pmenu_extra.css b/xpi/content/css/winxp/bmbut_pmenu_extra.css
index 871c8a5..a170b26 100644
--- a/xpi/content/css/winxp/bmbut_pmenu_extra.css
+++ b/xpi/content/css/winxp/bmbut_pmenu_extra.css
@@ -12,4 +12,10 @@
 	#main-window[fx51plus="true"] #ctraddon_BMB_bookmarksPopup #ctraddon_BMB_subscribeToPageSubmenuMenupopup {
 	  border: 1px solid var(--panel-arrowcontent-border-color) !important;
 	}
+	
+	#main-window[fx52plus="true"] #ctraddon_BMB_bookmarksPopup menupopup[placespopup=true] > hbox,
+	#main-window[fx52plus="true"] #ctraddon_BMB_bookmarksPopup #ctraddon_BMB_subscribeToPageSubmenuMenupopup {
+	  background: var(--arrowpanel-background) !important;
+	  border: 1px solid var(--arrowpanel-border-color) !important;
+	}
 }
\ No newline at end of file
diff --git a/xpi/content/css/winxp/empty_favicon_g0.css b/xpi/content/css/winxp/empty_favicon_g0.css
index 8470ba4..1f4bff7 100644
--- a/xpi/content/css/winxp/empty_favicon_g0.css
+++ b/xpi/content/css/winxp/empty_favicon_g0.css
@@ -16,8 +16,8 @@
 	-moz-image-region: rect(0px, 16px, 16px, 0px) !important;
   }
   
-  #main-window[fx48plus="true"] #PopupAutoCompleteRichResult .ac-site-icon:not([src]),
-  #main-window[fx48plus="true"] #PopupAutoCompleteRichResult .ac-site-icon[src=""],
+  #main-window[fx48plus="true"] #PopupAutoCompleteRichResult .ac-site-icon:not([src]):not([type="searchengine"]),
+  #main-window[fx48plus="true"] #PopupAutoCompleteRichResult .ac-site-icon[src=""]:not([type="searchengine"]),
   #PopupAutoCompleteRichResult .ac-site-icon[src^="chrome://mozapps/skin/places/defaultFavicon.png"] {
 	width: 0 !important;
 	-moz-padding-end: 16px !important;
diff --git a/xpi/content/css/winxp/empty_favicon_g1.css b/xpi/content/css/winxp/empty_favicon_g1.css
index ed1aa89..ce3b6b1 100644
--- a/xpi/content/css/winxp/empty_favicon_g1.css
+++ b/xpi/content/css/winxp/empty_favicon_g1.css
@@ -16,8 +16,8 @@
 	-moz-image-region: rect(0px, 16px, 16px, 0px) !important;
   }
   
-  #main-window[fx48plus="true"] #PopupAutoCompleteRichResult .ac-site-icon:not([src]),
-  #main-window[fx48plus="true"] #PopupAutoCompleteRichResult .ac-site-icon[src=""],
+  #main-window[fx48plus="true"] #PopupAutoCompleteRichResult .ac-site-icon:not([src]):not([type="searchengine"]),
+  #main-window[fx48plus="true"] #PopupAutoCompleteRichResult .ac-site-icon[src=""]:not([type="searchengine"]),
   #PopupAutoCompleteRichResult .ac-site-icon[src^="chrome://mozapps/skin/places/defaultFavicon.png"] {
 	width: 0 !important;
 	-moz-padding-end: 16px !important;
diff --git a/xpi/content/css/winxp/empty_favicon_g1v2.css b/xpi/content/css/winxp/empty_favicon_g1v2.css
index 01e3b1e..8d3678b 100644
--- a/xpi/content/css/winxp/empty_favicon_g1v2.css
+++ b/xpi/content/css/winxp/empty_favicon_g1v2.css
@@ -16,8 +16,8 @@
 	-moz-image-region: rect(0px, 16px, 16px, 0px) !important;
   }
   
-  #main-window[fx48plus="true"] #PopupAutoCompleteRichResult .ac-site-icon:not([src]),
-  #main-window[fx48plus="true"] #PopupAutoCompleteRichResult .ac-site-icon[src=""],
+  #main-window[fx48plus="true"] #PopupAutoCompleteRichResult .ac-site-icon:not([src]):not([type="searchengine"]),
+  #main-window[fx48plus="true"] #PopupAutoCompleteRichResult .ac-site-icon[src=""]:not([type="searchengine"]),
   #PopupAutoCompleteRichResult .ac-site-icon[src^="chrome://mozapps/skin/places/defaultFavicon.png"] {
 	width: 0 !important;
 	-moz-padding-end: 16px !important;
diff --git a/xpi/content/css/winxp/empty_favicon_g2.css b/xpi/content/css/winxp/empty_favicon_g2.css
index c1070ff..a1ca717 100644
--- a/xpi/content/css/winxp/empty_favicon_g2.css
+++ b/xpi/content/css/winxp/empty_favicon_g2.css
@@ -16,8 +16,8 @@
 	-moz-image-region: rect(0px, 16px, 16px, 0px) !important;
   }
   
-  #main-window[fx48plus="true"] #PopupAutoCompleteRichResult .ac-site-icon:not([src]),
-  #main-window[fx48plus="true"] #PopupAutoCompleteRichResult .ac-site-icon[src=""],
+  #main-window[fx48plus="true"] #PopupAutoCompleteRichResult .ac-site-icon:not([src]):not([type="searchengine"]),
+  #main-window[fx48plus="true"] #PopupAutoCompleteRichResult .ac-site-icon[src=""]:not([type="searchengine"]),
   #PopupAutoCompleteRichResult .ac-site-icon[src^="chrome://mozapps/skin/places/defaultFavicon.png"] {
 	width: 0 !important;
 	-moz-padding-end: 16px !important;
diff --git a/xpi/content/options.js b/xpi/content/options.js
index 21d67ab..50c80ee 100644
--- a/xpi/content/options.js
+++ b/xpi/content/options.js
@@ -407,6 +407,7 @@ classicthemerestorerjso.ctr = {
 	  document.getElementById('ctraddon_pw_cresultshbox').style.visibility = 'collapse';
 	  document.getElementById('ctraddon_pw_aboutpages').style.visibility = 'collapse';
 	  document.getElementById('ctraddon_pw_ctrltabprev').style.visibility = 'collapse';
+	  document.getElementById('ctraddon_pw_autocompl_not').style.visibility = 'collapse';
 	}
 
 	if (this.appversion >= 48) {
@@ -1202,13 +1203,15 @@ classicthemerestorerjso.ctr = {
 	this.prefs.setBoolPref("hideurlsrg",true);
 
 	this.prefs.setBoolPref("oldsearch",true);
-	
-	if(this.appversion >= 50)
-	  this.prefs.setBoolPref("oldplacesbut",true);
 
-	if(this.appversion >= 48)
+	if(this.appversion >= 48) {
 	  this.prefs.setBoolPref("altautocompl",true);
+	  this.prefs.setBoolPref("aboutpages",true);
+	}
 	
+	if(this.appversion >= 50)
+	  this.prefs.setBoolPref("oldplacesbut",true);
+  
 	setTimeout(function(){
 		Services.prefs.getBranch("extensions.classicthemerestorer.").setBoolPref("starinurl",true);
 		Services.prefs.getBranch("extensions.classicthemerestorer.").setBoolPref("feedinurl",true);
@@ -1232,6 +1235,9 @@ classicthemerestorerjso.ctr = {
 	this.prefs.setBoolPref("toolsitem",false);
 	this.prefs.setBoolPref("cuibuttons",false);
 	this.prefs.setBoolPref("addonversion",false);
+	this.prefs.setCharPref("altoptions",'options_default');
+	this.prefs.setBoolPref("alt_addonsm",false);
+	this.prefs.setBoolPref("am_highlight",false);
 	
 	this.needsBrowserRestart();
 
diff --git a/xpi/content/options.xul b/xpi/content/options.xul
index e3ec05a..62c7552 100644
--- a/xpi/content/options.xul
+++ b/xpi/content/options.xul
@@ -136,6 +136,7 @@
 		<preference id="ctraddon_autocompl_hlu"	name="extensions.classicthemerestorer.autocompl_hlu" type="bool"	instantApply="true"/>
 		<preference id="ctraddon_autocompl_hli"	name="extensions.classicthemerestorer.autocompl_hli" type="bool"	instantApply="true"/>
 		<preference id="ctraddon_autocompl_hln"	name="extensions.classicthemerestorer.autocompl_hln" type="bool"	instantApply="true"/>
+		<preference id="ctraddon_autocompl_not"	name="extensions.classicthemerestorer.autocompl_not" type="bool"	instantApply="true"/>
 		<preference id="ctraddon_autocompl_sep"	name="extensions.classicthemerestorer.autocompl_sep" type="bool"	instantApply="true"/>
 		<preference id="ctraddon_autocompl_rhl"	name="extensions.classicthemerestorer.autocompl_rhl" type="bool"	instantApply="true"/>
 		<preference id="ctraddon_cresultshcb"	name="extensions.classicthemerestorer.cresultshcb"	type="bool"		instantApply="true"/>
@@ -152,6 +153,8 @@
 		<preference id="ctraddon_iblabels"		name="extensions.classicthemerestorer.iblabels"		type="bool"		instantApply="true"/>
 		<preference id="ctraddon_findbar"		name="extensions.classicthemerestorer.findbar"		type="string"	instantApply="true"/>
 		<preference id="ctraddon_findb_hide_ws"	name="extensions.classicthemerestorer.findb_hide_ws" type="bool"	instantApply="true"/>
+		<preference id="ctraddon_findb_widthcb"	name="extensions.classicthemerestorer.findb_widthcb" type="bool"	instantApply="true"/>
+		<preference id="ctraddon_findb_widthva"	name="extensions.classicthemerestorer.findb_widthva" type="int"		instantApply="true"/>
 		<preference id="ctraddon_nav_txt_ico"	name="extensions.classicthemerestorer.nav_txt_ico" 	type="string"	instantApply="true"/>
 		<preference id="ctraddon_iat_notf_vt"	name="extensions.classicthemerestorer.iat_notf_vt"	type="bool"		instantApply="true"/>
 		<preference id="ctraddon_closeicong"	name="extensions.classicthemerestorer.closeicong"	type="string"	instantApply="true"/>
@@ -372,6 +375,7 @@
 	  <radio value="ctraddon_toolbarsbox2"	label="&Ctr_toolbars; (2)"	class="ctraddontab"/>
 	  <radio value="ctraddon_toolbarsbox3"	label="&Ctr_toolbars; (3)"	class="ctraddontab ctraddon_new_in_v51"/>
 	  <radio value="ctraddon_experttweaks"	label="&Ctr_experttweaks;"	id="ctraddon_experttweakstab" class="ctraddontab ctraddon_new_in_v50 ctraddon_new_in_v51"/>
+	  <radio value="ctraddon_animationbox"	label="&Ctr_animation;"		class="ctraddontab"/>
 	  <radio value="ctraddon_ctraddonbox"	label="&Ctr_title;"			class="ctraddontab"/>
 	  <label value=""/>
 	  <description id="ctraddon_pw_radiorestart">&Ctr_rr;</description>
@@ -1187,6 +1191,7 @@
 		<checkbox label="&Ctr_autocompl_it;" preference="ctraddon_autocompl_it2" id="ctraddon_pw_autocompl_it2" class="ctraddon_new_in_v50"/>
 		<checkbox label="&Ctr_urlbar_uc;" preference="ctraddon_urlbar_uc" id="ctraddon_pw_urlbar_uc"/>
 		<description class="ctraddonsuboption" id="ctraddon_pw_urlbar_uc_desc">about:config &gt;&gt; browser.urlbar.unifiedcomplete</description>
+		<checkbox label="&Ctr_autocompl_not;" preference="ctraddon_autocompl_not" id="ctraddon_pw_autocompl_not" class="ctraddon_new_in_v48" oncommand="classicthemerestorerjso.ctr.needsBrowserRestart()"/>
 		<checkbox label="&Ctr_autocompl_sep;" preference="ctraddon_autocompl_sep" id="ctraddon_pw_autocompl_sep"/>
 		<checkbox label="&Ctr_autocompl_rhl;" preference="ctraddon_autocompl_rhl" id="ctraddon_pw_autocompl_rhl" class="ctraddon_new_in_v48"/>
 		<checkbox label="&Ctr_lbsugresi;" preference="ctraddon_urlresults" id="ctraddon_pw_urlresults" oncommand="if(this.checked) {classicthemerestorerjso.ctr.ctrpwAutoCompleteHeight(true);} else {classicthemerestorerjso.ctr.ctrpwAutoCompleteHeight(false);}"/>
@@ -1423,6 +1428,11 @@
 				<menuitem value="findbar_topa"	  label="&Ctr_findbar_topa;"/>
 			</menupopup>
 		</menulist>
+		<hbox align="center">
+		  <checkbox label="&Ctr_findbar_width;"	preference="ctraddon_findb_widthcb" id="ctraddon_pw_findb_widthcb"/>
+		  <textbox size="3" maxlength="3" preference="ctraddon_findb_widthva" type="number" min="0" max="999" id="ctraddon_pw_findb_widthva"/>
+		  <label value="px"/>
+		</hbox>
 	  </groupbox>
 
 	</box>
@@ -1470,6 +1480,23 @@
 
 	</box>
 	
+	<box class="ctraddontabpanel" orient="vertical" id="ctraddon_animationbox">
+
+	  <groupbox>
+		<caption  label="&Ctr_animation;" class="ctraddon_topic"/>
+		<checkbox label="&Ctr_bmanimation;"		preference="ctraddon_bmanimation" id="ctraddon_pw_bmanimation"/>
+		<checkbox label="&Ctr_pananimation;"	preference="ctraddon_pananimation" id="ctraddon_pw_pananimation"/>
+		<checkbox label="&Ctr_tabanimation;"	preference="ctraddon_tabsanimate"/>
+		<description class="ctraddonsuboption">about:config &gt;&gt; browser.tabs.animate</description>
+		<checkbox label="&Ctr_dlanimation;"		preference="ctraddon_dlanimate"/>
+		<description class="ctraddonsuboption">about:config &gt;&gt; browser.download.animateNotifications</description>
+		<checkbox label="&Ctr_fsanimation;"		preference="ctraddon_fsanimation" id="ctraddon_pw_fsanimation"/>
+		<description class="ctraddonsuboption">about:config &gt;&gt; browser.fullscreen.animate</description>
+		<checkbox label="&Ctr_fsaduration;"		preference="ctraddon_fsaduration" id="ctraddon_pw_fsaduration"/>
+		<description class="ctraddonsuboption">about:config &gt;&gt; full-screen-api.transition-duration.*</description>
+	  </groupbox>
+	</box>
+
 	<box class="ctraddontabpanel" orient="vertical" id="ctraddon_experttweaks">
 
 	  <groupbox id="ctraddon_pw_loopcallgb">
@@ -1522,20 +1549,6 @@
 	</box>
 
 	<box class="ctraddontabpanel" orient="vertical" id="ctraddon_ctraddonbox">
-
-	  <groupbox>
-		<caption  label="&Ctr_animation;" class="ctraddon_topic"/>
-		<checkbox label="&Ctr_bmanimation;"		preference="ctraddon_bmanimation" id="ctraddon_pw_bmanimation"/>
-		<checkbox label="&Ctr_pananimation;"	preference="ctraddon_pananimation" id="ctraddon_pw_pananimation"/>
-		<checkbox label="&Ctr_tabanimation;"	preference="ctraddon_tabsanimate"/>
-		<description class="ctraddonsuboption">about:config &gt;&gt; browser.tabs.animate</description>
-		<checkbox label="&Ctr_dlanimation;"		preference="ctraddon_dlanimate"/>
-		<description class="ctraddonsuboption">about:config &gt;&gt; browser.download.animateNotifications</description>
-		<checkbox label="&Ctr_fsanimation;"		preference="ctraddon_fsanimation" id="ctraddon_pw_fsanimation"/>
-		<description class="ctraddonsuboption">about:config &gt;&gt; browser.fullscreen.animate</description>
-		<checkbox label="&Ctr_fsaduration;"		preference="ctraddon_fsaduration" id="ctraddon_pw_fsaduration"/>
-		<description class="ctraddonsuboption">about:config &gt;&gt; full-screen-api.transition-duration.*</description>
-	  </groupbox>
 	  
 	  <groupbox>
 		<caption  label="&Ctr_title;" class="ctraddon_topic"/>
diff --git a/xpi/content/overlay.js b/xpi/content/overlay.js
index cea59e2..435ef94 100644
--- a/xpi/content/overlay.js
+++ b/xpi/content/overlay.js
@@ -16,7 +16,7 @@ if (typeof classicthemerestorerjs == "undefined") {var classicthemerestorerjs =
 if (!classicthemerestorerjs.ctr) {classicthemerestorerjs.ctr = {};};
 
 classicthemerestorerjs.ctr = {
- 
+
   // initialize custom sheets for tab color settings
   ctabsheet_def:		Services.io.newURI("data:text/css;charset=utf-8," + encodeURIComponent(''), null, null),
   ctabsheet_act:		Services.io.newURI("data:text/css;charset=utf-8," + encodeURIComponent(''), null, null),
@@ -54,6 +54,8 @@ classicthemerestorerjs.ctr = {
   
   tabheight:			Services.io.newURI("data:text/css;charset=utf-8," + encodeURIComponent(''), null, null),
   
+  findbarwidth:			Services.io.newURI("data:text/css;charset=utf-8," + encodeURIComponent(''), null, null),
+  
   locsearchbarsize:		Services.io.newURI("data:text/css;charset=utf-8," + encodeURIComponent(''), null, null),
   locsearchbarradius:	Services.io.newURI("data:text/css;charset=utf-8," + encodeURIComponent(''), null, null),
   searchpopupwidth:		Services.io.newURI("data:text/css;charset=utf-8," + encodeURIComponent(''), null, null),
@@ -120,6 +122,7 @@ classicthemerestorerjs.ctr = {
 	try{if (this.appversion >= 48) document.getElementById("main-window").setAttribute('fx48plus',true);} catch(e){}
 	try{if (this.appversion >= 50) document.getElementById("main-window").setAttribute('fx50plus',true);} catch(e){}
 	try{if (this.appversion >= 51) document.getElementById("main-window").setAttribute('fx51plus',true);} catch(e){}
+	try{if (this.appversion >= 52) document.getElementById("main-window").setAttribute('fx52plus',true);} catch(e){}
 
 	// add CTR version number to '#main-window' node, so other add-ons/themes can easier distinguish between versions
 	AddonManager.getAddonByID('ClassicThemeRestorer@ArisT2Noia4dev', function(addon) {
@@ -355,13 +358,7 @@ classicthemerestorerjs.ctr = {
 			classicthemerestorerjs.ctr.loadUnloadCSS('tabs_devedextra',false);
 
 			var devtheme=false;
-
-			try {
-			  if(Services.prefs.getBranch("browser.devedition.theme.").getBoolPref('enabled')!=false){
-				devtheme=true;
-			  }
-			} catch(e) {}
-			
+		
 			if(classicthemerestorerjs.ctr.fxdevelopertheme==true) devtheme=true;
 
 			if (branch.getCharPref("tabs")!="tabs_default" && classicthemerestorerjs.ctr.fxdefaulttheme==true && devtheme==false){
@@ -655,13 +652,7 @@ classicthemerestorerjs.ctr = {
 		  case "aerocolors": case "aerocolorsg":
 		 
 			var devtheme=false;
-
-			try {
-			  if(Services.prefs.getBranch("browser.devedition.theme.").getBoolPref('enabled')!=false){
-				devtheme=true;
-			  }
-			} catch(e) {}
-			
+	
 			if(classicthemerestorerjs.ctr.fxdevelopertheme==true) devtheme=true;
 	
 			if (branch.getBoolPref("aerocolors") && classicthemerestorerjs.ctr.fxdefaulttheme==true && devtheme==false) {
@@ -1167,7 +1158,7 @@ classicthemerestorerjs.ctr = {
 		  break;
 
 		  case "altautocompl":
-			if (branch.getBoolPref("altautocompl") && classicthemerestorerjs.ctr.appversion >= 48) classicthemerestorerjs.ctr.loadUnloadCSS("altautocompl",true);
+			if (branch.getBoolPref("altautocompl") && branch.getBoolPref("autocompl_not")==false && classicthemerestorerjs.ctr.appversion >= 48) classicthemerestorerjs.ctr.loadUnloadCSS("altautocompl",true);
 			  else classicthemerestorerjs.ctr.loadUnloadCSS("altautocompl",false);
 		  break;
 		  
@@ -1200,8 +1191,25 @@ classicthemerestorerjs.ctr = {
 		  break;
 		  
 		  case "autocompl_it2":
-			if (branch.getBoolPref("autocompl_it2") && classicthemerestorerjs.ctr.appversion >= 50) classicthemerestorerjs.ctr.loadUnloadCSS("autocompl_it2",true);
-			  else classicthemerestorerjs.ctr.loadUnloadCSS("autocompl_it2",false);
+			if (branch.getBoolPref("autocompl_it2") && classicthemerestorerjs.ctr.appversion >= 50) {
+			  
+			  document.getElementById('PopupAutoCompleteRichResult').addEventListener("popupshowing", function unlockACPopupHeight(event){
+				
+				//get inner 'autocomplete richlistbox' of '#PopupAutoCompleteRichResult' panel
+				var acrichlistbox = document.getElementById("PopupAutoCompleteRichResult").boxObject.firstChild.nextSibling;
+				
+				var ACObserver = new MutationObserver(function(mutations) {
+				  mutations.forEach(function(mutation) {
+					document.getElementById("PopupAutoCompleteRichResult").setAttribute('ctrsubboxstyle', acrichlistbox.getAttribute('style'));
+				  });    
+				});
+				
+				ACObserver.observe(acrichlistbox, { attributes: true, attributeFilter: ['style'] });
+			  }, false);
+			  
+			  classicthemerestorerjs.ctr.loadUnloadCSS("autocompl_it2",true);
+			}
+			else classicthemerestorerjs.ctr.loadUnloadCSS("autocompl_it2",false);
 		  break;
 	  
 		  case "autocompl_hlb":
@@ -1231,6 +1239,26 @@ classicthemerestorerjs.ctr = {
 			}
 			else classicthemerestorerjs.ctr.loadUnloadCSS("autocompl_hln",false);
 		  break;
+		  
+		  case "autocompl_not":
+			if (branch.getBoolPref("autocompl_not") && classicthemerestorerjs.ctr.appversion >= 48) {
+				
+			  if (branch.getBoolPref("altautocompl")) {
+			    classicthemerestorerjs.ctr.loadUnloadCSS("altautocompl",false);
+				classicthemerestorerjs.ctr.loadUnloadCSS("autocompl_no_t1",false);
+				classicthemerestorerjs.ctr.loadUnloadCSS("autocompl_no_t2",true);  // for alt ac popup
+			  } else {
+			    classicthemerestorerjs.ctr.loadUnloadCSS("autocompl_no_t1",true); // for default ac popup
+				classicthemerestorerjs.ctr.loadUnloadCSS("autocompl_no_t2",false);
+			  }
+			} else {
+			  classicthemerestorerjs.ctr.loadUnloadCSS("autocompl_no_t1",false);
+			  classicthemerestorerjs.ctr.loadUnloadCSS("autocompl_no_t2",false);
+			  
+			  if (branch.getBoolPref("altautocompl"))
+			    classicthemerestorerjs.ctr.loadUnloadCSS("altautocompl",true);
+			}
+		  break;
 
 		  case "autocompl_sep":
 			if (branch.getBoolPref("autocompl_sep")) classicthemerestorerjs.ctr.loadUnloadCSS("autocompl_sep",true);
@@ -1277,6 +1305,15 @@ classicthemerestorerjs.ctr = {
 			}
 		  break;
 		  
+		  case "findb_widthcb":
+			if (branch.getBoolPref("findb_widthcb")) classicthemerestorerjs.ctr.loadUnloadCSS("findb_widthva",true);
+			  else classicthemerestorerjs.ctr.loadUnloadCSS("findb_widthva",false);
+		  break;
+		  
+		  case "findb_widthva":
+			if (branch.getBoolPref("findb_widthcb")) classicthemerestorerjs.ctr.loadUnloadCSS("findb_widthva",true);
+		  break;
+		  
 		  case "nav_txt_ico":
 			classicthemerestorerjs.ctr.loadUnloadCSS('iconsbig',false);
 			classicthemerestorerjs.ctr.loadUnloadCSS('iconstxt',false);
@@ -2038,6 +2075,14 @@ classicthemerestorerjs.ctr = {
 		  case "alt_addonsm":
 			if (branch.getBoolPref("alt_addonsm") && classicthemerestorerjs.ctr.fxdefaulttheme==true) classicthemerestorerjs.ctr.loadUnloadCSS("alt_addonsm",true);
 			  else classicthemerestorerjs.ctr.loadUnloadCSS("alt_addonsm",false);
+
+			var devtheme=false;
+			if(classicthemerestorerjs.ctr.fxdevelopertheme==true) devtheme=true;
+			
+			if (branch.getBoolPref("aerocolors") && classicthemerestorerjs.ctr.fxdefaulttheme==true && devtheme==false) { 
+			  classicthemerestorerjs.ctr.loadUnloadCSS("aerocolors",false);
+			  classicthemerestorerjs.ctr.loadUnloadCSS("aerocolors",true);
+			}
 		  break;
 
 		  case "addonversion":
@@ -2109,6 +2154,24 @@ classicthemerestorerjs.ctr = {
 		  case "bmbnounsort":
 			if (branch.getBoolPref("bmbnounsort")) classicthemerestorerjs.ctr.loadUnloadCSS("bmbnounsort",true);
 			  else classicthemerestorerjs.ctr.loadUnloadCSS("bmbnounsort",false);
+			  
+			// for MacOSX: hide item using js instead of css or it won't work
+			if (classicthemerestorerjs.ctr.osstring=="Darwin"){
+				if (branch.getBoolPref("bmbnounsort")) {
+					setTimeout(function(){
+					  try{
+						document.getElementById("menu_unsortedBookmarks").collapsed = true;
+					  } catch(e){}
+					},500);
+				}
+				else {
+				  setTimeout(function(){
+					try{
+					  document.getElementById("menu_unsortedBookmarks").collapsed = false;
+					} catch(e){}
+				  },500);
+				}
+			}
 		  break;
 
 		  case "bmbutnotext":
@@ -4072,6 +4135,8 @@ classicthemerestorerjs.ctr = {
 		case "autocompl_hli": 		manageCSS("alt_autocompl_hl_i.css");	break;
 		case "autocompl_hln": 		manageCSS("alt_autocompl_hl_n.css");	break;
 		case "autocompl_sep": 		manageCSS("alt_autocompl_sep.css");		break;
+		case "autocompl_no_t1": 	manageCSS("autocompl_no_title1.css");	break;
+		case "autocompl_no_t2": 	manageCSS("autocompl_no_title2.css");	break;
 		case "autocompl_rhl": 		manageCSS("alt_autocompl_rhl.css");		break;
 		case "locsearchbw10": 		manageCSS("locationsearchbarw10.css");	break;
 		case "combrelstop":			manageCSS("combrelstop.css");			break;
@@ -4398,7 +4463,8 @@ classicthemerestorerjs.ctr = {
 						#main-window[defaultfxtheme="true"][tabsontop="false"] #TabsToolbar:not(:-moz-lwtheme),\
 						#main-window[defaultfxtheme="true"] :not(#theFoxOnlyBetter-slimChrome-toolbars) > toolbar:not(#toolbar-menubar):not(#TabsToolbar):not(#nav-bar):not(.devtools-tabbar):not(#developer-toolbar):not(.devtools-responsiveui-toolbar):not(#puzzleBars-urlbar-bar):not(#theFoxOnlyBetter-skyLights-container):not(#theFoxOnlyBetter-slimChrome-slimmer),\
 						#main-window[defaultfxtheme="true"] #theFoxOnlyBetter-slimChrome-container > *:not(#theFoxOnlyBetter-slimChrome-toolbars-bottom):not(:-moz-lwtheme),\
-						#main-window[defaultfxtheme="true"] #ctraddon_urlextrabar:not(:-moz-lwtheme){\
+						#main-window[defaultfxtheme="true"] #ctraddon_urlextrabar:not(:-moz-lwtheme),\
+						#main-window[defaultfxtheme="true"] findbar{\
 						  background-image:unset !important;\
 						  background-color:'+main_ab_color+' !important;\
 						}\
@@ -4754,6 +4820,25 @@ classicthemerestorerjs.ctr = {
 			}
 		
 		break;
+		
+		case "findb_widthva":
+			removeOldSheet(this.findbarwidth);
+			
+			if(enable==true && this.prefs.getBoolPref('findb_widthcb')){
+			
+				this.findbarwidth=ios.newURI("data:text/css;charset=utf-8," + encodeURIComponent('\
+					findbar .findbar-textbox{\
+					  min-width: '+this.prefs.getIntPref('findb_widthva')+'px !important;\
+					  width: '+this.prefs.getIntPref('findb_widthva')+'px !important;\
+					  max-width: unset !important;\
+					}\
+				'), null, null);
+				
+				applyNewSheet(this.findbarwidth);
+			
+			}
+		
+		break;
 
 		case "tabcolor_def":
 
@@ -6173,7 +6258,9 @@ classicthemerestorerjs.ctr = {
 			return;
 		  }
 		}
+
 		window.open(aAddon.optionsURL,'', 'chrome').focus();
+		
 	});
   },
 
diff --git a/xpi/content/urlbarBindings.xml b/xpi/content/urlbarBindings.xml
index 1ea4e4e..1be405c 100644
--- a/xpi/content/urlbarBindings.xml
+++ b/xpi/content/urlbarBindings.xml
@@ -1101,6 +1101,10 @@
           let separatorURLActionWidth =
             separatorRect.width + Math.max(urlRect.width, actionRect.width);
 
+          // Total width for the title and URL/action is the width of the item
+          // minus the start of the title text minus a little extra padding.
+          // This extra padding amount is basically arbitrary but keeps the text
+          // from getting too close to the popup's edge.
           let extraPadding = 30;
           let dir = this.getAttribute("dir");
           let titleStart = dir == "rtl" ? itemRect.right - titleRect.right
@@ -1108,7 +1112,6 @@
           let itemWidth = itemRect.width - titleStart - extraPadding;
 
           if (this._tags.hasAttribute("empty")) {
-
             tagsRect.width = 0;
           }
 
@@ -1116,7 +1119,7 @@
           if (titleTagsWidth + separatorURLActionWidth > itemWidth) {
 
             // The percentage of the item width allocated to the title and tags.
-            let titleTagsPct = 1.00;
+            let titleTagsPct = 0.66;
 
             let titleTagsAvailable = itemWidth - separatorURLActionWidth;
             let titleTagsMaxWidth = Math.max(
@@ -1124,7 +1127,6 @@
               itemWidth * titleTagsPct
             );
             if (titleTagsWidth > titleTagsMaxWidth) {
-
               let titlePct = 0.33;
 
               let titleAvailable = titleTagsMaxWidth - tagsRect.width;
@@ -1137,22 +1139,17 @@
                 tagsAvailable,
                 titleTagsMaxWidth * (1 - titlePct)
               );
-			  this._titleText.style.maxWidth = (-16 + titleMaxWidth) + "px";
-              this._tagsText.style.maxWidth = titleMaxWidth + "px";
+              this._titleText.style.maxWidth = (-62 + itemRect.width) + "px";
+              this._tagsText.style.maxWidth = tagsMaxWidth + "px";
             }
-            let urlActionMaxWidth = Math.max(
-              itemWidth - titleTagsWidth,
-              itemWidth * (1 - titleTagsPct)
-            );
-			
+
             let titleMaxWidth = Math.max(
               (titleTagsMaxWidth - tagsRect.width),
               titleTagsMaxWidth * 0.33
             );
 
-            urlActionMaxWidth -= separatorRect.width;
-			this._urlText.style.maxWidth = titleMaxWidth + "px";
-            this._actionText.style.maxWidth = titleMaxWidth + "px";
+            this._urlText.style.maxWidth = (-62 + itemRect.width) + "px";
+            this._actionText.style.maxWidth = (-62 + itemRect.width) + "px";
           }
         ]]></body>
       </method>
diff --git a/xpi/content/urlbarBindings51.xml b/xpi/content/urlbarBindings51.xml
index 479cc05..99fac6a 100644
--- a/xpi/content/urlbarBindings51.xml
+++ b/xpi/content/urlbarBindings51.xml
@@ -1149,6 +1149,10 @@
           let separatorURLActionWidth =
             separatorRect.width + Math.max(urlRect.width, actionRect.width);
 
+          // Total width for the title and URL/action is the width of the item
+          // minus the start of the title text minus a little extra padding.
+          // This extra padding amount is basically arbitrary but keeps the text
+          // from getting too close to the popup's edge.
           let extraPadding = 30;
           let dir = this.getAttribute("dir");
           let titleStart = dir == "rtl" ? itemRect.right - titleRect.right
@@ -1162,7 +1166,8 @@
           let titleTagsWidth = titleRect.width + tagsRect.width;
           if (titleTagsWidth + separatorURLActionWidth > itemWidth) {
 
-            let titleTagsPct = 1.00;
+            // The percentage of the item width allocated to the title and tags.
+            let titleTagsPct = 0.66;
 
             let titleTagsAvailable = itemWidth - separatorURLActionWidth;
             let titleTagsMaxWidth = Math.max(
@@ -1182,20 +1187,17 @@
                 tagsAvailable,
                 titleTagsMaxWidth * (1 - titlePct)
               );
-              this._titleText.style.maxWidth = (-16 + titleMaxWidth) + "px";
-              this._tagsText.style.maxWidth = titleMaxWidth + "px";
+              this._titleText.style.maxWidth = (-62 + itemRect.width) + "px";
+              this._tagsText.style.maxWidth = tagsMaxWidth + "px";
             }
-            let urlActionMaxWidth = Math.max(
-              itemWidth - titleTagsWidth,
-              itemWidth * (1 - titleTagsPct)
-            );
+
             let titleMaxWidth = Math.max(
               (titleTagsMaxWidth - tagsRect.width),
               titleTagsMaxWidth * 0.33
             );
-            urlActionMaxWidth -= separatorRect.width;
-			this._urlText.style.maxWidth = titleMaxWidth + "px";
-            this._actionText.style.maxWidth = titleMaxWidth + "px";
+
+            this._urlText.style.maxWidth = (-62 + itemRect.width) + "px";
+            this._actionText.style.maxWidth = (-62 + itemRect.width) + "px";
           }
         ]]></body>
       </method>
diff --git a/xpi/defaults/preferences/options.js b/xpi/defaults/preferences/options.js
index f95ae75..4250929 100644
--- a/xpi/defaults/preferences/options.js
+++ b/xpi/defaults/preferences/options.js
@@ -39,7 +39,7 @@ pref("extensions.classicthemerestorer.hide_bf_popup",false);
 pref("extensions.classicthemerestorer.nbcompact",false);
 pref("extensions.classicthemerestorer.statusbar",true);
 pref("extensions.classicthemerestorer.noconicons",false);
-pref("extensions.classicthemerestorer.altoptions",'options_default');
+pref("extensions.classicthemerestorer.altoptions",'options_alt');
 pref("extensions.classicthemerestorer.aboutpages",false);
 pref("extensions.classicthemerestorer.svgfilters",false);
 pref("extensions.classicthemerestorer.combrelstop",false);
@@ -47,6 +47,9 @@ pref("extensions.classicthemerestorer.activndicat",false);
 pref("extensions.classicthemerestorer.nbisizedelay",0);
 pref("extensions.classicthemerestorer.findbar","findbar_default");
 pref("extensions.classicthemerestorer.findb_hide_ws",false);
+pref("extensions.classicthemerestorer.findb_widthcb",false);
+pref("extensions.classicthemerestorer.findb_widthva",170);
+pref("extensions.classicthemerestorer.nbisizedelay",0);
 pref("extensions.classicthemerestorer.nav_txt_ico","icons");
 pref("extensions.classicthemerestorer.iat_notf_vt",false);
 pref("extensions.classicthemerestorer.wincontrols",false);
@@ -70,11 +73,11 @@ pref("extensions.classicthemerestorer.osearch_cwidth",false);
 pref("extensions.classicthemerestorer.os_spsize_minw",200);
 pref("extensions.classicthemerestorer.os_spsize_maxw",200);
 pref("extensions.classicthemerestorer.addonversion",true);
-pref("extensions.classicthemerestorer.alt_addonsm",false);
+pref("extensions.classicthemerestorer.alt_addonsm",true);
 pref("extensions.classicthemerestorer.am_nowarning",false);
 pref("extensions.classicthemerestorer.am_compact",false);
 pref("extensions.classicthemerestorer.am_compact2",true);
-pref("extensions.classicthemerestorer.am_highlight",false);
+pref("extensions.classicthemerestorer.am_highlight",true);
 pref("extensions.classicthemerestorer.am_buticons",false);
 pref("extensions.classicthemerestorer.am_hovshowb",false);
 pref("extensions.classicthemerestorer.alt_addonsp",false);
@@ -140,6 +143,7 @@ pref("extensions.classicthemerestorer.autocompl_hlu",false);
 pref("extensions.classicthemerestorer.autocompl_hli",false);
 pref("extensions.classicthemerestorer.autocompl_hln",false);
 pref("extensions.classicthemerestorer.autocompl_sep",false);
+pref("extensions.classicthemerestorer.autocompl_not",false);
 pref("extensions.classicthemerestorer.autocompl_rhl",false);
 
 pref("extensions.classicthemerestorer.ib_nohovcolor",false);
@@ -235,6 +239,7 @@ pref("extensions.classicthemerestorer.contextitem",false);
 pref("extensions.classicthemerestorer.puictrbutton",false);
 pref("extensions.classicthemerestorer.cuibuttons",true);
 pref("extensions.classicthemerestorer.nodevtheme2",false);
+pref("extensions.classicthemerestorer.ctr_english",false);
 pref("extensions.classicthemerestorer.restartapp",true);
 pref("extensions.classicthemerestorer.ctrnewinv",true);
 pref("extensions.classicthemerestorer.pref_actindx",3);
diff --git a/xpi/install.rdf b/xpi/install.rdf
index a0b733b..c12b723 100644
--- a/xpi/install.rdf
+++ b/xpi/install.rdf
@@ -5,7 +5,7 @@
 	<Description rdf:about="urn:mozilla:install-manifest">
 		<em:id>ClassicThemeRestorer@ArisT2Noia4dev</em:id>
 		<em:name>Classic Theme Restorer</em:name>
-		<em:version>1.5.7</em:version>
+		<em:version>1.5.8beta3</em:version>
 		<em:type>2</em:type>
 		<em:multiprocessCompatible>true</em:multiprocessCompatible>
 
@@ -125,7 +125,7 @@
 			<Description>
 				<em:name>Classic Theme Restorer</em:name>
 				<em:locale>fr</em:locale>
-				<em:description>« Classic Theme Restorer » restaure dans l'interface utilisateur Australis de Firefox : l'ancien bouton menu, les onglets rectangulaires, la barre des modules, les petits boutons de la barre de navigation, quelques autres anciens boutons, et plus. Utilisez le menu « Personnaliser... » afin de déplacer les boutons sur les barres d'outils.</em:description>
+				<em:description>Restaure dans l'interface Australis de Firefox : l'ancien bouton de menu, les onglets rectangulaires, la barre des modules, les petits boutons de la barre de navigation, quelques autres anciens boutons, et plus. Utilisez le menu « Personnaliser... » afin de déplacer les boutons sur les barres d'outils.</em:description>
 				<em:translator>Zefling (fr) - French</em:translator>
 				<em:translator>David V. (fr) - French</em:translator>
 				<em:translator>goofy (fr) - French</em:translator>
diff --git a/xpi/locale/cs/options.dtd b/xpi/locale/cs/options.dtd
index f8c0db5..a34ff66 100644
--- a/xpi/locale/cs/options.dtd
+++ b/xpi/locale/cs/options.dtd
@@ -152,6 +152,7 @@
 <!ENTITY Ctr_nbisizedelay	"ms (1000 ms = 1 sec)">
 <!ENTITY Ctr_findbar		"Findbar">
 <!ENTITY Ctr_findbar_hws	"Close findbar when scrolling page">
+<!ENTITY Ctr_findbar_width	"Findboxes width">
 <!ENTITY Ctr_findbarpos		"Lišta vyhledávání">
 <!ENTITY Ctr_findbar_def	"Výchozí umístění">
 <!ENTITY Ctr_findbar_top	"Nahoře">
@@ -281,6 +282,7 @@
 <!ENTITY Ctr_autocompl_it	"Odstranit položky 'Vyhledat pomocí...' a 'Navštívit' (pokud se vyskytují)">
 <!ENTITY Ctr_autocompl_hl	"Highlighting of text hits">
 <!ENTITY Ctr_autocompl_rhl	"Aero colors for highlighted results">
+<!ENTITY Ctr_autocompl_not	"Hide page title">
 <!ENTITY Ctr_autocompl_sep	"Show separator between results">
 <!ENTITY Ctr_urlbar_uc		"Zakázat automatické doplňování">
 <!ENTITY Ctr_lbsugresi		"Zrušit limit pro výšku">
diff --git a/xpi/locale/da/options.dtd b/xpi/locale/da/options.dtd
index 71ec932..5cac74c 100644
--- a/xpi/locale/da/options.dtd
+++ b/xpi/locale/da/options.dtd
@@ -152,6 +152,7 @@
 <!ENTITY Ctr_nbisizedelay	"ms (1000 ms = 1 sekund)">
 <!ENTITY Ctr_findbar		"Findbar">
 <!ENTITY Ctr_findbar_hws	"Close findbar when scrolling page">
+<!ENTITY Ctr_findbar_width	"Findboxes width">
 <!ENTITY Ctr_findbarpos		"Placering af søgelinje">
 <!ENTITY Ctr_findbar_def	"Bunden (standard)">
 <!ENTITY Ctr_findbar_top	"Toppen">
@@ -281,6 +282,7 @@
 <!ENTITY Ctr_autocompl_it	"Remove 'Search with...' and 'Visit' items (if present)">
 <!ENTITY Ctr_autocompl_hl	"Highlighting of text hits">
 <!ENTITY Ctr_autocompl_rhl	"Aero colors for highlighted results">
+<!ENTITY Ctr_autocompl_not	"Hide page title">
 <!ENTITY Ctr_autocompl_sep	"Show separator between results">
 <!ENTITY Ctr_urlbar_uc		"Deaktivér 'samlede autofuldfør'-funktion">
 <!ENTITY Ctr_lbsugresi		"Deaktivér højdegrænse">
diff --git a/xpi/locale/de/options.dtd b/xpi/locale/de/options.dtd
index 5a46b34..f3b71c9 100644
--- a/xpi/locale/de/options.dtd
+++ b/xpi/locale/de/options.dtd
@@ -152,6 +152,7 @@
 <!ENTITY Ctr_nbisizedelay	"ms (1000 ms = 1 Sekunde)">
 <!ENTITY Ctr_findbar		"Suchleiste">
 <!ENTITY Ctr_findbar_hws	"Suchleiste schließen sobald auf der Seite navigiert wird">
+<!ENTITY Ctr_findbar_width	"Breite der Suchbox">
 <!ENTITY Ctr_findbarpos		"Position der Suchleiste">
 <!ENTITY Ctr_findbar_def	"Unten (Standard)">
 <!ENTITY Ctr_findbar_top	"Oben">
@@ -281,6 +282,7 @@
 <!ENTITY Ctr_autocompl_it	"'Mit ... suchen'- und 'Aufrufen'-Elemente entfernen (falls vorhanden)">
 <!ENTITY Ctr_autocompl_hl	"Hervorhebung von Texttreffern">
 <!ENTITY Ctr_autocompl_rhl	"Blaue 'Aero'-Farben für hervorgehobene Ergebnisse">
+<!ENTITY Ctr_autocompl_not	"Seitentitel verbergen">
 <!ENTITY Ctr_autocompl_sep	"Trennlinie zwischen den Ergebnissen anzeigen">
 <!ENTITY Ctr_urlbar_uc		"'Vereinigte Autovervollständigung' deaktivieren">
 <!ENTITY Ctr_lbsugresi		"Höhenlimit deaktivieren">
diff --git a/xpi/locale/dsb/options.dtd b/xpi/locale/dsb/options.dtd
index bff0314..26382ca 100644
--- a/xpi/locale/dsb/options.dtd
+++ b/xpi/locale/dsb/options.dtd
@@ -152,6 +152,7 @@
 <!ENTITY Ctr_nbisizedelay	"ms (1000 ms = 1 sekunda)">
 <!ENTITY Ctr_findbar		"Pytańska rědka">
 <!ENTITY Ctr_findbar_hws	"Pytańsku rědku zacyniś, gaž bok se kula">
+<!ENTITY Ctr_findbar_width	"Findboxes width">
 <!ENTITY Ctr_findbarpos		"Pozicija pytańskeje rědki">
 <!ENTITY Ctr_findbar_def	"Dołojce (standard)">
 <!ENTITY Ctr_findbar_top	"Górjejce">
@@ -281,6 +282,7 @@
 <!ENTITY Ctr_autocompl_it	"Zapiska 'Pytaś z...' a 'Woglědaś' wótpóraś (jolic eksistěrujotej)">
 <!ENTITY Ctr_autocompl_hl	"Wuzwignjenje tekstowych wótpowědnikow">
 <!ENTITY Ctr_autocompl_rhl	"Aero-barwy za wuzwignjone wuslědki">
+<!ENTITY Ctr_autocompl_not	"Hide page title">
 <!ENTITY Ctr_autocompl_sep	"Źěleńsku liniju mjazy wuslědkami pokazaś">
 <!ENTITY Ctr_urlbar_uc		"Funkciju 'zjadnośone awotwudopołnjenje' znjemóžniś">
 <!ENTITY Ctr_lbsugresi		"Limit wusokosći znjemóžniś">
diff --git a/xpi/locale/el/options.dtd b/xpi/locale/el/options.dtd
index e46480f..856daf9 100644
--- a/xpi/locale/el/options.dtd
+++ b/xpi/locale/el/options.dtd
@@ -152,6 +152,7 @@
 <!ENTITY Ctr_nbisizedelay	"ms (1000 ms = 1 δευτερόλεπτο)">
 <!ENTITY Ctr_findbar		"Γραμμή εύρεσης">
 <!ENTITY Ctr_findbar_hws	"Κλείσιμο γραμμής εύρεσης κατά την κύλιση της σελίδας">
+<!ENTITY Ctr_findbar_width	"Findboxes width">
 <!ENTITY Ctr_findbarpos		"Θέση γραμμής εύρεσης">
 <!ENTITY Ctr_findbar_def	"Κάτω μέρος (προεπιλογή)">
 <!ENTITY Ctr_findbar_top	"Κορυφή">
@@ -281,6 +282,7 @@
 <!ENTITY Ctr_autocompl_it	"Απομάκρυνση στοιχείων «Αναζήτηση με ...» και «Επίσκεψη» (εάν υπάρχουν)">
 <!ENTITY Ctr_autocompl_hl	"Επισήμανση ευρημάτων κειμένου">
 <!ENTITY Ctr_autocompl_rhl	"Χρώματα «Aero» για επισημασμένα αποτελέσματα">
+<!ENTITY Ctr_autocompl_not	"Hide page title">
 <!ENTITY Ctr_autocompl_sep	"Εμφάνιση διαχωριστικού μεταξύ αποτελεσμάτων">
 <!ENTITY Ctr_urlbar_uc		"Απενεργοποίηση χαρακτηριστικού ενιαίας αυτόματης συμπλήρωσης">
 <!ENTITY Ctr_lbsugresi		"Απενεργοποίηση ορίου ύψους">
diff --git a/xpi/locale/en-US/options.dtd b/xpi/locale/en-US/options.dtd
index 4f3473c..9398d8d 100644
--- a/xpi/locale/en-US/options.dtd
+++ b/xpi/locale/en-US/options.dtd
@@ -152,6 +152,7 @@
 <!ENTITY Ctr_nbisizedelay	"ms (1000 ms = 1 sec)">
 <!ENTITY Ctr_findbar		"Findbar">
 <!ENTITY Ctr_findbar_hws	"Close findbar when scrolling page">
+<!ENTITY Ctr_findbar_width	"Findboxes width">
 <!ENTITY Ctr_findbarpos		"Findbar position">
 <!ENTITY Ctr_findbar_def	"Bottom (default)">
 <!ENTITY Ctr_findbar_top	"Top">
@@ -281,6 +282,7 @@
 <!ENTITY Ctr_autocompl_it	"Remove 'Search with...' and 'Visit' items (if present)">
 <!ENTITY Ctr_autocompl_hl	"Highlighting of text hits">
 <!ENTITY Ctr_autocompl_rhl	"Aero colors for highlighted results">
+<!ENTITY Ctr_autocompl_not	"Hide page title">
 <!ENTITY Ctr_autocompl_sep	"Show separator between results">
 <!ENTITY Ctr_urlbar_uc		"Disable 'unified autocomplete' feature">
 <!ENTITY Ctr_lbsugresi		"Disable height limit">
diff --git a/xpi/locale/es/options.dtd b/xpi/locale/es/options.dtd
index 3c5ced2..1a126d2 100644
--- a/xpi/locale/es/options.dtd
+++ b/xpi/locale/es/options.dtd
@@ -152,6 +152,7 @@
 <!ENTITY Ctr_nbisizedelay	"ms (1000 ms = 1 seg)">
 <!ENTITY Ctr_findbar		"Barra de herramientas de búsqueda">
 <!ENTITY Ctr_findbar_hws	"Cerrar la barra de herramientas de búsqueda al desplazar la página">
+<!ENTITY Ctr_findbar_width	"Findboxes width">
 <!ENTITY Ctr_findbarpos		"Posición en la ventana de la barra de herramientas de búsqueda">
 <!ENTITY Ctr_findbar_def	"Abajo (predeterminada)">
 <!ENTITY Ctr_findbar_top	"Arriba">
@@ -282,6 +283,7 @@
 <!ENTITY Ctr_autocompl_it	"Eliminar los elementos 'Buscar con...' y 'Visitar' (si están presentes)">
 <!ENTITY Ctr_autocompl_hl	"Marcado de coincidencias">
 <!ENTITY Ctr_autocompl_rhl	"Colores Aero para resultados destacados">
+<!ENTITY Ctr_autocompl_not	"Hide page title">
 <!ENTITY Ctr_autocompl_sep	"Mostrar separador entre resultados">
 <!ENTITY Ctr_lbsugresi		"Deshabilitar límite de altura">
 <!ENTITY Ctr_cresultshcb	"Límite de altura personalizado: ">
diff --git a/xpi/locale/et/options.dtd b/xpi/locale/et/options.dtd
index 33c680b..43d12d7 100644
--- a/xpi/locale/et/options.dtd
+++ b/xpi/locale/et/options.dtd
@@ -152,6 +152,7 @@
 <!ENTITY Ctr_nbisizedelay	"ms (1000 ms = 1 sekund)">
 <!ENTITY Ctr_findbar		"Leidmisriba">
 <!ENTITY Ctr_findbar_hws	"Lehte kerides sulge leidmisriba">
+<!ENTITY Ctr_findbar_width	"Findboxes width">
 <!ENTITY Ctr_findbarpos		"Leidmisriba asukoht">
 <!ENTITY Ctr_findbar_def	"All (vaikimisi)">
 <!ENTITY Ctr_findbar_top	"Üleval">
@@ -281,6 +282,7 @@
 <!ENTITY Ctr_autocompl_it	"Eemalda kirjed 'Otsi otsingumootoriga...' ja 'Külasta' (kui on)">
 <!ENTITY Ctr_autocompl_hl	"Sisestatule vastava teksti esiletõstmine">
 <!ENTITY Ctr_autocompl_rhl	"Aero värvid esiletõstetud tulemuste tähistamiseks">
+<!ENTITY Ctr_autocompl_not	"Hide page title">
 <!ENTITY Ctr_autocompl_sep	"Näita tulemuste vahel eraldusjooni">
 <!ENTITY Ctr_urlbar_uc		"Keela ühtse automaatlõpetamise funktsioon 'unified autocomplete'">
 <!ENTITY Ctr_lbsugresi		"Keela kõrguse piirang">
diff --git a/xpi/locale/fr/options.dtd b/xpi/locale/fr/options.dtd
index 1d6075e..8a55c53 100644
--- a/xpi/locale/fr/options.dtd
+++ b/xpi/locale/fr/options.dtd
@@ -1,7 +1,7 @@
 <!ENTITY % overlayDTD
     SYSTEM "chrome://classic_theme_restorer/content/overlay.dtd">
   %overlayDTD;
-<!-- Ne pas éditer au-dessus de cette ligne, et ne pas modifier la variable « &brandShortName; » à l'intérieur des chaînes de caractères traduites -->
+<!-- Do not edit above this line and do not edit the variable '&brandShortName;' inside translated strings -->
 
 <!ENTITY Ctr_title			"Classic Theme Restorer">
 
@@ -48,7 +48,7 @@
 <!ENTITY Ctr_tabwidthcla	"(classique)">
 <!ENTITY Ctr_tabminheight	"Hauteur :">
 <!ENTITY Ctr_tabheightinfo	"Des valeurs faibles causeront des erreurs dans le mode « Agrandi » !">
-<!ENTITY Ctr_ctrltabprev	"Preview tabs using 'Ctrl + Tab'">
+<!ENTITY Ctr_ctrltabprev	"Prévisualiser les onglets avec « Ctrl + Tab »">
 <!ENTITY Ctr_tabmaxwidth	"Largeur maximale :">
 <!ENTITY Ctr_tabminwidth	"Largeur minimale :">
 <!ENTITY Ctr_tabwidthinfo	"La largeur des onglets est contrôlée par Tab Mix Plus.">
@@ -124,7 +124,7 @@
 <!ENTITY Ctr_altoptionsw	"Ouvrir dans une fenêtre">
 <!ENTITY Ctr_altoptionsww	"Largeur :">
 <!ENTITY Ctr_altoptionswh	"Hauteur :">
-<!ENTITY Ctr_altoptionsi	"La fenêtre simulée des options n'est plus une boite de dialogue mais une « fenêtre du navigateur » avec toutes les barres d'outils masquées. La fonctionnalité « Utiliser la page actuelle » ajoute seulement les URL des pages ouvertes dans la fenêtre actuelle, qui est uniquement « about:preferences » dans ce cas. Le bouton de barre d'outils « Options » est remplacé par un nouveau afin de pouvoir ouvrir les options dans une fenêtre.">
+<!ENTITY Ctr_altoptionsi	"La fenêtre simulée des options n'est plus une boite de dialogue mais une fenêtre du navigateur avec toutes les barres d'outils masquées. La fonctionnalité « Utiliser la page actuelle » ajoute seulement les URL des pages ouvertes dans la fenêtre actuelle, qui est uniquement « about:preferences » dans ce cas. Le bouton de barre d'outils « Options » est remplacé par un nouveau afin de pouvoir ouvrir les options dans une fenêtre.">
 <!ENTITY Ctr_options_rem	"Mémoriser la dernière catégorie sélectionnée">
 <!ENTITY Ctr_aboutpages		"Certaines pages « about: » : apparence alternative">
 <!ENTITY Ctr_svgfilters		"Couleurs SVG pour les icônes des boutons de barres d'outils par défaut">
@@ -150,8 +150,9 @@
 <!ENTITY Ctr_navlargeicons	"Grandes icônes">
 <!ENTITY Ctr_nbisizedelay0	"">
 <!ENTITY Ctr_nbisizedelay	"ms (1000 ms = 1 s) de retard d'initialisation, au démarrage du navigateur">
-<!ENTITY Ctr_findbar		"Findbar">
-<!ENTITY Ctr_findbar_hws	"Close findbar when scrolling page">
+<!ENTITY Ctr_findbar		"Barre de recherche">
+<!ENTITY Ctr_findbar_hws	"Fermer la barre de recherche lors du défilement de la page">
+<!ENTITY Ctr_findbar_width	"Findboxes width">
 <!ENTITY Ctr_findbarpos		"Position de la barre de recherche :">
 <!ENTITY Ctr_findbar_def	"En bas (par défaut)">
 <!ENTITY Ctr_findbar_top	"En haut">
@@ -178,7 +179,7 @@
 <!ENTITY Ctr_osearch_dm		"Réduire la taille du bouton de liste déroulante">
 <!ENTITY Ctr_addonmanager	"Gestionnaire de modules">
 <!ENTITY Ctr_alt_addonsp	"Page « Plus » : ordre alternatif">
-<!ENTITY Ctr_am_showrecup	"Always show 'Recent updates' category">
+<!ENTITY Ctr_am_showrecup	"Toujours afficher la catégorie « Mises à jour récentes »">
 <!ENTITY Ctr_alt_addonsm	"Apparence alternative">
 <!ENTITY Ctr_am_nowarning	"Listes de modules : masquer les avertissements">
 <!ENTITY Ctr_am_compact		"Listes de modules : vue compacte">
@@ -192,7 +193,7 @@
 <!ENTITY Ctr_hiderecentbm	"Menu déroulant des marque-pages : masquer les marque-pages récemment ajoutés">
 <!ENTITY Ctr_hideeditbm		"Étoile des marque-pages : masquer le menu déroulant (si la page n'a pas été marquée)">
 <!ENTITY Ctr_oldplacesbut	"Éléments et dossiers de marque-pages sur une barre d'outil : ancienne apparence">
-<!ENTITY Ctr_dl_pm_drop		"Download buttons panel: show dropmarker">
+<!ENTITY Ctr_dl_pm_drop		"Panneau du bouton d'état du téléchargement : afficher la flèche de menu déroulant">
 <!ENTITY Ctr_bmbutpanelm	"Menu déroulant : apparence de menu de type « panneau »">
 <!ENTITY Ctr_bmbunsortbm	"Menu déroulant : menu « Autres marque-pages »">
 <!ENTITY Ctr_bmbunsortbm2	"Menu au-dessus des marque-pages">
@@ -241,9 +242,9 @@
 <!ENTITY Ctr_bold			"Gras">
 <!ENTITY Ctr_italic			"Italique">
 <!ENTITY Ctr_underlined		"Souligné">
-<!ENTITY Ctr_notabhov		"Les paramètres activés supplantent les paramètres « Survolé »">
-<!ENTITY Ctr_tablowopa		"Reduce tab visibility">
-<!ENTITY Ctr_tabc_act_tb	"Couleur d'arrière-plan pour les barres d'outils">
+<!ENTITY Ctr_notabhov		"Remplacer les paramètres « Survolé » par les paramètres activés">
+<!ENTITY Ctr_tablowopa		"Réduire la visibilité">
+<!ENTITY Ctr_tabc_act_tb	"Utiliser la couleur d'arrière-plan pour les barres d'outils">
 
 <!ENTITY Ctr_urlbar			"Barre d'adresse">
 <!ENTITY Ctr_starinurl		"Afficher l'étoile">
@@ -282,6 +283,7 @@
 <!ENTITY Ctr_autocompl_it	"Supprimer les éléments « Rechercher avec » et « Consulter » (si présents)">
 <!ENTITY Ctr_autocompl_hl	"Mettre les correspondances de texte dans les résultats en :">
 <!ENTITY Ctr_autocompl_rhl	"Utiliser des couleurs Aero pour les résultats surlignés">
+<!ENTITY Ctr_autocompl_not	"Hide page title">
 <!ENTITY Ctr_autocompl_sep	"Afficher un séparateur entre les résultats">
 <!ENTITY Ctr_lbsugresi		"Désactiver la limite de hauteur">
 <!ENTITY Ctr_cresultshcb	"Limite de hauteur personnalisée :">
@@ -339,7 +341,7 @@
 <!ENTITY Ctr_nonavbarbg2	"Toutes les barres d'outils en mode « Interface Réduite » du module « Beyond Australis » sont affectées.">
 <!ENTITY Ctr_nonavborder	"Ajouter une bordure supérieure à la barre d'outils">
 <!ENTITY Ctr_nonavtbborder	"Barres d'outils supérieures : enlever les bordures">
-<!ENTITY Ctr_toptb_oldpad	"Top toolbars: old left and right padding">
+<!ENTITY Ctr_toptb_oldpad	"Barres d'outils supérieures : utiliser les anciens espacements à gauche et à droite">
 <!ENTITY Ctr_hidesbclose	"Barres latérales : masquer le bouton de fermeture">
 <!ENTITY Ctr_notextshadow	"Masquer l'ombre du texte de barre d'outils ainsi que l'ombre du texte des onglets">
 <!ENTITY Ctr_chevronfix		"Barre de navigation : masquer le bouton « Plus d'outils »">
@@ -407,21 +409,21 @@
 <!ENTITY appMenuGettingStarted.label	"Commencer">
 <!ENTITY goCmd.label					"Se rendre à la page indiquée dans la barre d'adresse">
 <!ENTITY Ctr_menu_restart.label			"Redémarrer">
-<!ENTITY Ctr_restartapp					"Afficher « Redémarrer » dans le menu « Fichier » et dans le menu de l'ancien bouton &brandShortName;">
+<!ENTITY Ctr_restartapp					"Afficher « Redémarrer » dans le menu « Fichier » et dans celui de l'ancien bouton &brandShortName;">
 <!ENTITY Ctr_ctrnewinv					"Souligner les nouvelles options de la version actuelle de &brandShortName;">
 
 <!ENTITY Ctr_openInCurrentTab			"Ouvrir les entrées dans l'onglet actuel">
 <!ENTITY Ctr_openInNewTab				"Ouvrir les entrées dans un nouvel onglet">
 <!ENTITY Ctr_openInNewWindow			"Ouvrir les entrées dans une nouvelle fenêtre">
 
-<!-- Pour les entrées contextuelles des pages. Doivent être adaptées pour chaque langue ! -->
+<!-- For page context entries. Have to be adjusted for every locale! -->
 <!ENTITY backCmd.accesskey				"d">
 <!ENTITY forwardCmd.accesskey			"a">
 <!ENTITY reloadCmd.accesskey			"c">
 <!ENTITY stopCmd.accesskey				"r">
 <!ENTITY bookmarkPageCmd2.accesskey		"M">
 
-<!-- Entitées de secours. Laisser vide ! -->
+<!-- Fallback entities. Leave empty! -->
 <!ENTITY openCmd.commandkey				"">
 <!ENTITY urlbar.accesskey				"">
 <!ENTITY urlbar.placeholder2			"">
\ No newline at end of file
diff --git a/xpi/locale/hsb/options.dtd b/xpi/locale/hsb/options.dtd
index bb870e4..c900bf7 100644
--- a/xpi/locale/hsb/options.dtd
+++ b/xpi/locale/hsb/options.dtd
@@ -152,6 +152,7 @@
 <!ENTITY Ctr_nbisizedelay	"ms (1000 ms = 1 sekunda)">
 <!ENTITY Ctr_findbar		"Pytanska lajsta">
 <!ENTITY Ctr_findbar_hws	"Pytanske polo začinić, hdyž so strona kula">
+<!ENTITY Ctr_findbar_width	"Findboxes width">
 <!ENTITY Ctr_findbarpos		"Pozicijia pytanskeje lajsty">
 <!ENTITY Ctr_findbar_def	"Deleka (standard)">
 <!ENTITY Ctr_findbar_top	"Horjeka">
@@ -281,6 +282,7 @@
 <!ENTITY Ctr_autocompl_it	"Zapiski 'Pytać z...' and 'Wopytać' wotstronić (jeli eksistujetej)">
 <!ENTITY Ctr_autocompl_hl	"Wuzběhnjenje tekstowych wotpowědnikow">
 <!ENTITY Ctr_autocompl_rhl	"Aero-barby za wuzběhnjene wuslědki">
+<!ENTITY Ctr_autocompl_not	"Hide page title">
 <!ENTITY Ctr_autocompl_sep	"Dźělatko mjez wuslědkami pokazać">
 <!ENTITY Ctr_urlbar_uc		"Funkciju 'Zjednoćene awtowudospołnjenje' znjemóžnić">
 <!ENTITY Ctr_lbsugresi		"Limit wysokosće znjemóžnić">
diff --git a/xpi/locale/it/options.dtd b/xpi/locale/it/options.dtd
index eafa34c..197c98e 100644
--- a/xpi/locale/it/options.dtd
+++ b/xpi/locale/it/options.dtd
@@ -152,6 +152,7 @@
 <!ENTITY Ctr_nbisizedelay	"ms (1000 ms = 1 sec)">
 <!ENTITY Ctr_findbar		"Findbar">
 <!ENTITY Ctr_findbar_hws	"Close findbar when scrolling page">
+<!ENTITY Ctr_findbar_width	"Findboxes width">
 <!ENTITY Ctr_findbarpos		"Posizione della barra di ricerca nel testo">
 <!ENTITY Ctr_findbar_def	"Posizione predefinita">
 <!ENTITY Ctr_findbar_top	"In alto">
@@ -281,6 +282,7 @@
 <!ENTITY Ctr_autocompl_it	"Remove 'Search with...' and 'Visit' items (if present)">
 <!ENTITY Ctr_autocompl_hl	"Evidenziamento del testo dei risultati">
 <!ENTITY Ctr_autocompl_rhl	"Aero colors for highlighted results">
+<!ENTITY Ctr_autocompl_not	"Hide page title">
 <!ENTITY Ctr_autocompl_sep	"Mostra i separatori tra i risultati">
 <!ENTITY Ctr_urlbar_uc		"Disattiva il completamento automatico">
 <!ENTITY Ctr_lbsugresi		"Disattiva il limite di altezza">
diff --git a/xpi/locale/ja/options.dtd b/xpi/locale/ja/options.dtd
index b5f3a2d..ee41b8e 100644
--- a/xpi/locale/ja/options.dtd
+++ b/xpi/locale/ja/options.dtd
@@ -152,6 +152,7 @@
 <!ENTITY Ctr_nbisizedelay	"㍉秒 (1 秒 ＝ 1000 ㍉秒)">
 <!ENTITY Ctr_findbar		"検索バー">
 <!ENTITY Ctr_findbar_hws	"ページをスクロールしたら検索バーを閉じる">
+<!ENTITY Ctr_findbar_width	"検索ボックスの横幅">
 <!ENTITY Ctr_findbarpos		"検索バー">
 <!ENTITY Ctr_findbar_def	"デフォルト位置">
 <!ENTITY Ctr_findbar_top	"上に表示">
@@ -281,6 +282,7 @@
 <!ENTITY Ctr_autocompl_it	"「…で検索」と「…を開く」を表示しない (可能ならば)">
 <!ENTITY Ctr_autocompl_hl	"一致部分を強調表示する">
 <!ENTITY Ctr_autocompl_rhl	"検索結果のハイライト色を Aero カラーにする">
+<!ENTITY Ctr_autocompl_not	"Hide page title">
 <!ENTITY Ctr_autocompl_sep	"結果を境界線で区切る">
 <!ENTITY Ctr_urlbar_uc		"検索候補機能を統合しない">
 <!ENTITY Ctr_lbsugresi		"候補数を制限しない">
diff --git a/xpi/locale/pl/options.dtd b/xpi/locale/pl/options.dtd
index f97b73a..1a86f94 100644
--- a/xpi/locale/pl/options.dtd
+++ b/xpi/locale/pl/options.dtd
@@ -152,6 +152,7 @@
 <!ENTITY Ctr_nbisizedelay	"ms (1000 ms = 1 s)">
 <!ENTITY Ctr_findbar		"Pasek wyszukiwania">
 <!ENTITY Ctr_findbar_hws	"Zamknij pasek wyszukiwania przy przewijaniu strony">
+<!ENTITY Ctr_findbar_width	"Szerokość pola wyszukiwania">
 <!ENTITY Ctr_findbarpos		"Pozycja paska wyszukiwania">
 <!ENTITY Ctr_findbar_def	"Dolna (domyślna)">
 <!ENTITY Ctr_findbar_top	"Górna">
@@ -281,6 +282,7 @@
 <!ENTITY Ctr_autocompl_it	"Usuń elementy 'szukaj w...' oraz 'otwórz stronę' (jeżeli obecne)">
 <!ENTITY Ctr_autocompl_hl	"Podświetlanie wystąpień tekstu">
 <!ENTITY Ctr_autocompl_rhl	"Kolory Aero dla podświetlonych wyników">
+<!ENTITY Ctr_autocompl_not	"Hide page title">
 <!ENTITY Ctr_autocompl_sep	"Pokaż separator pomiędzy wynikami">
 <!ENTITY Ctr_urlbar_uc		"Wyłącz funkcję 'ujednolicone autouzupełnianie'">
 <!ENTITY Ctr_lbsugresi		"Wyłącz ograniczenie wysokości">
diff --git a/xpi/locale/pt-BR/options.dtd b/xpi/locale/pt-BR/options.dtd
index 3f1846a..c6261e5 100644
--- a/xpi/locale/pt-BR/options.dtd
+++ b/xpi/locale/pt-BR/options.dtd
@@ -152,6 +152,7 @@
 <!ENTITY Ctr_nbisizedelay	"msegs. (1000 msegs. = 1 seg.)">
 <!ENTITY Ctr_findbar		"Findbar">
 <!ENTITY Ctr_findbar_hws	"Close findbar when scrolling page">
+<!ENTITY Ctr_findbar_width	"Findboxes width">
 <!ENTITY Ctr_findbarpos		"Barra de pesquisas">
 <!ENTITY Ctr_findbar_def	"Posição padrão">
 <!ENTITY Ctr_findbar_top	"Posição no topo">
@@ -281,6 +282,7 @@
 <!ENTITY Ctr_autocompl_it	"Remover itens 'Pesquisar com...' e 'Visitar' itens (se presente)">
 <!ENTITY Ctr_autocompl_hl	"Realçar ocorrências do texto">
 <!ENTITY Ctr_autocompl_rhl	"Cores Aero para resultados realçados">
+<!ENTITY Ctr_autocompl_not	"Hide page title">
 <!ENTITY Ctr_autocompl_sep	"Exibir separador entre resultados">
 <!ENTITY Ctr_urlbar_uc		"Desativar recurso 'auto completar unificado'">
 <!ENTITY Ctr_lbsugresi		"Desativar limite de altura">
diff --git a/xpi/locale/ru/options.dtd b/xpi/locale/ru/options.dtd
index 3fc6528..29e06a3 100644
--- a/xpi/locale/ru/options.dtd
+++ b/xpi/locale/ru/options.dtd
@@ -152,6 +152,7 @@
 <!ENTITY Ctr_nbisizedelay	"мс (1000 мс = 1 сек)">
 <!ENTITY Ctr_findbar		"Панель поиска">
 <!ENTITY Ctr_findbar_hws	"Закрывать панель поиска при прокрутке страницы">
+<!ENTITY Ctr_findbar_width	"Findboxes width">
 <!ENTITY Ctr_findbarpos		"Положение панели поиска">
 <!ENTITY Ctr_findbar_def	"внизу (по умолчанию)">
 <!ENTITY Ctr_findbar_top	"вверху">
@@ -281,6 +282,7 @@
 <!ENTITY Ctr_autocompl_it	"Удалить пункты «Искать в...» и «Посетить» (при наличии)">
 <!ENTITY Ctr_autocompl_hl	"Выделение текстовых результатов">
 <!ENTITY Ctr_autocompl_rhl	"«Aero» цвета выделения результатов">
+<!ENTITY Ctr_autocompl_not	"Hide page title">
 <!ENTITY Ctr_autocompl_sep	"Разделитель между результатами">
 <!ENTITY Ctr_urlbar_uc		"Отключить функцию автозавершения">
 <!ENTITY Ctr_lbsugresi		"Отключить ограничение по высоте">
diff --git a/xpi/locale/sl/options.dtd b/xpi/locale/sl/options.dtd
index 8e963b8..a387c7e 100644
--- a/xpi/locale/sl/options.dtd
+++ b/xpi/locale/sl/options.dtd
@@ -152,6 +152,7 @@
 <!ENTITY Ctr_nbisizedelay	"ms (1000 ms = 1 s)">
 <!ENTITY Ctr_findbar		"Iskalna vrstica">
 <!ENTITY Ctr_findbar_hws	"Zapri iskalno vrstico ob pomikanju po strani">
+<!ENTITY Ctr_findbar_width	"Findboxes width">
 <!ENTITY Ctr_findbarpos		"Položaj iskalne vrstice">
 <!ENTITY Ctr_findbar_def	"Spodaj (privzeto)">
 <!ENTITY Ctr_findbar_top	"Zgoraj">
@@ -281,6 +282,7 @@
 <!ENTITY Ctr_autocompl_it	"Odstrani predmeta 'Išči s/z …' in 'Obišči' (če sta prisotna)">
 <!ENTITY Ctr_autocompl_hl	"Označevanje zadetkov">
 <!ENTITY Ctr_autocompl_rhl	"Barve Aero za poudarjene rezultate">
+<!ENTITY Ctr_autocompl_not	"Hide page title">
 <!ENTITY Ctr_autocompl_sep	"Prikaži ločilo med rezultati">
 <!ENTITY Ctr_urlbar_uc		"Onemogoči značilnost 'poenotenega samodokončevanja'">
 <!ENTITY Ctr_lbsugresi		"Onemogoči omejitev višine">
diff --git a/xpi/locale/uk/options.dtd b/xpi/locale/uk/options.dtd
index 8f3adb1..dba99dd 100644
--- a/xpi/locale/uk/options.dtd
+++ b/xpi/locale/uk/options.dtd
@@ -1,4 +1,4 @@
-<!ENTITY % overlayDTD
+<!ENTITY % overlayDTD
     SYSTEM "chrome://classic_theme_restorer/content/overlay.dtd">
   %overlayDTD;
 <!-- Do not edit above this line and do not edit the variable '&brandShortName;' inside translated strings -->
@@ -12,7 +12,7 @@
 <!ENTITY Ctr_separator		"Розділювач">
 <!ENTITY Ctr_navthrobber	"Індикатор активності">
 <!ENTITY Ctr_sidebarbutton	"Бокова панель">
-<!ENTITY Ctr_windowcontrols	"мін/макс/закрити (Повний екран)">
+<!ENTITY Ctr_windowcontrols	"мін/макс/закрити (повний екран)">
 <!ENTITY Ctr_rr				"Перезапустіть &brandShortName;!">
 <!ENTITY Ctr_window			"вікно">
 
@@ -48,7 +48,7 @@
 <!ENTITY Ctr_tabwidthcla	"(класичний)">
 <!ENTITY Ctr_tabminheight	"Висота:">
 <!ENTITY Ctr_tabheightinfo	"Низькі значення викличуть збої у розгорнутому режимі!">
-<!ENTITY Ctr_ctrltabprev	"Preview tabs using 'Ctrl + Tab'">
+<!ENTITY Ctr_ctrltabprev	"Передогляд вкладок з «Ctrl + Tab»">
 <!ENTITY Ctr_tabmaxwidth	"Макс.ширина:">
 <!ENTITY Ctr_tabminwidth	"Мін.ширина:">
 <!ENTITY Ctr_tabwidthinfo	"Мінімальна та максимальна ширина вкладок контролюються за допомогою TabMixPlus">
@@ -86,7 +86,7 @@
 <!ENTITY Ctr_appbutton2io	"Кнопка на панелі заголовку &brandShortName; (тільки іконка)">
 <!ENTITY Ctr_paneluibtweak	"Оранжева кнопка меню на панелі вкладок">
 <!ENTITY Ctr_paneluibtweak2	"Оранжева кнопка меню на панелі вкладок (тільки іконка)">
-<!ENTITY Ctr_paneluibtweak3	" ">
+<!ENTITY Ctr_paneluibtweak3	"...коли на панелі вкладок">
 <!ENTITY Ctr_appbuttonc_o	"Оранжева кнопка (типово)">
 <!ENTITY Ctr_appbuttonc_a	"Синя кнопка (Aurora)">
 <!ENTITY Ctr_appbuttonc_n	"Чорна кнопка (Nightly)">
@@ -126,7 +126,7 @@
 <!ENTITY Ctr_altoptionswh	"Висота">
 <!ENTITY Ctr_altoptionsi	"Вікно змодельованих параметрів не є більше діалогом, але «вікно браузера» з усіма панелями інструментів приховані. Функція «Використовувати поточну сторінку» тільки додає URL-адреси сторінок, відкритих в поточному вікні, які є тільки «about:preferences» в цьому випадку. Кнопка «Параметри» панелі інструментів замінюється на нову, щоб бути в змозі відкрити параметри у вікні.">
 <!ENTITY Ctr_options_rem	"Пам’ятати останню обрану категорію">
-<!ENTITY Ctr_aboutpages		"General 'about:' pages: alternative appearance">
+<!ENTITY Ctr_aboutpages		"Основні «about:» сторінки: альтернативний вигляд">
 <!ENTITY Ctr_svgfilters		"SVG кольори для типових іконок кнопок панелі інструментів">
 <!ENTITY Ctr_wincontrols	"Рухоме управління повноекранним режимом">
 <!ENTITY Ctr_puibuttonsep	"Розділювач кнопки меню">
@@ -150,8 +150,9 @@
 <!ENTITY Ctr_navlargeicons	"Великі іконки">
 <!ENTITY Ctr_nbisizedelay0	"Затримка виконання">
 <!ENTITY Ctr_nbisizedelay	"мс (1000 мс = 1 сек)">
-<!ENTITY Ctr_findbar		"Findbar">
-<!ENTITY Ctr_findbar_hws	"Close findbar when scrolling page">
+<!ENTITY Ctr_findbar		"Панель пошуку">
+<!ENTITY Ctr_findbar_hws	"Закрити панель пошуку, коли прокручується сторінка">
+<!ENTITY Ctr_findbar_width	"Findboxes width">
 <!ENTITY Ctr_findbarpos		"Панель пошуку">
 <!ENTITY Ctr_findbar_def	"Типова позиція">
 <!ENTITY Ctr_findbar_top	"Нагорі">
@@ -178,7 +179,7 @@
 <!ENTITY Ctr_osearch_dm		"Мала позначка випадного списку">
 <!ENTITY Ctr_addonmanager	"Менеджер додатків">
 <!ENTITY Ctr_alt_addonsp	"Сторінка «Детальніше» в Додатках: альтернативний вигляд">
-<!ENTITY Ctr_am_showrecup	"Always show 'Recent updates' category">
+<!ENTITY Ctr_am_showrecup	"Завжди показувати категорію «Недавні оновлення»">
 <!ENTITY Ctr_alt_addonsm	"Менеджер додатків: альтернативний вигляд">
 <!ENTITY Ctr_am_nowarning	"Список додатків у Менеджері додатків: приховати попередження">
 <!ENTITY Ctr_am_compact		"Список додатків: компактний вигляд">
@@ -191,8 +192,8 @@
 <!ENTITY Ctr_bmbutton		"Кнопка меню закладок">
 <!ENTITY Ctr_hiderecentbm	"Спливаюче вікно закладок: приховати недавно додані закладки">
 <!ENTITY Ctr_hideeditbm		"Зірка закладок: приховати спливаюче вікно (якщо сторінка не закладена)">
-<!ENTITY Ctr_oldplacesbut	"Bookmark items and folders on toolbar: old appearance">
-<!ENTITY Ctr_dl_pm_drop		"Download buttons panel: show dropmarker">
+<!ENTITY Ctr_oldplacesbut	"Пункти та теки закладок на панелі: старий вигляд">
+<!ENTITY Ctr_dl_pm_drop		"Панель кнопок завантаження: показати позначку випадного списку">
 <!ENTITY Ctr_bmbutpanelm	"Спливаюче вікно: вигляд меню панелі">
 <!ENTITY Ctr_bmbunsortbm	"Спливаюче вікно: субменю «несортованих закладок»">
 <!ENTITY Ctr_bmbunsortbm2	"Меню над закладками">
@@ -218,7 +219,7 @@
 <!ENTITY Ctr_navthrobber2	"Додати адресу або залишити порожнім">
 <!ENTITY Ctr_anewtaburl		"Адреса сторінки в новій вкладці">
 <!ENTITY Ctr_anewtaburlcb	"Налаштовувана адреса сторінки в новій вкладці (за замовчуванням: 'about:newtab')">
-<!ENTITY Ctr_anewtaburlpcb	"Custom private new tab page url (default: 'about:privatebrowsing')">
+<!ENTITY Ctr_anewtaburlpcb	"Налаштовувана адреса в приватній новій вкладці (default: 'about:privatebrowsing')">
 
 <!ENTITY Ctr_tab_tf_info1	"Назви кольорів, hex коди, rgb(a) та hsl(a) величини підтримуються.">
 <!ENTITY Ctr_tab_tf_info2	"Введене не буде перевірятися!">
@@ -242,7 +243,7 @@
 <!ENTITY Ctr_italic			"Курсив">
 <!ENTITY Ctr_underlined		"Підкреслений">
 <!ENTITY Ctr_notabhov		"Увімкнені налаштування скасовують налаштування «в очікуванні»">
-<!ENTITY Ctr_tablowopa		"Reduce tab visibility">
+<!ENTITY Ctr_tablowopa		"Зменшити видимість вкладки">
 <!ENTITY Ctr_tabc_act_tb	"Колір тла на панелях">
 
 <!ENTITY Ctr_urlbar			"Панель рядку адреси">
@@ -256,7 +257,7 @@
 <!ENTITY Ctr_urlbardropm	"Рухати позначку випадного списку в останню можливу позицію">
 <!ENTITY Ctr_urlbardropm2	"Зробити позначку випадного списку завжди видимою">
 <!ENTITY Ctr_altreaderico	"Альтернативні іконки «Читача»">
-<!ENTITY Ctr_hideurlzoom	"Hide zoom button (if present)">
+<!ENTITY Ctr_hideurlzoom	"Приховати кнопку зміни розміру (якщо є)">
 <!ENTITY Ctr_hideprbutton	"Приховати інфо кнопку «спливаюче вікно блоковано»">
 <!ENTITY Ctr_locsearchbw10	"Зменшити висоту панелей рядку адреси та пошуку (експериментальне)">
 <!ENTITY Ctr_urlbar_ib		"Індикатори справжності панелі рядку адреси">
@@ -280,11 +281,12 @@
 <!ENTITY Ctr_altautocompl	"Альтернативний вигляд">
 <!ENTITY Ctr_autocompl_it	"Усунути пункти «Шукати з...» та «Відвідати» (якщо присутні)">
 <!ENTITY Ctr_autocompl_hl	"Виділення текстових результатів">
-<!ENTITY Ctr_autocompl_rhl	"Aero colors for highlighted results">
+<!ENTITY Ctr_autocompl_rhl	"Кольори Aero для виділених результатів">
+<!ENTITY Ctr_autocompl_not	"Hide page title">
 <!ENTITY Ctr_autocompl_sep	"Показати розділювач між результатами">
 <!ENTITY Ctr_urlbar_uc		"Вимкнути функцію «автозаповнення»">
 <!ENTITY Ctr_lbsugresi		"Вимкнути обмеження висоти">
-<!ENTITY Ctr_cresultshcb	"Custom height limit: ">
+<!ENTITY Ctr_cresultshcb	"Налаштовуване обмеження висоти: ">
 <!ENTITY Ctr_lbsugres		"Кількість результатів">
 <!ENTITY Ctr_lbsbradius		"Налаштовуваний радіус рамки для панелей адреси та пошуку">
 
@@ -306,11 +308,11 @@
 
 <!ENTITY Ctr_toolbars		"Налаштування панелі">
 <!ENTITY Ctr_dblclnewtab	"Подвійний клік відкриває нову вкладку">
-<!ENTITY Ctr_dblclnewtabdes	"Not suitable for all complete themes while Windows titlebar is active.">
+<!ENTITY Ctr_dblclnewtabdes	"Не підходить для повних тем поки панель заголовку Windows є активною.">
 <!ENTITY Ctr_hidetbwot		"Приховувати панель вкладок з одною вкладкою">
 <!ENTITY Ctr_hidetbwote		"Зменшити затримки приховування при запуску">
 <!ENTITY Ctr_hidetbwote_i	"Може викликати перебої на панелі вкладок">
-<!ENTITY Ctr_hidetbwote2	"Automatically adjust titlebar space">
+<!ENTITY Ctr_hidetbwote2	"Автоматично налаштувати простір панелі заголовку">
 <!ENTITY Ctr_notabfog		"Прибрати затуманення тла (Windows AeroGlass/8)">
 <!ENTITY Ctr_notabbg		"Прибрати колір тла (Windows AeroGlass/8)">
 <!ENTITY Ctr_hightabpos		"Зменшити простір над панеллю інструментів (якщо можливо)">
@@ -339,7 +341,7 @@
 <!ENTITY Ctr_nonavbarbg2	"Всі панелі Slim Chrome додатку «Beyond Australis» пошкоджено.">
 <!ENTITY Ctr_nonavborder	"Панель закладок: додати верхню межу для панелі інструментів">
 <!ENTITY Ctr_nonavtbborder	"Верхні панелі інструментів: прибрати межі панелі">
-<!ENTITY Ctr_toptb_oldpad	"Top toolbars: old left and right padding">
+<!ENTITY Ctr_toptb_oldpad	"Верхні панелі: старі лівий і правий відступи">
 <!ENTITY Ctr_hidesbclose	"Бокові панелі: приховати кнопку «Закрити» бокової панелі">
 <!ENTITY Ctr_notextshadow	"Панелі: приховати тінь тексту панелі та тексту вкладки">
 <!ENTITY Ctr_chevronfix		"Панель навігації: приховати подвійну стрілку («шеврон») в кінці панелі">
@@ -380,8 +382,8 @@
 <!ENTITY Ctr_e_findbarhl	"Підсвічування в пошуковій панелі">
 <!ENTITY Ctr_fx50findbarhl	"Вимкнення цього параметру усуває «підсвічувальні» особливості пошукової панелі.">
 <!ENTITY Ctr_e_flyweb		"Flyweb">
-<!ENTITY Ctr_e_oneoffsearch	"Autocomplete popups search selection">
-<!ENTITY Ctr_fx51OOSeach	"Unchecking this preference removes search selection from location bars autocomplete popup.">
+<!ENTITY Ctr_e_oneoffsearch	"Автозавершення спливаючих вікон пошукового вибору">
+<!ENTITY Ctr_fx51OOSeach	"Вимкнення цього параметру усуває пошуковий вибір зі спливаючого вікна панелей розташування.">
 
 
 <!ENTITY Ctr_pw_settings	"Налаштування">
@@ -396,19 +398,19 @@
 <!ENTITY Ctr_special_font	"Налаштування кольору тла - тільки для типової теми!">
 <!ENTITY Ctr_special_info	"Деякі параметри не можуть запропонувати візуальні зміни в усіх випадках">
 <!ENTITY Ctr_special_info2	"Налаштування зроблені для типової теми &brandShortName; і не можуть працювати з усіма сторонніми темами!">
-<!ENTITY Ctr_special_acr	"Only report issues through official support channels and not by using 'Add-on Compatibility Reporter'!">
-<!ENTITY Ctr_support		"Support">
-<!ENTITY Ctr_support_forum1	"MozillaZine (English forum)">
-<!ENTITY Ctr_support_forum2	"Camp Firefox (German forum)">
-<!ENTITY Ctr_github_issues	"Report issue on Github">
-<!ENTITY Ctr_newversion		"Check for new version">
+<!ENTITY Ctr_special_acr	"Доповідайте про проблеми тільки через офіційні канали підтримки і не використовуйте «Доповідач сумісності додатків»!">
+<!ENTITY Ctr_support		"Підтримка">
+<!ENTITY Ctr_support_forum1	"MozillaZine (форум англійською мовою)">
+<!ENTITY Ctr_support_forum2	"Camp Firefox (форум німецькою мовою)">
+<!ENTITY Ctr_github_issues	"Доповісти про проблему на Github">
+<!ENTITY Ctr_newversion		"Перевірити на нову версію">
 
 <!ENTITY Ctr_addon-bar.accesskey		"A">
 <!ENTITY appMenuGettingStarted.label	"Початок роботи">
 <!ENTITY goCmd.label					"Перейти">
 <!ENTITY Ctr_menu_restart.label			"Рестарт">
 <!ENTITY Ctr_restartapp					"«Рестарт» в кнопці програми та в меню «Файл»">
-<!ENTITY Ctr_ctrnewinv					"Underline new options for current &brandShortName; version">
+<!ENTITY Ctr_ctrnewinv					"Підкреслені нові опції для поточної версії &brandShortName;">
 
 <!ENTITY Ctr_openInCurrentTab			"Відкрити вхідні дані в поточній вкладці">
 <!ENTITY Ctr_openInNewTab				"Відкрити вхідні дані в новій вкладці">
diff --git a/xpi/locale/zh-CN/options.dtd b/xpi/locale/zh-CN/options.dtd
index 614fa51..47e6cc1 100644
--- a/xpi/locale/zh-CN/options.dtd
+++ b/xpi/locale/zh-CN/options.dtd
@@ -152,6 +152,7 @@
 <!ENTITY Ctr_nbisizedelay	"毫秒 (1000 毫秒 = 1 秒)">
 <!ENTITY Ctr_findbar		"查找栏">
 <!ENTITY Ctr_findbar_hws	"滚动页面时关闭查找栏">
+<!ENTITY Ctr_findbar_width	"Findboxes width">
 <!ENTITY Ctr_findbarpos		"查找栏位置">
 <!ENTITY Ctr_findbar_def	"底部(默认)">
 <!ENTITY Ctr_findbar_top	"顶部">
@@ -281,6 +282,7 @@
 <!ENTITY Ctr_autocompl_it	"移除 “使用...搜索” 和 “访问” 项目 (如果存在的话)">
 <!ENTITY Ctr_autocompl_hl	"文本匹配时高亮">
 <!ENTITY Ctr_autocompl_rhl	"高亮结果使用 Aero 颜色">
+<!ENTITY Ctr_autocompl_not	"Hide page title">
 <!ENTITY Ctr_autocompl_sep	"在结果之间显示分隔符">
 <!ENTITY Ctr_urlbar_uc		"禁用 “统一自动完成” 功能">
 <!ENTITY Ctr_lbsugresi		"禁用高度限制">
diff --git a/xpi/locale/zh-TW/options.dtd b/xpi/locale/zh-TW/options.dtd
index 3f50b9d..87dfcf9 100644
--- a/xpi/locale/zh-TW/options.dtd
+++ b/xpi/locale/zh-TW/options.dtd
@@ -152,6 +152,7 @@
 <!ENTITY Ctr_nbisizedelay	"毫秒 (1000 毫秒 = 1 秒)">
 <!ENTITY Ctr_findbar		"Findbar">
 <!ENTITY Ctr_findbar_hws	"Close findbar when scrolling page">
+<!ENTITY Ctr_findbar_width	"Findboxes width">
 <!ENTITY Ctr_findbarpos		"尋找列位於">
 <!ENTITY Ctr_findbar_def	"預設位置">
 <!ENTITY Ctr_findbar_top	"頂部">
@@ -281,6 +282,7 @@
 <!ENTITY Ctr_autocompl_it	"Remove 'Search with...' and 'Visit' items (if present)">
 <!ENTITY Ctr_autocompl_hl	"Highlighting of text hits">
 <!ENTITY Ctr_autocompl_rhl	"Aero colors for highlighted results">
+<!ENTITY Ctr_autocompl_not	"Hide page title">
 <!ENTITY Ctr_autocompl_sep	"Show separator between results">
 <!ENTITY Ctr_urlbar_uc		"Disable 'unified autocomplete' feature">
 <!ENTITY Ctr_lbsugresi		"Disable height limit">