diff --git a/lib/redmine/wiki_formatting/textile/helper.rb b/lib/redmine/wiki_formatting/textile/helper.rb
index fb568d4..d1e2d43 100644
--- a/lib/redmine/wiki_formatting/textile/helper.rb
+++ b/lib/redmine/wiki_formatting/textile/helper.rb
@@ -33,7 +33,8 @@ module Redmine
         def heads_for_wiki_formatter
           unless @heads_for_wiki_formatter_included
             content_for :header_tags do
-              javascript_include_tag('jstoolbar/jstoolbar-textile.min') +
+              javascript_include_tag('jstoolbar/jstoolbar') +
+              javascript_include_tag('jstoolbar/textile') +
               javascript_include_tag("jstoolbar/lang/jstoolbar-#{current_language.to_s.downcase}") +
               stylesheet_link_tag('jstoolbar')
             end
diff --git a/public/images/jstoolbar/bt_precode.png b/public/images/jstoolbar/bt_precode.png
new file mode 100755
index 0000000..e093032
Binary files /dev/null and b/public/images/jstoolbar/bt_precode.png differ
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-ar.js b/public/javascripts/jstoolbar/lang/jstoolbar-ar.js
index 740312b..46678dd 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-ar.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-ar.js
@@ -7,6 +7,7 @@ jsToolBar.strings ['Code'] = 'رمز ضمني';
 jsToolBar.strings ['Heading 1'] = 'عنوان 1';
 jsToolBar.strings ['Heading 2'] = 'عنوان 2';
 jsToolBar.strings ['Heading 3'] = 'عنوان 3';
+jsToolBar.strings ['Highlighted code'] = 'Highlighted code';
 jsToolBar.strings ['Unordered list'] = 'قائمة غير مرتبة';
 jsToolBar.strings ['Ordered list'] = 'قائمة مرتبة';
 jsToolBar.strings ['Quote'] = 'اقتباس';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-az.js b/public/javascripts/jstoolbar/lang/jstoolbar-az.js
index 2d68498..4f72f08 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-az.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-az.js
@@ -7,6 +7,7 @@ jsToolBar.strings['Code'] = 'Inline Code';
 jsToolBar.strings['Heading 1'] = 'Heading 1';
 jsToolBar.strings['Heading 2'] = 'Heading 2';
 jsToolBar.strings['Heading 3'] = 'Heading 3';
+jsToolBar.strings['Highlighted code'] = 'Highlighted code';
 jsToolBar.strings['Unordered list'] = 'Unordered list';
 jsToolBar.strings['Ordered list'] = 'Ordered list';
 jsToolBar.strings['Quote'] = 'Quote';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-bg.js b/public/javascripts/jstoolbar/lang/jstoolbar-bg.js
index 6c7b06d..7b76d10 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-bg.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-bg.js
@@ -7,6 +7,7 @@ jsToolBar.strings['Code'] = 'Вграден код';
 jsToolBar.strings['Heading 1'] = 'Заглавие 1';
 jsToolBar.strings['Heading 2'] = 'Заглавие 2';
 jsToolBar.strings['Heading 3'] = 'Заглавие 3';
+jsToolBar.strings['Highlighted code'] = 'Highlighted code';
 jsToolBar.strings['Unordered list'] = 'Неподреден списък';
 jsToolBar.strings['Ordered list'] = 'Подреден списък';
 jsToolBar.strings['Quote'] = 'Цитат';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-bs.js b/public/javascripts/jstoolbar/lang/jstoolbar-bs.js
index c9b6773..30f090a 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-bs.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-bs.js
@@ -7,6 +7,7 @@ jsToolBar.strings['Code'] = 'Inline Code';
 jsToolBar.strings['Heading 1'] = 'Heading 1';
 jsToolBar.strings['Heading 2'] = 'Heading 2';
 jsToolBar.strings['Heading 3'] = 'Heading 3';
+jsToolBar.strings['Highlighted code'] = 'Highlighted code';
 jsToolBar.strings['Unordered list'] = 'Unordered list';
 jsToolBar.strings['Ordered list'] = 'Ordered list';
 jsToolBar.strings['Preformatted text'] = 'Preformatted text';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-ca.js b/public/javascripts/jstoolbar/lang/jstoolbar-ca.js
index 3d652a4..c89f560 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-ca.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-ca.js
@@ -7,6 +7,7 @@ jsToolBar.strings['Code'] = 'Codi en línia';
 jsToolBar.strings['Heading 1'] = 'Encapçalament 1';
 jsToolBar.strings['Heading 2'] = 'Encapçalament 2';
 jsToolBar.strings['Heading 3'] = 'Encapçalament 3';
+jsToolBar.strings['Highlighted code'] = 'Highlighted code';
 jsToolBar.strings['Unordered list'] = 'Llista sense ordre';
 jsToolBar.strings['Ordered list'] = 'Llista ordenada';
 jsToolBar.strings['Quote'] = 'Cometes';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-cs.js b/public/javascripts/jstoolbar/lang/jstoolbar-cs.js
index f2c0dbf..7c0fdef 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-cs.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-cs.js
@@ -7,6 +7,7 @@ jsToolBar.strings['Code'] = 'Zobrazení kódu';
 jsToolBar.strings['Heading 1'] = 'Záhlaví 1';
 jsToolBar.strings['Heading 2'] = 'Záhlaví 2';
 jsToolBar.strings['Heading 3'] = 'Záhlaví 3';
+jsToolBar.strings['Highlighted code'] = 'Highlighted code';
 jsToolBar.strings['Unordered list'] = 'Seznam';
 jsToolBar.strings['Ordered list'] = 'Uspořádaný seznam';
 jsToolBar.strings['Quote'] = 'Quote';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-da.js b/public/javascripts/jstoolbar/lang/jstoolbar-da.js
index 53b2c36..9daafb6 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-da.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-da.js
@@ -7,6 +7,7 @@ jsToolBar.strings['Code'] = 'Inline-kode';
 jsToolBar.strings['Heading 1'] = 'Overskrift 1';
 jsToolBar.strings['Heading 2'] = 'Overskrift 2';
 jsToolBar.strings['Heading 3'] = 'Overskrift 3';
+jsToolBar.strings['Highlighted code'] = 'Highlighted code';
 jsToolBar.strings['Unordered list'] = 'Unummereret liste';
 jsToolBar.strings['Ordered list'] = 'Nummereret liste';
 jsToolBar.strings['Quote'] = 'Citér';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-de.js b/public/javascripts/jstoolbar/lang/jstoolbar-de.js
index ce68686..0728c09 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-de.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-de.js
@@ -7,6 +7,7 @@ jsToolBar.strings['Code'] = 'Quelltext';
 jsToolBar.strings['Heading 1'] = 'Überschrift 1. Ordnung';
 jsToolBar.strings['Heading 2'] = 'Überschrift 2. Ordnung';
 jsToolBar.strings['Heading 3'] = 'Überschrift 3. Ordnung';
+jsToolBar.strings['Highlighted code'] = 'Highlighted code';
 jsToolBar.strings['Unordered list'] = 'Aufzählungsliste';
 jsToolBar.strings['Ordered list'] = 'Nummerierte Liste';
 jsToolBar.strings['Quote'] = 'Quote';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-en-gb.js b/public/javascripts/jstoolbar/lang/jstoolbar-en-gb.js
index 2d68498..4f72f08 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-en-gb.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-en-gb.js
@@ -7,6 +7,7 @@ jsToolBar.strings['Code'] = 'Inline Code';
 jsToolBar.strings['Heading 1'] = 'Heading 1';
 jsToolBar.strings['Heading 2'] = 'Heading 2';
 jsToolBar.strings['Heading 3'] = 'Heading 3';
+jsToolBar.strings['Highlighted code'] = 'Highlighted code';
 jsToolBar.strings['Unordered list'] = 'Unordered list';
 jsToolBar.strings['Ordered list'] = 'Ordered list';
 jsToolBar.strings['Quote'] = 'Quote';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-en.js b/public/javascripts/jstoolbar/lang/jstoolbar-en.js
index 2d68498..6427b19 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-en.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-en.js
@@ -7,6 +7,8 @@ jsToolBar.strings['Code'] = 'Inline Code';
 jsToolBar.strings['Heading 1'] = 'Heading 1';
 jsToolBar.strings['Heading 2'] = 'Heading 2';
 jsToolBar.strings['Heading 3'] = 'Heading 3';
+jsToolBar.strings['Highlighted code'] = 'Highlighted code';
+jsToolBar.strings['Highlighted code'] = 'Highlighted code';
 jsToolBar.strings['Unordered list'] = 'Unordered list';
 jsToolBar.strings['Ordered list'] = 'Ordered list';
 jsToolBar.strings['Quote'] = 'Quote';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-es.js b/public/javascripts/jstoolbar/lang/jstoolbar-es.js
index 878489f..524a045 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-es.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-es.js
@@ -7,6 +7,7 @@ jsToolBar.strings['Code'] = 'Código fuente';
 jsToolBar.strings['Heading 1'] = 'Encabezado 1';
 jsToolBar.strings['Heading 2'] = 'Encabezado 2';
 jsToolBar.strings['Heading 3'] = 'Encabezado 3';
+jsToolBar.strings['Highlighted code'] = 'Highlighted code';
 jsToolBar.strings['Unordered list'] = 'Lista sin ordenar';
 jsToolBar.strings['Ordered list'] = 'Lista ordenada';
 jsToolBar.strings['Quote'] = 'Citar';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-et.js b/public/javascripts/jstoolbar/lang/jstoolbar-et.js
index aa0f16a..30ff569 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-et.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-et.js
@@ -24,6 +24,7 @@ jsToolBar.strings['Code'] = 'Koodiblokk';
 jsToolBar.strings['Heading 1'] = '1. taseme pealkiri';
 jsToolBar.strings['Heading 2'] = '2. taseme pealkiri';
 jsToolBar.strings['Heading 3'] = '3. taseme pealkiri';
+jsToolBar.strings['Highlighted code'] = 'Highlighted code';
 jsToolBar.strings['Unordered list'] = 'Täpitud nimekiri';
 jsToolBar.strings['Ordered list'] = 'Nummerdatud nimekiri';
 jsToolBar.strings['Quote'] = 'Tsitaat: aste juurde';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-eu.js b/public/javascripts/jstoolbar/lang/jstoolbar-eu.js
index 3067fc8..ba8e618 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-eu.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-eu.js
@@ -11,6 +11,7 @@ jsToolBar.strings['Code'] = 'Inline Code';
 jsToolBar.strings['Heading 1'] = '1 Goiburua';
 jsToolBar.strings['Heading 2'] = '2 Goiburua';
 jsToolBar.strings['Heading 3'] = '3 Goiburua';
+jsToolBar.strings['Highlighted code'] = 'Highlighted code';
 jsToolBar.strings['Unordered list'] = 'Ordenatu gabeko zerrenda';
 jsToolBar.strings['Ordered list'] = 'Ordenatutako zerrenda';
 jsToolBar.strings['Quote'] = 'Aipamena';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-fa.js b/public/javascripts/jstoolbar/lang/jstoolbar-fa.js
index 61236bf..ad9b156 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-fa.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-fa.js
@@ -7,6 +7,7 @@ jsToolBar.strings['Code'] = 'کد درون خطی';
 jsToolBar.strings['Heading 1'] = 'سربرگ ۱';
 jsToolBar.strings['Heading 2'] = 'سربرگ ۲';
 jsToolBar.strings['Heading 3'] = 'سربرگ ۳';
+jsToolBar.strings['Highlighted code'] = 'Highlighted code';
 jsToolBar.strings['Unordered list'] = 'فهرست بدون شماره';
 jsToolBar.strings['Ordered list'] = 'فهرست با شماره';
 jsToolBar.strings['Quote'] = 'تو بردن';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-fi.js b/public/javascripts/jstoolbar/lang/jstoolbar-fi.js
index c2229b2..96f1529 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-fi.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-fi.js
@@ -7,6 +7,7 @@ jsToolBar.strings['Code'] = 'Koodi näkymä';
 jsToolBar.strings['Heading 1'] = 'Otsikko 1';
 jsToolBar.strings['Heading 2'] = 'Otsikko 2';
 jsToolBar.strings['Heading 3'] = 'Otsikko 3';
+jsToolBar.strings['Highlighted code'] = 'Highlighted code';
 jsToolBar.strings['Unordered list'] = 'Järjestämätön lista';
 jsToolBar.strings['Ordered list'] = 'Järjestetty lista';
 jsToolBar.strings['Quote'] = 'Quote';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-fr.js b/public/javascripts/jstoolbar/lang/jstoolbar-fr.js
index c52a783..436a379 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-fr.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-fr.js
@@ -7,6 +7,7 @@ jsToolBar.strings['Code'] = 'Code en ligne';
 jsToolBar.strings['Heading 1'] = 'Titre niveau 1';
 jsToolBar.strings['Heading 2'] = 'Titre niveau 2';
 jsToolBar.strings['Heading 3'] = 'Titre niveau 3';
+jsToolBar.strings['Highlighted code'] = 'Highlighted code';
 jsToolBar.strings['Unordered list'] = 'Liste à puces';
 jsToolBar.strings['Ordered list'] = 'Liste numérotée';
 jsToolBar.strings['Quote'] = 'Citer';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-gl.js b/public/javascripts/jstoolbar/lang/jstoolbar-gl.js
index bd1462a..e815cfa 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-gl.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-gl.js
@@ -7,6 +7,7 @@ jsToolBar.strings['Code'] = 'Código fonte';
 jsToolBar.strings['Heading 1'] = 'Encabezado 1';
 jsToolBar.strings['Heading 2'] = 'Encabezado 2';
 jsToolBar.strings['Heading 3'] = 'Encabezado 3';
+jsToolBar.strings['Highlighted code'] = 'Highlighted code';
 jsToolBar.strings['Unordered list'] = 'Lista sen ordenar';
 jsToolBar.strings['Ordered list'] = 'Lista ordenada';
 jsToolBar.strings['Quote'] = 'Citar';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-he.js b/public/javascripts/jstoolbar/lang/jstoolbar-he.js
index 2d68498..4f72f08 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-he.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-he.js
@@ -7,6 +7,7 @@ jsToolBar.strings['Code'] = 'Inline Code';
 jsToolBar.strings['Heading 1'] = 'Heading 1';
 jsToolBar.strings['Heading 2'] = 'Heading 2';
 jsToolBar.strings['Heading 3'] = 'Heading 3';
+jsToolBar.strings['Highlighted code'] = 'Highlighted code';
 jsToolBar.strings['Unordered list'] = 'Unordered list';
 jsToolBar.strings['Ordered list'] = 'Ordered list';
 jsToolBar.strings['Quote'] = 'Quote';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-hr.js b/public/javascripts/jstoolbar/lang/jstoolbar-hr.js
index 578ae7c..87162ab 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-hr.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-hr.js
@@ -7,6 +7,7 @@ jsToolBar.strings['Code'] = 'Inline Code';
 jsToolBar.strings['Heading 1'] = 'Naslov 1';
 jsToolBar.strings['Heading 2'] = 'Naslov 2';
 jsToolBar.strings['Heading 3'] = 'Naslov 3';
+jsToolBar.strings['Highlighted code'] = 'Highlighted code';
 jsToolBar.strings['Unordered list'] = 'Graficke oznake';
 jsToolBar.strings['Ordered list'] = 'Numeriranje';
 jsToolBar.strings['Quote'] = 'Citat';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-hu.js b/public/javascripts/jstoolbar/lang/jstoolbar-hu.js
index c31ba00..0d3a966 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-hu.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-hu.js
@@ -7,6 +7,7 @@ jsToolBar.strings['Code'] = 'Kód sorok';
 jsToolBar.strings['Heading 1'] = 'Fejléc 1';
 jsToolBar.strings['Heading 2'] = 'Fejléc 2';
 jsToolBar.strings['Heading 3'] = 'Fejléc 3';
+jsToolBar.strings['Highlighted code'] = 'Highlighted code';
 jsToolBar.strings['Unordered list'] = 'Felsorolás';
 jsToolBar.strings['Ordered list'] = 'Számozott lista';
 jsToolBar.strings['Quote'] = 'Quote';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-id.js b/public/javascripts/jstoolbar/lang/jstoolbar-id.js
index cca978a..d6fc436 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-id.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-id.js
@@ -7,6 +7,7 @@ jsToolBar.strings['Code'] = 'Inline Code';
 jsToolBar.strings['Heading 1'] = 'Judul 1';
 jsToolBar.strings['Heading 2'] = 'Judul 2';
 jsToolBar.strings['Heading 3'] = 'Judul 3';
+jsToolBar.strings['Highlighted code'] = 'Highlighted code';
 jsToolBar.strings['Unordered list'] = 'Daftar tak terurut';
 jsToolBar.strings['Ordered list'] = 'Daftar terurut';
 jsToolBar.strings['Quote'] = 'Kutipan';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-it.js b/public/javascripts/jstoolbar/lang/jstoolbar-it.js
index 99749b4..0ada1c4 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-it.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-it.js
@@ -10,6 +10,7 @@ jsToolBar.strings['Code'] = 'Codice sorgente';
 jsToolBar.strings['Heading 1'] = 'Titolo 1';
 jsToolBar.strings['Heading 2'] = 'Titolo 2';
 jsToolBar.strings['Heading 3'] = 'Titolo 3';
+jsToolBar.strings['Highlighted code'] = 'Highlighted code';
 jsToolBar.strings['Unordered list'] = 'Elenco puntato';
 jsToolBar.strings['Ordered list'] = 'Elenco numerato';
 jsToolBar.strings['Quote'] = 'Aumenta rientro';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-ja.js b/public/javascripts/jstoolbar/lang/jstoolbar-ja.js
index 0073271..f1df44c 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-ja.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-ja.js
@@ -7,6 +7,7 @@ jsToolBar.strings['Code'] = 'コード';
 jsToolBar.strings['Heading 1'] = '見出し 1';
 jsToolBar.strings['Heading 2'] = '見出し 2';
 jsToolBar.strings['Heading 3'] = '見出し 3';
+jsToolBar.strings['Highlighted code'] = 'Highlighted code';
 jsToolBar.strings['Unordered list'] = '順不同リスト';
 jsToolBar.strings['Ordered list'] = '番号つきリスト';
 jsToolBar.strings['Quote'] = '引用';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-ko.js b/public/javascripts/jstoolbar/lang/jstoolbar-ko.js
index 1c437ef..e67c101 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-ko.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-ko.js
@@ -7,6 +7,7 @@ jsToolBar.strings['Code'] = '코드';
 jsToolBar.strings['Heading 1'] = '제목 1';
 jsToolBar.strings['Heading 2'] = '제목 2';
 jsToolBar.strings['Heading 3'] = '제목 3';
+jsToolBar.strings['Highlighted code'] = 'Highlighted code';
 jsToolBar.strings['Unordered list'] = '글머리 기호';
 jsToolBar.strings['Ordered list'] = '번호 매기기';
 jsToolBar.strings['Quote'] = '인용';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-lt.js b/public/javascripts/jstoolbar/lang/jstoolbar-lt.js
index 29d8ec4..dbfb50a 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-lt.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-lt.js
@@ -7,6 +7,7 @@ jsToolBar.strings['Code'] = 'Kodas';
 jsToolBar.strings['Heading 1'] = 'Heading 1';
 jsToolBar.strings['Heading 2'] = 'Heading 2';
 jsToolBar.strings['Heading 3'] = 'Heading 3';
+jsToolBar.strings['Highlighted code'] = 'Highlighted code';
 jsToolBar.strings['Unordered list'] = 'Nenumeruotas sąrašas';
 jsToolBar.strings['Ordered list'] = 'Numeruotas sąrašas';
 jsToolBar.strings['Quote'] = 'Cituoti';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-lv.js b/public/javascripts/jstoolbar/lang/jstoolbar-lv.js
index b821500..82acdf2 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-lv.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-lv.js
@@ -8,6 +8,7 @@ jsToolBar.strings['Code'] = 'Iekļauts kods';
 jsToolBar.strings['Heading 1'] = 'Virsraksts 1';
 jsToolBar.strings['Heading 2'] = 'Virsraksts 2';
 jsToolBar.strings['Heading 3'] = 'Virsraksts 3';
+jsToolBar.strings['Highlighted code'] = 'Highlighted code';
 jsToolBar.strings['Unordered list'] = 'Nesakārtots saraksts';
 jsToolBar.strings['Ordered list'] = 'Sakārtots saraksts';
 jsToolBar.strings['Quote'] = 'Citēt';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-mk.js b/public/javascripts/jstoolbar/lang/jstoolbar-mk.js
index 30c68ec..5d3bd1b 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-mk.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-mk.js
@@ -7,6 +7,7 @@ jsToolBar.strings['Code'] = 'Код';
 jsToolBar.strings['Heading 1'] = 'Заглавје 1';
 jsToolBar.strings['Heading 2'] = 'Заглавје 2';
 jsToolBar.strings['Heading 3'] = 'Заглавје 3';
+jsToolBar.strings['Highlighted code'] = 'Highlighted code';
 jsToolBar.strings['Unordered list'] = 'Неподредена листа';
 jsToolBar.strings['Ordered list'] = 'Подредена листа';
 jsToolBar.strings['Quote'] = 'Цитат';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-mn.js b/public/javascripts/jstoolbar/lang/jstoolbar-mn.js
index ef1da46..e68d6b3 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-mn.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-mn.js
@@ -7,6 +7,7 @@ jsToolBar.strings['Code'] = 'Програмын код';
 jsToolBar.strings['Heading 1'] = 'Гарчиг 1';
 jsToolBar.strings['Heading 2'] = 'Гарчиг 2';
 jsToolBar.strings['Heading 3'] = 'Гарчиг 3';
+jsToolBar.strings['Highlighted code'] = 'Highlighted code';
 jsToolBar.strings['Unordered list'] = 'Эрэмбэгүй жагсаалт';
 jsToolBar.strings['Ordered list'] = 'Эрэмбэтэй жагсаалт';
 jsToolBar.strings['Quote'] = 'Ишлэл';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-nl.js b/public/javascripts/jstoolbar/lang/jstoolbar-nl.js
index 0c54163..ac0400f 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-nl.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-nl.js
@@ -7,6 +7,7 @@ jsToolBar.strings['Code'] = 'Computercode';
 jsToolBar.strings['Heading 1'] = 'Kop 1';
 jsToolBar.strings['Heading 2'] = 'Kop 2';
 jsToolBar.strings['Heading 3'] = 'Kop 3';
+jsToolBar.strings['Highlighted code'] = 'Highlighted code';
 jsToolBar.strings['Unordered list'] = 'Ongeordende lijst';
 jsToolBar.strings['Ordered list'] = 'Geordende lijst';
 jsToolBar.strings['Quote'] = 'Citaat';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-no.js b/public/javascripts/jstoolbar/lang/jstoolbar-no.js
index 7995973..b09fc10 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-no.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-no.js
@@ -7,6 +7,7 @@ jsToolBar.strings['Code'] = 'Kode';
 jsToolBar.strings['Heading 1'] = 'Overskrift 1';
 jsToolBar.strings['Heading 2'] = 'Overskrift 2';
 jsToolBar.strings['Heading 3'] = 'Overskrift 3';
+jsToolBar.strings['Highlighted code'] = 'Highlighted code';
 jsToolBar.strings['Unordered list'] = 'Punktliste';
 jsToolBar.strings['Ordered list'] = 'Nummerert liste';
 jsToolBar.strings['Quote'] = 'Sitat';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-pl.js b/public/javascripts/jstoolbar/lang/jstoolbar-pl.js
index 0e7a38c..b888c29 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-pl.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-pl.js
@@ -8,6 +8,7 @@ jsToolBar.strings['Code'] = 'Wstawka kodu';
 jsToolBar.strings['Heading 1'] = 'Nagłowek 1';
 jsToolBar.strings['Heading 2'] = 'Nagłówek 2';
 jsToolBar.strings['Heading 3'] = 'Nagłówek 3';
+jsToolBar.strings['Highlighted code'] = 'Highlighted code';
 jsToolBar.strings['Unordered list'] = 'Nieposortowana lista';
 jsToolBar.strings['Ordered list'] = 'Posortowana lista';
 jsToolBar.strings['Quote'] = 'Cytat';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-pt-br.js b/public/javascripts/jstoolbar/lang/jstoolbar-pt-br.js
index 5035524..a31ef62 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-pt-br.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-pt-br.js
@@ -9,6 +9,7 @@ jsToolBar.strings['Code'] = 'Código Inline';
 jsToolBar.strings['Heading 1'] = 'Cabeçalho 1';
 jsToolBar.strings['Heading 2'] = 'Cabeçalho 2';
 jsToolBar.strings['Heading 3'] = 'Cabeçalho 3';
+jsToolBar.strings['Highlighted code'] = 'Highlighted code';
 jsToolBar.strings['Unordered list'] = 'Lista não ordenada';
 jsToolBar.strings['Ordered list'] = 'Lista ordenada';
 jsToolBar.strings['Quote'] = 'Quote';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-pt.js b/public/javascripts/jstoolbar/lang/jstoolbar-pt.js
index 137d795..7a17c8a 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-pt.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-pt.js
@@ -8,6 +8,7 @@ jsToolBar.strings['Code'] = 'Código Inline';
 jsToolBar.strings['Heading 1'] = 'Cabeçalho 1';
 jsToolBar.strings['Heading 2'] = 'Cabeçalho 2';
 jsToolBar.strings['Heading 3'] = 'Cabeçalho 3';
+jsToolBar.strings['Highlighted code'] = 'Highlighted code';
 jsToolBar.strings['Unordered list'] = 'Lista não ordenada';
 jsToolBar.strings['Ordered list'] = 'Lista ordenada';
 jsToolBar.strings['Quote'] = 'Citação';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-ro.js b/public/javascripts/jstoolbar/lang/jstoolbar-ro.js
index fdaec4a..99266f9 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-ro.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-ro.js
@@ -7,6 +7,7 @@ jsToolBar.strings['Code'] = 'Fragment de cod';
 jsToolBar.strings['Heading 1'] = 'Heading 1';
 jsToolBar.strings['Heading 2'] = 'Heading 2';
 jsToolBar.strings['Heading 3'] = 'Heading 3';
+jsToolBar.strings['Highlighted code'] = 'Highlighted code';
 jsToolBar.strings['Unordered list'] = 'Listă pe puncte';
 jsToolBar.strings['Ordered list'] = 'Listă ordonată';
 jsToolBar.strings['Quote'] = 'Citează';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-ru.js b/public/javascripts/jstoolbar/lang/jstoolbar-ru.js
index f4c8101..c8885de 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-ru.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-ru.js
@@ -7,6 +7,7 @@ jsToolBar.strings['Code'] = 'Вставка кода';
 jsToolBar.strings['Heading 1'] = 'Заголовок 1';
 jsToolBar.strings['Heading 2'] = 'Заголовок 2';
 jsToolBar.strings['Heading 3'] = 'Заголовок 3';
+jsToolBar.strings['Highlighted code'] = 'Highlighted code';
 jsToolBar.strings['Unordered list'] = 'Маркированный список';
 jsToolBar.strings['Ordered list'] = 'Нумерованный список';
 jsToolBar.strings['Quote'] = 'Цитата';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-sk.js b/public/javascripts/jstoolbar/lang/jstoolbar-sk.js
index a203318..b5a95ce 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-sk.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-sk.js
@@ -7,6 +7,7 @@ jsToolBar.strings['Code'] = 'Zobrazenie kódu';
 jsToolBar.strings['Heading 1'] = 'Nadpis 1';
 jsToolBar.strings['Heading 2'] = 'Nadpis 2';
 jsToolBar.strings['Heading 3'] = 'Nadpis 3';
+jsToolBar.strings['Highlighted code'] = 'Highlighted code';
 jsToolBar.strings['Unordered list'] = 'Odrážkový zoznam';
 jsToolBar.strings['Ordered list'] = 'Číslovaný zoznam';
 jsToolBar.strings['Quote'] = 'Odsadenie';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-sl.js b/public/javascripts/jstoolbar/lang/jstoolbar-sl.js
index 7094995..bf2c72e 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-sl.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-sl.js
@@ -7,6 +7,7 @@ jsToolBar.strings['Code'] = 'Koda med vrsticami';
 jsToolBar.strings['Heading 1'] = 'Naslov 1';
 jsToolBar.strings['Heading 2'] = 'Naslov 2';
 jsToolBar.strings['Heading 3'] = 'Naslov 3';
+jsToolBar.strings['Highlighted code'] = 'Highlighted code';
 jsToolBar.strings['Unordered list'] = 'Neurejen seznam';
 jsToolBar.strings['Ordered list'] = 'Urejen seznam';
 jsToolBar.strings['Quote'] = 'Citat';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-sq.js b/public/javascripts/jstoolbar/lang/jstoolbar-sq.js
index 2d68498..4f72f08 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-sq.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-sq.js
@@ -7,6 +7,7 @@ jsToolBar.strings['Code'] = 'Inline Code';
 jsToolBar.strings['Heading 1'] = 'Heading 1';
 jsToolBar.strings['Heading 2'] = 'Heading 2';
 jsToolBar.strings['Heading 3'] = 'Heading 3';
+jsToolBar.strings['Highlighted code'] = 'Highlighted code';
 jsToolBar.strings['Unordered list'] = 'Unordered list';
 jsToolBar.strings['Ordered list'] = 'Ordered list';
 jsToolBar.strings['Quote'] = 'Quote';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-sr-yu.js b/public/javascripts/jstoolbar/lang/jstoolbar-sr-yu.js
index 0e231e0..d4281a2 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-sr-yu.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-sr-yu.js
@@ -7,6 +7,7 @@ jsToolBar.strings['Code'] = 'Ugrađeni kôd';
 jsToolBar.strings['Heading 1'] = 'Naslov 1';
 jsToolBar.strings['Heading 2'] = 'Naslov 2';
 jsToolBar.strings['Heading 3'] = 'Naslov 3';
+jsToolBar.strings['Highlighted code'] = 'Highlighted code';
 jsToolBar.strings['Unordered list'] = 'Lista nabrajanja';
 jsToolBar.strings['Ordered list'] = 'Uređena lista';
 jsToolBar.strings['Quote'] = 'Pod navodnicima';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-sr.js b/public/javascripts/jstoolbar/lang/jstoolbar-sr.js
index 75a768a..aca10ac 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-sr.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-sr.js
@@ -7,6 +7,7 @@ jsToolBar.strings['Code'] = 'Уграђени кôд';
 jsToolBar.strings['Heading 1'] = 'Наслов 1';
 jsToolBar.strings['Heading 2'] = 'Наслов 2';
 jsToolBar.strings['Heading 3'] = 'Наслов 3';
+jsToolBar.strings['Highlighted code'] = 'Highlighted code';
 jsToolBar.strings['Unordered list'] = 'Листа набрајања';
 jsToolBar.strings['Ordered list'] = 'Уређена листа';
 jsToolBar.strings['Quote'] = 'Под наводницима';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-sv.js b/public/javascripts/jstoolbar/lang/jstoolbar-sv.js
index 08c0b69..553e103 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-sv.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-sv.js
@@ -7,6 +7,7 @@ jsToolBar.strings['Code'] = 'Kod';
 jsToolBar.strings['Heading 1'] = 'Rubrik 1';
 jsToolBar.strings['Heading 2'] = 'Rubrik 2';
 jsToolBar.strings['Heading 3'] = 'Rubrik 3';
+jsToolBar.strings['Highlighted code'] = 'Highlighted code';
 jsToolBar.strings['Unordered list'] = 'Osorterad lista';
 jsToolBar.strings['Ordered list'] = 'Sorterad lista';
 jsToolBar.strings['Quote'] = 'Citat';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-th.js b/public/javascripts/jstoolbar/lang/jstoolbar-th.js
index d871642..fa3cdf4 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-th.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-th.js
@@ -7,6 +7,7 @@ jsToolBar.strings['Code'] = 'โค๊ดโปรแกรม';
 jsToolBar.strings['Heading 1'] = 'หัวข้อ 1';
 jsToolBar.strings['Heading 2'] = 'หัวข้อ 2';
 jsToolBar.strings['Heading 3'] = 'หัวข้อ 3';
+jsToolBar.strings['Highlighted code'] = 'Highlighted code';
 jsToolBar.strings['Unordered list'] = 'รายการ';
 jsToolBar.strings['Ordered list'] = 'ลำดับเลข';
 jsToolBar.strings['Quote'] = 'Quote';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-tr.js b/public/javascripts/jstoolbar/lang/jstoolbar-tr.js
index 31705d7..67f8067 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-tr.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-tr.js
@@ -7,6 +7,7 @@ jsToolBar.strings['Code'] = 'Satır içi kod';
 jsToolBar.strings['Heading 1'] = 'Başlık 1';
 jsToolBar.strings['Heading 2'] = 'Başlık 2';
 jsToolBar.strings['Heading 3'] = 'Başlık 3';
+jsToolBar.strings['Highlighted code'] = 'Highlighted code';
 jsToolBar.strings['Unordered list'] = 'Sırasız liste';
 jsToolBar.strings['Ordered list'] = 'Sıralı liste';
 jsToolBar.strings['Preformatted text'] = 'Preformatted text';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-uk.js b/public/javascripts/jstoolbar/lang/jstoolbar-uk.js
index 2d68498..4f72f08 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-uk.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-uk.js
@@ -7,6 +7,7 @@ jsToolBar.strings['Code'] = 'Inline Code';
 jsToolBar.strings['Heading 1'] = 'Heading 1';
 jsToolBar.strings['Heading 2'] = 'Heading 2';
 jsToolBar.strings['Heading 3'] = 'Heading 3';
+jsToolBar.strings['Highlighted code'] = 'Highlighted code';
 jsToolBar.strings['Unordered list'] = 'Unordered list';
 jsToolBar.strings['Ordered list'] = 'Ordered list';
 jsToolBar.strings['Quote'] = 'Quote';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-vi.js b/public/javascripts/jstoolbar/lang/jstoolbar-vi.js
index f598bfe..0378535 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-vi.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-vi.js
@@ -7,6 +7,7 @@ jsToolBar.strings['Code'] = 'Mã chung dòng';
 jsToolBar.strings['Heading 1'] = 'Tiêu đề 1';
 jsToolBar.strings['Heading 2'] = 'Tiêu đề 2';
 jsToolBar.strings['Heading 3'] = 'Tiêu đề 3';
+jsToolBar.strings['Highlighted code'] = 'Highlighted code';
 jsToolBar.strings['Unordered list'] = 'Danh sách không thứ tự';
 jsToolBar.strings['Ordered list'] = 'Danh sách có thứ tự';
 jsToolBar.strings['Quote'] = 'Trích dẫn';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-zh-tw.js b/public/javascripts/jstoolbar/lang/jstoolbar-zh-tw.js
index 86599c5..cd85246 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-zh-tw.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-zh-tw.js
@@ -7,6 +7,7 @@ jsToolBar.strings['Code'] = '程式碼';
 jsToolBar.strings['Heading 1'] = '標題 1';
 jsToolBar.strings['Heading 2'] = '標題 2';
 jsToolBar.strings['Heading 3'] = '標題 3';
+jsToolBar.strings['Highlighted code'] = 'Highlighted code';
 jsToolBar.strings['Unordered list'] = '項目清單';
 jsToolBar.strings['Ordered list'] = '編號清單';
 jsToolBar.strings['Quote'] = '引文';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-zh.js b/public/javascripts/jstoolbar/lang/jstoolbar-zh.js
index a9b6ba2..409ce0e 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-zh.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-zh.js
@@ -7,6 +7,7 @@ jsToolBar.strings['Code'] = '程序代码';
 jsToolBar.strings['Heading 1'] = '标题 1';
 jsToolBar.strings['Heading 2'] = '标题 2';
 jsToolBar.strings['Heading 3'] = '标题 3';
+jsToolBar.strings['Highlighted code'] = 'Highlighted code';
 jsToolBar.strings['Unordered list'] = '无序列表';
 jsToolBar.strings['Ordered list'] = '排序列表';
 jsToolBar.strings['Quote'] = '引用';
diff --git a/public/javascripts/jstoolbar/textile.js b/public/javascripts/jstoolbar/textile.js
index cf925d5..376aac3 100644
--- a/public/javascripts/jstoolbar/textile.js
+++ b/public/javascripts/jstoolbar/textile.js
@@ -179,6 +179,31 @@ jsToolBar.prototype.elements.pre = {
 	}
 }
 
+// Code highlighting
+jsToolBar.prototype.elements.precode = {
+  type: 'button',
+  title: 'Highlighted code',
+  fn: {
+    wiki: function() {
+      precodeTextField = this;
+
+      var codeRayLanguages = ["c", "clojure", "cpp", "css", "delphi", "diff", "erb", "groovy", "haml", "html", "java", "javascript", "json", "php", "python", "ruby", "sql", "text", "xml", "yaml"];
+
+      var languageOptions = [];
+      for (var i = 0; i < codeRayLanguages.length; i++) {
+        languageOptions[i] = "<option>" + codeRayLanguages[i] + "</option>";
+      }
+      var languageSelect = "<select>" + languageOptions.join("") + "</select>";
+      var hideJs = "hideModal(this);$('#toolbar-code-options').remove();return false;";
+      var questionBox = '<div id="toolbar-code-options" style="display: none"><form action="#"><h3 class="title">Highlight code for</h3><p><label>Language ' + languageSelect + '</label></p><p class="buttons"><input onclick="precodeTextField.encloseLineSelection(\'<pre><code class=&quot;\' + $(this).closest(\'div\').find(\'select\').first().val() + \'&quot;>\\n\', \'\\n</code></pre>\');'+hideJs+'" type="submit" value="Insert code"><input onclick="'+hideJs+'" type="button" value="Cancel"></p></form></div>';
+
+      $('#main').append(questionBox);
+      showModal('toolbar-code-options', '200px');
+      $('#toolbar-code-options select').focus();
+    }
+  }
+}
+
 // spacer
 jsToolBar.prototype.elements.space4 = {type: 'space'}
 
diff --git a/public/stylesheets/jstoolbar.css b/public/stylesheets/jstoolbar.css
index 315d814..d79c177 100644
--- a/public/stylesheets/jstoolbar.css
+++ b/public/stylesheets/jstoolbar.css
@@ -89,6 +89,9 @@
 .jstb_pre {
     background-image: url(../images/jstoolbar/bt_pre.png);
 }
+.jstb_precode {
+    background-image: url(../images/jstoolbar/bt_precode.png);
+}
 .jstb_link {
     background-image: url(../images/jstoolbar/bt_link.png);
 }