diff --git a/README.md b/README.md
index 0e36001..935589a 100644
--- a/README.md
+++ b/README.md
@@ -41,7 +41,7 @@ Take a look at the [documentation table of contents](doc/TOC.md).
 * [Multilingual ready](http://www.rootstheme.com/wpml/) (Brazilian Portuguese,
 Bulgarian, Catalan, Danish, Dutch, English, Finnish, French, German, Hungarian,
 Indonesian, Italian, Korean, Macedonian, Norwegian, Polish, Russian, Simplified
-Chinese, Spanish, Swedish, Traditional Chinese, Turkish, Vietnamese)
+Chinese, Spanish, Swedish, Traditional Chinese, Turkish, Vietnamese, Serbian)
 
 ### Build Script
 
diff --git a/assets/less/app.less b/assets/less/app.less
index 0efc111..80a847a 100644
--- a/assets/less/app.less
+++ b/assets/less/app.less
@@ -38,6 +38,9 @@ body { }
 .main { }
 
 
+/* Gallery Shortcode */
+.row.gallery-row { padding: 15px 0; }
+
 
 /* ==========================================================================
    Sidebar
diff --git a/lang/fa_IR.mo b/lang/fa_IR.mo
new file mode 100644
index 0000000..1048860
Binary files /dev/null and b/lang/fa_IR.mo differ
diff --git a/lang/fa_IR.po b/lang/fa_IR.po
new file mode 100644
index 0000000..0219589
--- /dev/null
+++ b/lang/fa_IR.po
@@ -0,0 +1,271 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Project-Id-Version: roots\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"X-Poedit-KeywordsList: __;_e\n"
+
+#: 404.php:4
+msgid "Sorry, but the page you were trying to view does not exist."
+msgstr "متاسفانه، صفحه ای که شما سعی دارید مشاهده کنید وجود ندارد."
+
+#: 404.php:7
+msgid "It looks like this was the result of either:"
+msgstr "به نظر می رسد هر دو نتیجه یکسان هستند."
+
+#: 404.php:9
+msgid "a mistyped address"
+msgstr " آدرس اشتباه تایپ شده"
+
+#: 404.php:10
+msgid "an out-of-date link"
+msgstr "یک لینک منسوخ"
+
+#: base.php:4
+msgid "You are using an <strong>outdated</strong> browser. Please <a href=\"http://browsehappy.com/\">upgrade your browser</a> to improve your experience."
+msgstr "شما در حال استفاده از یک مرورگر قدیمی هستید. لطفا نسخه مرورگر خود را برای بهبود تجربه، <a href=\"http://browsehappy.com/\">به روزرسانی</a> کنید."
+
+#: index.php:5
+msgid "Sorry, no results were found."
+msgstr "متاسفانه نتیجه ای یافت نشد."
+
+#: index.php:17
+msgid "&larr; Older posts"
+msgstr "مطالب قدیمیتر &larr;"
+
+#: index.php:18
+msgid "Newer posts &rarr;"
+msgstr "مطالب جدیدتر &rarr;"
+
+#: lib/activation.php:28
+#: lib/activation.php:29
+msgid "Theme Activation"
+msgstr "فعال سازی پوسته"
+
+#: lib/activation.php:51
+msgid "%s Theme Activation"
+msgstr "فعال سازی پوسته %s."
+
+#: lib/activation.php:62
+#: lib/activation.php:64
+msgid "Create static front page?"
+msgstr "آیا می خواهید صفحه اول استاتیک ایجاد کنید؟"
+
+#: lib/activation.php:66
+#: lib/activation.php:79
+#: lib/activation.php:92
+#: lib/activation.php:105
+#: lib/activation.php:118
+msgid "Yes"
+msgstr "بله"
+
+#: lib/activation.php:67
+#: lib/activation.php:80
+#: lib/activation.php:93
+#: lib/activation.php:106
+#: lib/activation.php:119
+msgid "No"
+msgstr "خیر"
+
+#: lib/activation.php:70
+msgid "Create a page called Home and set it to be the static front page"
+msgstr "ایجاد صفحه ای به نام \"خانه\" و تنظیم آن به عنوان صفحه نخست ایستا."
+
+#: lib/activation.php:75
+msgid "Change permalink structure?"
+msgstr "آیا می خواهید ساختار لینک ثابت را تغییر دهید؟"
+
+#: lib/activation.php:77
+msgid "Update permalink structure?"
+msgstr "آیا می خواهید ساختار لینک ثابت را به روزرسانی کنید؟"
+
+#: lib/activation.php:83
+msgid "Change permalink structure to /&#37;postname&#37;/"
+msgstr "تغییر ساختار لینک ثابت به نام پست."
+
+#: lib/activation.php:88
+msgid "Change uploads folder?"
+msgstr "آیا می خواهید نام پوشه ی آپلود را تغییر دهید؟"
+
+#: lib/activation.php:90
+msgid "Update uploads folder?"
+msgstr "آیا می خواهید نام پوشه ی آپلود را به روزرسانی کنید؟"
+
+#: lib/activation.php:96
+msgid "Change uploads folder to /media/ instead of /wp-content/uploads/"
+msgstr "تغییر پوشه ی آپلود  /media/ instead به /wp-content/uploads/"
+
+#: lib/activation.php:101
+#: lib/activation.php:103
+msgid "Create navigation menu?"
+msgstr "آیا می خواهید منو ایجاد کنید؟"
+
+#: lib/activation.php:109
+msgid "Create the Primary Navigation menu and set the location"
+msgstr "ایجاد منو اولیه و تعیین موقعیت آن."
+
+#: lib/activation.php:114
+#: lib/activation.php:116
+msgid "Add pages to menu?"
+msgstr "آیا می خواهید صفحه ای در منو اضافه کنید؟"
+
+#: lib/activation.php:122
+msgid "Add all current published pages to the Primary Navigation"
+msgstr "اضافه کردن تمام صفحات منتشر شده جاری در منو اولیه"
+
+#: lib/cleanup.php:210
+msgid "Continued"
+msgstr "ادامه"
+
+#: lib/init.php:11
+msgid "Primary Navigation"
+msgstr "منو اصلی"
+
+#: lib/titles.php:10
+msgid "Latest Posts"
+msgstr "آخرین مطالب."
+
+#: lib/titles.php:19
+msgid "Daily Archives: %s"
+msgstr "آرشیو روزانه: %s"
+
+#: lib/titles.php:21
+msgid "Monthly Archives: %s"
+msgstr "آرشیو ماهانه: %s"
+
+#: lib/titles.php:23
+msgid "Yearly Archives: %s"
+msgstr "آرشیو سالانه: %s"
+
+#: lib/titles.php:26
+msgid "Author Archives: %s"
+msgstr "بایگانی نویسنده: %s"
+
+#: lib/titles.php:31
+msgid "Search Results for %s"
+msgstr "نتایج جستجو برای %s"
+
+#: lib/titles.php:33
+msgid "Not Found"
+msgstr "یافت نشد."
+
+#: lib/widgets.php:8
+msgid "Primary"
+msgstr "اصلی"
+
+#: lib/widgets.php:17
+msgid "Footer"
+msgstr "پاورقی"
+
+#: lib/widgets.php:45
+msgid "Use this widget to add a vCard"
+msgstr "استفاده از این ابزار برای اضافه کردن یک کارت ویزیت."
+
+#: lib/widgets.php:47
+msgid "Roots: vCard"
+msgstr "ریشه کارت ویزیت"
+
+#: lib/widgets.php:74
+msgid "vCard"
+msgstr "کارت ویزیت"
+
+#: templates/comment.php:4
+msgid "%1$s"
+msgstr "%1$s"
+
+#: templates/comment.php:5
+msgid "(Edit)"
+msgstr "(ویرایش)"
+
+#: templates/comment.php:9
+msgid "Your comment is awaiting moderation."
+msgstr "نظر شما در انتظار تایید است."
+
+#: templates/comments.php:8
+msgid "One Response to &ldquo;%2$s&rdquo;"
+msgstr "یک پاسخ برای &ldquo;%2$s&rdquo;"
+
+#: templates/comments.php:18
+msgid "&larr; Older comments"
+msgstr "&larr; نظرات قدیمیتر"
+
+#: templates/comments.php:21
+msgid "Newer comments &rarr;"
+msgstr "نظرات جدیدتر &rarr;"
+
+#: templates/comments.php:29
+#: templates/comments.php:38
+msgid "Comments are closed."
+msgstr "نظرات مسدود است."
+
+#: templates/comments.php:45
+msgid "Leave a Reply"
+msgstr "گذاشتن پاسخ"
+
+#: templates/comments.php:45
+msgid "Leave a Reply to %s"
+msgstr "گذاشتن پاسخ برای"
+
+#: templates/comments.php:48
+msgid "You must be <a href=\"%s\">logged in</a> to post a comment."
+msgstr "شما باید وارد حساب کاربری شده <a href=\"%s\">logged in</a> آنگاه می توانید برای مطلب نظر دهید."
+
+#: templates/comments.php:53
+msgid "Logged in as <a href=\"%s/wp-admin/profile.php\">%s</a>."
+msgstr "وارد شده به عنوان <a href=\"%s/wp-admin/profile.php\">%s</a>. "
+
+#: templates/comments.php:54
+msgid "Log out of this account"
+msgstr "خروج از این حساب"
+
+#: templates/comments.php:54
+msgid "Log out &raquo;"
+msgstr "خروج &raquo;"
+
+#: templates/comments.php:57
+msgid "Name"
+msgstr "نام"
+
+#: templates/comments.php:57
+#: templates/comments.php:59
+msgid " (required)"
+msgstr "(ضروری)"
+
+#: templates/comments.php:59
+msgid "Email (will not be published)"
+msgstr "پست الکترونیک، نمایش داده نخواهد شد."
+
+#: templates/comments.php:61
+msgid "Website"
+msgstr "وب سایت"
+
+#: templates/comments.php:64
+msgid "Comment"
+msgstr "توضیح"
+
+#: templates/comments.php:66
+msgid "Submit Comment"
+msgstr "ارسال توضیح"
+
+#: templates/content-single.php:11
+msgid "Pages:"
+msgstr "صفحات:"
+
+#: templates/entry-meta.php:2
+msgid "By"
+msgstr "توسط"
+
+#: templates/searchform.php:2
+msgid "Search for:"
+msgstr "جستجو برای:"
+
+#: templates/searchform.php:3
+#: templates/searchform.php:4
+msgid "Search"
+msgstr "جستجو"
+
diff --git a/lang/pt_BR.mo b/lang/pt_BR.mo
index d5689e3..95d08c1 100644
Binary files a/lang/pt_BR.mo and b/lang/pt_BR.mo differ
diff --git a/lang/pt_BR.po b/lang/pt_BR.po
index dd1e59c..09d38b4 100644
--- a/lang/pt_BR.po
+++ b/lang/pt_BR.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-09 22:20-0300\n"
+"POT-Creation-Date: \n"
 "PO-Revision-Date: \n"
 "Last-Translator: Weslly Honorato <weslly.honorato@gmail.com>\n"
 "Language-Team: \n"
@@ -10,7 +10,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.5.5\n"
+"X-Generator: Poedit 1.5.7\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Poedit-KeywordsList: _;gettext;gettext_noop;__;_e\n"
 "X-Poedit-Basepath: ../\n"
@@ -34,140 +34,135 @@ msgstr "um endereço digitado incorretamente"
 msgid "an out-of-date link"
 msgstr "um link desatualizado"
 
-#: lib/activation.php:33 lib/activation.php:34
+#: base.php:4
+msgid ""
+"You are using an <strong>outdated</strong> browser. Please <a href=\"http://"
+"browsehappy.com/\">upgrade your browser</a> to improve your experience."
+msgstr ""
+"Você está utilizando um navegador <strong>desatualizado</strong>. Por favor, "
+"<a href=\"http://browsehappy.com/\">atualize seu navegador</a> para melhorar "
+"sua experiência."
+
+#: index.php:5
+msgid "Sorry, no results were found."
+msgstr "Desculpe, nenhum resultado foi encontrado."
+
+#: index.php:17
+msgid "&larr; Older posts"
+msgstr "&larr; Posts mais antigos"
+
+#: index.php:18
+msgid "Newer posts &rarr;"
+msgstr "Posts mais novos &rarr;"
+
+#: lib/activation.php:28 lib/activation.php:29
 msgid "Theme Activation"
 msgstr "Ativação do Tema"
 
-#: lib/activation.php:70
-#, php-format
+#: lib/activation.php:51
 msgid "%s Theme Activation"
 msgstr "%s Ativação do Tema"
 
-#: lib/activation.php:85 lib/activation.php:87
+#: lib/activation.php:62 lib/activation.php:64
 msgid "Create static front page?"
 msgstr "Criar uma página inicial estática?"
 
-#: lib/activation.php:89 lib/activation.php:102 lib/activation.php:115
-#: lib/activation.php:128 lib/activation.php:141
+#: lib/activation.php:66 lib/activation.php:79 lib/activation.php:92
+#: lib/activation.php:105 lib/activation.php:118
 msgid "Yes"
 msgstr "Sim"
 
-#: lib/activation.php:90 lib/activation.php:103 lib/activation.php:116
-#: lib/activation.php:129 lib/activation.php:142
+#: lib/activation.php:67 lib/activation.php:80 lib/activation.php:93
+#: lib/activation.php:106 lib/activation.php:119
 msgid "No"
 msgstr "Não"
 
-#: lib/activation.php:93
+#: lib/activation.php:70
 msgid "Create a page called Home and set it to be the static front page"
 msgstr ""
 "Criar uma página chamada Home e configurá-la como a página inicial estática"
 
-#: lib/activation.php:98
+#: lib/activation.php:75
 msgid "Change permalink structure?"
 msgstr "Modificar a estrutura de links permanentes?"
 
-#: lib/activation.php:100
+#: lib/activation.php:77
 msgid "Update permalink structure?"
 msgstr "Atualizar a estrutura de links permanentes?"
 
-#: lib/activation.php:106
+#: lib/activation.php:83
 msgid "Change permalink structure to /&#37;postname&#37;/"
 msgstr "Modificar a estrutura de links permanentes para /&#37;postname&#37;/"
 
-#: lib/activation.php:111
+#: lib/activation.php:88
 msgid "Change uploads folder?"
 msgstr "Modificar a localização da pasta de uploads?"
 
-#: lib/activation.php:113
+#: lib/activation.php:90
 msgid "Update uploads folder?"
 msgstr "Atualizar a pasta de uploads?"
 
-#: lib/activation.php:119
-msgid "Change uploads folder to /assets/ instead of /wp-content/uploads/"
+#: lib/activation.php:96
+msgid "Change uploads folder to /media/ instead of /wp-content/uploads/"
 msgstr ""
-"Modificar a localização da pasta de uploads para /assets/ em vez de /wp-"
+"Modificar a localização da pasta de uploads para /media/ em vez de /wp-"
 "content/uploads/"
 
-#: lib/activation.php:124 lib/activation.php:126
+#: lib/activation.php:101 lib/activation.php:103
 msgid "Create navigation menu?"
 msgstr "Criar o menu de navegação?"
 
-#: lib/activation.php:132
+#: lib/activation.php:109
 msgid "Create the Primary Navigation menu and set the location"
 msgstr "Criar o menu de navegação primário e atualizar a localização"
 
-#: lib/activation.php:137 lib/activation.php:139
+#: lib/activation.php:114 lib/activation.php:116
 msgid "Add pages to menu?"
 msgstr "Adicionar páginas ao menu?"
 
-#: lib/activation.php:145
+#: lib/activation.php:122
 msgid "Add all current published pages to the Primary Navigation"
 msgstr "Adicionar todas as páginas publicadas ao menu de navegação primária"
 
-#: lib/cleanup.php:368
+#: lib/cleanup.php:210
 msgid "Continued"
 msgstr "Continua"
 
-#: lib/comments.php:35
-#, php-format
-msgid "%1$s"
-msgstr "%1$s"
-
-#: lib/comments.php:36
-msgid "(Edit)"
-msgstr "(Editar)"
-
-#: lib/comments.php:40
-msgid "Your comment is awaiting moderation."
-msgstr "Seu comentário está aguardando moderação."
-
 #: lib/init.php:11
 msgid "Primary Navigation"
 msgstr "Navegação Primária"
 
-#: lib/utils.php:60
+#: lib/titles.php:10
 msgid "Latest Posts"
 msgstr "Últimos Posts"
 
-#: lib/utils.php:69
-#, php-format
+#: lib/titles.php:19
 msgid "Daily Archives: %s"
 msgstr "Arquivos Diários: %s"
 
-#: lib/utils.php:71
-#, php-format
+#: lib/titles.php:21
 msgid "Monthly Archives: %s"
 msgstr "Arquivos Mensais: %s"
 
-#: lib/utils.php:73
-#, php-format
+#: lib/titles.php:23
 msgid "Yearly Archives: %s"
 msgstr "Arquivos Anuais: %s"
 
-#: lib/utils.php:75
-#, php-format
+#: lib/titles.php:26
 msgid "Author Archives: %s"
 msgstr "Arquivos do Autor: %s"
 
-#: lib/utils.php:80
-#, php-format
+#: lib/titles.php:31
 msgid "Search Results for %s"
 msgstr "Resultados da Busca por %s"
 
-#: lib/utils.php:82
+#: lib/titles.php:33
 msgid "Not Found"
 msgstr "Não Encontrado"
 
-#: lib/utils.php:94
-#, php-format
-msgid "Please make sure your <a href=\"%s\">.htaccess</a> file is writable "
-msgstr ""
-"Por favor, certifique-se de que seu arquivo <a href=\"%s\">.htaccess</a> "
-"possui permissão de escrita"
-
 #: lib/widgets.php:8
-msgid "Primary Sidebar"
-msgstr "Barra Lateral Primária"
+msgid "Primary"
+msgstr "Primária"
 
 #: lib/widgets.php:17
 msgid "Footer"
@@ -185,6 +180,24 @@ msgstr "Roots: vCard"
 msgid "vCard"
 msgstr "vCard"
 
+#: templates/comment.php:4
+msgid "%1$s"
+msgstr "%1$s"
+
+#: templates/comment.php:5
+msgid "(Edit)"
+msgstr "(Editar)"
+
+#: templates/comment.php:9
+msgid "Your comment is awaiting moderation."
+msgstr "Seu comentário está aguardando moderação."
+
+#: templates/comments.php:8
+msgid "One Response to &ldquo;%2$s&rdquo;"
+msgid_plural "%1$s Responses to &ldquo;%2$s&rdquo;"
+msgstr[0] "Uma Resposta para &ldquo;%2$s&rdquo;"
+msgstr[1] "%1$s Respostas para &ldquo;%2$s&rdquo;"
+
 #: templates/comments.php:18
 msgid "&larr; Older comments"
 msgstr "&larr; Comentários mais antigos"
@@ -202,18 +215,15 @@ msgid "Leave a Reply"
 msgstr "Deixar uma Resposta"
 
 #: templates/comments.php:45
-#, php-format
 msgid "Leave a Reply to %s"
 msgstr "Deixar uma resposta para %s"
 
 #: templates/comments.php:48
-#, php-format
 msgid "You must be <a href=\"%s\">logged in</a> to post a comment."
 msgstr ""
 "Você precisa estar <a href=\"%s\">logado</a> para postar um comentário."
 
 #: templates/comments.php:53
-#, php-format
 msgid "Logged in as <a href=\"%s/wp-admin/profile.php\">%s</a>."
 msgstr "Logado como <a href=\"%s/wp-admin/profile.php\">%s</a>."
 
@@ -253,18 +263,6 @@ msgstr "Enviar Comentário"
 msgid "Pages:"
 msgstr "Páginas:"
 
-#: templates/content.php:3
-msgid "Sorry, no results were found."
-msgstr "Desculpe, nenhum resultado foi encontrado."
-
-#: templates/content.php:27
-msgid "&larr; Older posts"
-msgstr "&larr; Posts mais antigos"
-
-#: templates/content.php:30
-msgid "Newer posts &rarr;"
-msgstr "Posts mais novos &rarr;"
-
 #: templates/entry-meta.php:2
 msgid "By"
 msgstr "Por"
@@ -277,6 +275,11 @@ msgstr "Buscar por:"
 msgid "Search"
 msgstr "Busca"
 
+#~ msgid "Please make sure your <a href=\"%s\">.htaccess</a> file is writable "
+#~ msgstr ""
+#~ "Por favor, certifique-se de que seu arquivo <a href=\"%s\">.htaccess</a> "
+#~ "possui permissão de escrita"
+
 #~ msgid ""
 #~ "The page you are looking for might have been removed, had its name "
 #~ "changed, or is temporarily unavailable."
@@ -305,11 +308,6 @@ msgstr "Busca"
 #~ "Este post é protegido por senha. Digite a senha para visualizar os "
 #~ "comentários."
 
-#~ msgid "One Response to &ldquo;%2$s&rdquo;"
-#~ msgid_plural "%1$s Responses to &ldquo;%2$s&rdquo;"
-#~ msgstr[0] "Uma Resposta para &ldquo;%2$s&rdquo;"
-#~ msgstr[1] "%1$s Respostas para &ldquo;%2$s&rdquo;"
-
 #~ msgid "Posted on %s at %s."
 #~ msgstr "Publicado em %s às %s."
 
diff --git a/lang/sr_RS.mo b/lang/sr_RS.mo
new file mode 100644
index 0000000..17a230f
Binary files /dev/null and b/lang/sr_RS.mo differ
diff --git a/lang/sr_rs.pot b/lang/sr_RS.pot
similarity index 53%
rename from lang/sr_rs.pot
rename to lang/sr_RS.pot
index a361823..b54f3c5 100644
--- a/lang/sr_rs.pot
+++ b/lang/sr_RS.pot
@@ -3,17 +3,18 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"Project-Id-Version: \n"
+"Project-Id-Version: Translation to Serbian of Roots theme for WordPress\n"
 "POT-Creation-Date: \n"
 "PO-Revision-Date: \n"
 "Last-Translator: lautreamont <lautreamont33@gmail.com>\n"
-"Language-Team: \n"
+"Language-Team: lautreamont <lautreamont33@gmail.com>\n"
 "MIME-Version: 1.0\n"
-"X-Generator: Poedit 1.5.5\n"
+"Language: Serbian\n"
+"X-Generator: Poedit 1.5.4\n"
 
 #: 404.php:4
 msgid "Sorry, but the page you were trying to view does not exist."
-msgstr "Страна коју сте тражили непостоји."
+msgstr "Тражена страна не постоји."
 
 #: 404.php:7
 msgid "It looks like this was the result of either:"
@@ -21,15 +22,24 @@ msgstr "Што је резултат:"
 
 #: 404.php:9
 msgid "a mistyped address"
-msgstr "или погрешно укуцане адресе"
+msgstr "или погрешно унете адресе"
 
 #: 404.php:10
 msgid "an out-of-date link"
 msgstr "или измењене/застареле везе"
 
+#: base.php:4
+msgid ""
+"You are using an <strong>outdated</strong> browser. Please <a href=\"http://"
+"browsehappy.com/\">upgrade your browser</a> to improve your experience."
+msgstr ""
+"Користите <strong>застарели</strong> претраживач. Унапредите свој доживљај "
+"<a href=\"http://browsehappy.com/\">инсталирирањем новије верзије "
+"претраживача</a>."
+
 #: index.php:5
 msgid "Sorry, no results were found."
-msgstr "Нема резултата претраге."
+msgstr "Ништа није пронађено."
 
 #: index.php:17
 msgid "&larr; Older posts"
@@ -39,75 +49,73 @@ msgstr "&larr; Старији чланци"
 msgid "Newer posts &rarr;"
 msgstr "Новији чланци &rarr;"
 
-#: lib/activation.php:33 lib/activation.php:34
+#: lib/activation.php:28 lib/activation.php:29
 msgid "Theme Activation"
 msgstr "Активирање теме"
 
-#: lib/activation.php:70
+#: lib/activation.php:51
 msgid "%s Theme Activation"
-msgstr "%s Активирање теме"
+msgstr "Активирање %s теме"
 
-#: lib/activation.php:85 lib/activation.php:87
+#: lib/activation.php:62 lib/activation.php:64
 msgid "Create static front page?"
-msgstr "Да направимо статичну насловну страну?"
+msgstr "Статична насловна страна?"
 
-#: lib/activation.php:89 lib/activation.php:102 lib/activation.php:115
-#: lib/activation.php:128 lib/activation.php:141
+#: lib/activation.php:66 lib/activation.php:79 lib/activation.php:92
+#: lib/activation.php:105 lib/activation.php:118
 msgid "Yes"
 msgstr "Да"
 
-#: lib/activation.php:90 lib/activation.php:103 lib/activation.php:116
-#: lib/activation.php:129 lib/activation.php:142
+#: lib/activation.php:67 lib/activation.php:80 lib/activation.php:93
+#: lib/activation.php:106 lib/activation.php:119
 msgid "No"
 msgstr "Не"
 
-#: lib/activation.php:93
+#: lib/activation.php:70
 msgid "Create a page called Home and set it to be the static front page"
-msgstr ""
-"Да креирамо страну под називом Home и поставимо је као статичну насловну "
-"страну"
+msgstr "Креирање нове стране под називом Home као статичне насловне стране"
 
-#: lib/activation.php:98
+#: lib/activation.php:75
 msgid "Change permalink structure?"
-msgstr "Измени структуру сталних веза?"
+msgstr "Измена структуре сталних веза?"
 
-#: lib/activation.php:100
+#: lib/activation.php:77
 msgid "Update permalink structure?"
-msgstr "Запамти структуру сталних веза?"
+msgstr "Памћење структуре сталних веза?"
 
-#: lib/activation.php:106
+#: lib/activation.php:83
 msgid "Change permalink structure to /&#37;postname&#37;/"
-msgstr "Измени структуру сталних веза у /&#37;називпоста&#37;/"
+msgstr "Измена структуре сталних веза у /&#37;називпоста&#37;/"
 
-#: lib/activation.php:111
+#: lib/activation.php:88
 msgid "Change uploads folder?"
-msgstr "Измени пријемни директоријум?"
+msgstr "Измена пријемног директоријума?"
 
-#: lib/activation.php:113
+#: lib/activation.php:90
 msgid "Update uploads folder?"
-msgstr "Запамти пријемни директоријум?"
+msgstr "Памћење пријемног директоријума?"
 
-#: lib/activation.php:119
-msgid "Change uploads folder to /assets/ instead of /wp-content/uploads/"
-msgstr "Измени пријемни директоријум у /assets/ уместо /wp-content/uploads/"
+#: lib/activation.php:96
+msgid "Change uploads folder to /media/ instead of /wp-content/uploads/"
+msgstr "Измена пријемног директоријума /wp-content/uploads/ у /assets/"
 
-#: lib/activation.php:124 lib/activation.php:126
+#: lib/activation.php:101 lib/activation.php:103
 msgid "Create navigation menu?"
-msgstr "Направи навигациони изборник?"
+msgstr "Креирање навигационог изборника?"
 
-#: lib/activation.php:132
+#: lib/activation.php:109
 msgid "Create the Primary Navigation menu and set the location"
-msgstr "Направи Основни навигациони изборник и постави га?"
+msgstr "Креирање Основног навигационог изборника и његове позиције?"
 
-#: lib/activation.php:137 lib/activation.php:139
+#: lib/activation.php:114 lib/activation.php:116
 msgid "Add pages to menu?"
-msgstr "Додај стране у изборник?"
+msgstr "Додавање страна у изборник?"
 
-#: lib/activation.php:145
+#: lib/activation.php:122
 msgid "Add all current published pages to the Primary Navigation"
-msgstr "Додај све објављене стране у Основни навигациони изборник"
+msgstr "Додавање свих објављених страна у Основни навигациони изборник"
 
-#: lib/cleanup.php:382
+#: lib/cleanup.php:210
 msgid "Continued"
 msgstr "Наставак"
 
@@ -115,54 +123,49 @@ msgstr "Наставак"
 msgid "Primary Navigation"
 msgstr "Основна навигација"
 
-#: lib/utils.php:60
+#: lib/titles.php:10
 msgid "Latest Posts"
-msgstr "Најновији чланци"
+msgstr "Ново"
 
-#: lib/utils.php:69
+#: lib/titles.php:19
 msgid "Daily Archives: %s"
-msgstr "Дневне архиве: %s"
+msgstr "Дневна архива: %s"
 
-#: lib/utils.php:71
+#: lib/titles.php:21
 msgid "Monthly Archives: %s"
-msgstr "Месечне архиве: %s"
+msgstr "Месечна архива: %s"
 
-#: lib/utils.php:73
+#: lib/titles.php:23
 msgid "Yearly Archives: %s"
-msgstr "Годишње архиве: %s"
+msgstr "Годишња архива: %s"
 
-#: lib/utils.php:75
+#: lib/titles.php:26
 msgid "Author Archives: %s"
-msgstr "Архиве аутора: %s"
+msgstr "Архива аутора: %s"
 
-#: lib/utils.php:80
+#: lib/titles.php:31
 msgid "Search Results for %s"
-msgstr "Резултати претраге за %s"
+msgstr "Претрага за %s"
 
-#: lib/utils.php:82
+#: lib/titles.php:33
 msgid "Not Found"
-msgstr "Нема резултата"
-
-#: lib/utils.php:94
-msgid "Please make sure your <a href=\"%s\">.htaccess</a> file is writable "
-msgstr ""
-"Проверите да ли је дозвољено писање у <a href=\"%s\">.htaccess</a> датотеку"
+msgstr "Нема ничега"
 
 #: lib/widgets.php:8
-msgid "Primary Sidebar"
-msgstr "Основна бочна трака"
+msgid "Primary"
+msgstr "Основни"
 
 #: lib/widgets.php:17
 msgid "Footer"
-msgstr "Футер"
+msgstr "Доњи"
 
 #: lib/widgets.php:45
 msgid "Use this widget to add a vCard"
-msgstr "Употреби овај виџет за додавање vCard"
+msgstr "Виџет за додавање vCard-а"
 
 #: lib/widgets.php:47
 msgid "Roots: vCard"
-msgstr "Корени: vCard"
+msgstr "Roots: vCard"
 
 #: lib/widgets.php:74
 msgid "vCard"
@@ -174,11 +177,11 @@ msgstr "%1$s"
 
 #: templates/comment.php:5
 msgid "(Edit)"
-msgstr "(измени)"
+msgstr "(измена)"
 
 #: templates/comment.php:9
 msgid "Your comment is awaiting moderation."
-msgstr "Коментар чека одобрење."
+msgstr "Ваш коментар чека одобрење."
 
 #: templates/comments.php:8
 msgid "One Response to &ldquo;%2$s&rdquo;"
@@ -208,15 +211,15 @@ msgstr "Остави коментар на %s"
 
 #: templates/comments.php:48
 msgid "You must be <a href=\"%s\">logged in</a> to post a comment."
-msgstr "Мораш бити <a href=\"%s\">пријављен</a> да би сте оставили коментар."
+msgstr "Морате бити <a href=\"%s\">пријављени</a> да би сте оставили коментар."
 
 #: templates/comments.php:53
 msgid "Logged in as <a href=\"%s/wp-admin/profile.php\">%s</a>."
-msgstr "Пријављен као <a href=\"%s/wp-admin/profile.php\">%s</a>."
+msgstr "Пријављени сте као <a href=\"%s/wp-admin/profile.php\">%s</a>."
 
 #: templates/comments.php:54
 msgid "Log out of this account"
-msgstr "Одјави се"
+msgstr "Одјава са налога"
 
 #: templates/comments.php:54
 msgid "Log out &raquo;"
@@ -232,7 +235,7 @@ msgstr " (обавезно)"
 
 #: templates/comments.php:59
 msgid "Email (will not be published)"
-msgstr "емеил адреса (неће бити објављена)"
+msgstr "емеил адреса (невидљива)"
 
 #: templates/comments.php:61
 msgid "Website"
@@ -256,8 +259,8 @@ msgstr "аутор"
 
 #: templates/searchform.php:2
 msgid "Search for:"
-msgstr "Потрага за:"
+msgstr "Претрага за:"
 
 #: templates/searchform.php:3 templates/searchform.php:4
 msgid "Search"
-msgstr "Потрага"
+msgstr "Претрага"
diff --git a/lang/sr_rs.mo b/lang/sr_rs.mo
deleted file mode 100644
index 78f1300..0000000
Binary files a/lang/sr_rs.mo and /dev/null differ
diff --git a/lib/cleanup.php b/lib/cleanup.php
index 9594fc2..f966ca6 100644
--- a/lib/cleanup.php
+++ b/lib/cleanup.php
@@ -20,8 +20,6 @@ function roots_head_cleanup() {
   global $wp_widget_factory;
   remove_action('wp_head', array($wp_widget_factory->widgets['WP_Widget_Recent_Comments'], 'recent_comments_style'));
 
-  add_filter('use_default_gallery_style', '__return_null');
-
   if (!class_exists('WPSEO_Frontend')) {
     remove_action('wp_head', 'rel_canonical');
     add_action('wp_head', 'roots_rel_canonical');
@@ -137,16 +135,6 @@ function roots_embed_wrap($cache, $url, $attr = '', $post_ID = '') {
 }
 add_filter('embed_oembed_html', 'roots_embed_wrap', 10, 4);
 
-/**
- * Add class="thumbnail" to attachment items
- */
-function roots_attachment_link_class($html) {
-  $postid = get_the_ID();
-  $html = str_replace('<a', '<a class="thumbnail"', $html);
-  return $html;
-}
-add_filter('wp_get_attachment_link', 'roots_attachment_link_class', 10, 1);
-
 /**
  * Add Bootstrap thumbnail styling to images with captions
  * Use <figure> and <figcaption>
@@ -268,11 +256,11 @@ function roots_request_filter($query_vars) {
 add_filter('request', 'roots_request_filter');
 
 /**
- * Tell WordPress to use searchform.php from the templates/ directory
+ * Tell WordPress to use searchform.php from the templates/ directory. Requires WordPress 3.6+
  */
-function roots_get_search_form($argument) {
-  if ($argument === '') {
-    locate_template('/templates/searchform.php', true, false);
-  }
+function roots_get_search_form($form) {
+  $form = '';
+  locate_template('/templates/searchform.php', true, false);
+  return $form;
 }
 add_filter('get_search_form', 'roots_get_search_form');
diff --git a/lib/gallery.php b/lib/gallery.php
index 00f1582..a28693e 100644
--- a/lib/gallery.php
+++ b/lib/gallery.php
@@ -3,8 +3,9 @@
  * Clean up gallery_shortcode()
  *
  * Re-create the [gallery] shortcode and use thumbnails styling from Bootstrap
+ * The number of columns must be a factor of 12.
  *
- * @link http://twitter.github.com/bootstrap/components.html#thumbnails
+ * @link http://twbs.github.io/bootstrap/components/#thumbnails
  */
 function roots_gallery($attr) {
   $post = get_post();
@@ -39,7 +40,7 @@ function roots_gallery($attr) {
     'itemtag'    => '',
     'icontag'    => '',
     'captiontag' => '',
-    'columns'    => 3,
+    'columns'    => 4,
     'size'       => 'thumbnail',
     'include'    => '',
     'exclude'    => '',
@@ -47,6 +48,8 @@ function roots_gallery($attr) {
   ), $attr));
 
   $id = intval($id);
+  $columns = (12 % $columns == 0) ? $columns: 4;
+  $grid = sprintf('col-sm-%1$s col-lg-%1$s', 12/$columns);
 
   if ($order === 'RAND') {
     $orderby = 'none';
@@ -77,24 +80,41 @@ function roots_gallery($attr) {
     return $output;
   }
 
-  $output = '<ul class="thumbnails gallery">';
+  $unique = (get_query_var('page')) ? $instance . '-p' . get_query_var('page'): $instance;
+  $output = '<div class="gallery gallery-' . $id . '-' . $unique . '">';
 
   $i = 0;
   foreach ($attachments as $id => $attachment) {
     $image = ('file' == $link) ? wp_get_attachment_link($id, $size, false, false) : wp_get_attachment_link($id, $size, true, false);
-
-    $output .= '<li>' . $image;
+    $output .= ($i % $columns == 0) ? '<div class="row gallery-row">': '';
+    $output .= '<div class="' . $grid .'">' . $image;
+    
     if (trim($attachment->post_excerpt)) {
       $output .= '<div class="caption hidden">' . wptexturize($attachment->post_excerpt) . '</div>';
     }
-    $output .= '</li>';
+    
+    $output .= '</div>';
+    $i++;
+    $output .= ($i % $columns == 0) ? '</div>' : '';
   }
-
-  $output .= '</ul>';
+  
+  $output .= ($i % $columns != 0 ) ? '</div>' : '';
+  $output .= '</div>';
 
   return $output;
 }
 if (current_theme_supports('bootstrap-gallery')) {
   remove_shortcode('gallery');
   add_shortcode('gallery', 'roots_gallery');
+  add_filter('use_default_gallery_style', '__return_null');
 }
+
+/**
+ * Add class="thumbnail img-thumbnail" to attachment items
+ */
+function roots_attachment_link_class($html) {
+  $postid = get_the_ID();
+  $html = str_replace('<a', '<a class="thumbnail img-thumbnail"', $html);
+  return $html;
+}
+add_filter('wp_get_attachment_link', 'roots_attachment_link_class', 10, 1);
diff --git a/lib/nav.php b/lib/nav.php
index beac858..361329c 100644
--- a/lib/nav.php
+++ b/lib/nav.php
@@ -80,7 +80,7 @@ function roots_nav_menu_args($args = '') {
     $roots_nav_menu_args['items_wrap'] = '<ul class="%2$s">%3$s</ul>';
   }
 
-  if (current_theme_supports('bootstrap-top-navbar')) {
+  if (current_theme_supports('bootstrap-top-navbar') && !$args['depth']) {
     $roots_nav_menu_args['depth'] = 2;
   }
 
diff --git a/lib/rewrites.php b/lib/rewrites.php
index 25d6060..d6a1388 100644
--- a/lib/rewrites.php
+++ b/lib/rewrites.php
@@ -17,9 +17,7 @@
 function roots_add_rewrites($content) {
   global $wp_rewrite;
   $roots_new_non_wp_rules = array(
-    'assets/css/(.*)'      => THEME_PATH . '/assets/css/$1',
-    'assets/js/(.*)'       => THEME_PATH . '/assets/js/$1',
-    'assets/img/(.*)'      => THEME_PATH . '/assets/img/$1',
+    'assets/(.*)'          => THEME_PATH . '/assets/$1',
     'plugins/(.*)'         => RELATIVE_PLUGIN_PATH . '/$1'
   );
   $wp_rewrite->non_wp_rules = array_merge($wp_rewrite->non_wp_rules, $roots_new_non_wp_rules);
diff --git a/templates/entry-meta.php b/templates/entry-meta.php
index 7061f47..e0ba57e 100644
--- a/templates/entry-meta.php
+++ b/templates/entry-meta.php
@@ -1,2 +1,2 @@
-<time class="updated" datetime="<?php echo get_the_time('c'); ?>" pubdate><?php echo get_the_date(); ?></time>
+<time class="published" datetime="<?php echo get_the_time('c'); ?>"><?php echo get_the_date(); ?></time>
 <p class="byline author vcard"><?php echo __('By', 'roots'); ?> <a href="<?php echo get_author_posts_url(get_the_author_meta('ID')); ?>" rel="author" class="fn"><?php echo get_the_author(); ?></a></p>
diff --git a/templates/searchform.php b/templates/searchform.php
index 81b560a..ab85998 100644
--- a/templates/searchform.php
+++ b/templates/searchform.php
@@ -1,9 +1,9 @@
-<form role="search" method="get" id="searchform" class="form-inline" action="<?php echo home_url('/'); ?>">
+<form role="search" method="get" class="search-form form-inline" action="<?php echo home_url('/'); ?>">
   <div class="input-group">
-    <input type="search" value="<?php if (is_search()) { echo get_search_query(); } ?>" name="s" id="s" class="form-control" placeholder="<?php _e('Search', 'roots'); ?> <?php bloginfo('name'); ?>">
-    <label class="hide" for="s"><?php _e('Search for:', 'roots'); ?></label>
+    <input type="search" value="<?php if (is_search()) { echo get_search_query(); } ?>" name="s" class="search-field form-control" placeholder="<?php _e('Search', 'roots'); ?> <?php bloginfo('name'); ?>">
+    <label class="hide"><?php _e('Search for:', 'roots'); ?></label>
     <span class="input-group-btn">
-      <button type="submit" id="searchsubmit" class="btn btn-default"><?php _e('Search', 'roots'); ?></button>
+      <button type="submit" class="search-submit btn btn-default"><?php _e('Search', 'roots'); ?></button>
     </span>
   </div>
 </form>