diff --git a/public/designs/themes/aluminium/footer.html.erb b/public/designs/themes/aluminium/footer.html.erb
new file mode 120000
index 0000000..3c5b5c0
--- /dev/null
+++ b/public/designs/themes/aluminium/footer.html.erb
@@ -0,0 +1 @@
+../profile-base/footer.html.erb
\ No newline at end of file
diff --git a/public/designs/themes/aluminium/footer.rhtml b/public/designs/themes/aluminium/footer.rhtml
deleted file mode 120000
index 18e6abd..0000000
--- a/public/designs/themes/aluminium/footer.rhtml
+++ /dev/null
@@ -1 +0,0 @@
-../profile-base/footer.rhtml
\ No newline at end of file
diff --git a/public/designs/themes/aluminium/header.html.erb b/public/designs/themes/aluminium/header.html.erb
new file mode 120000
index 0000000..067a2ee
--- /dev/null
+++ b/public/designs/themes/aluminium/header.html.erb
@@ -0,0 +1 @@
+../profile-base/header.html.erb
\ No newline at end of file
diff --git a/public/designs/themes/aluminium/header.rhtml b/public/designs/themes/aluminium/header.rhtml
deleted file mode 120000
index ab83dcb..0000000
--- a/public/designs/themes/aluminium/header.rhtml
+++ /dev/null
@@ -1 +0,0 @@
-../profile-base/header.rhtml
\ No newline at end of file
diff --git a/public/designs/themes/aluminium/site_title.html.erb b/public/designs/themes/aluminium/site_title.html.erb
new file mode 120000
index 0000000..bac189f
--- /dev/null
+++ b/public/designs/themes/aluminium/site_title.html.erb
@@ -0,0 +1 @@
+../profile-base/site_title.html.erb
\ No newline at end of file
diff --git a/public/designs/themes/aluminium/site_title.rhtml b/public/designs/themes/aluminium/site_title.rhtml
deleted file mode 120000
index a13a89e..0000000
--- a/public/designs/themes/aluminium/site_title.rhtml
+++ /dev/null
@@ -1 +0,0 @@
-../profile-base/site_title.rhtml
\ No newline at end of file
diff --git a/public/designs/themes/base/footer.html.erb b/public/designs/themes/base/footer.html.erb
new file mode 100644
index 0000000..4e1a0bc
--- /dev/null
+++ b/public/designs/themes/base/footer.html.erb
@@ -0,0 +1,7 @@
+
+
+<%= language_chooser(environment) %>
diff --git a/public/designs/themes/base/footer.rhtml b/public/designs/themes/base/footer.rhtml
deleted file mode 100644
index 4e1a0bc..0000000
--- a/public/designs/themes/base/footer.rhtml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-<%= language_chooser(environment) %>
diff --git a/public/designs/themes/base/header.html.erb b/public/designs/themes/base/header.html.erb
new file mode 100644
index 0000000..c341a40
--- /dev/null
+++ b/public/designs/themes/base/header.html.erb
@@ -0,0 +1 @@
+
diff --git a/public/designs/themes/base/header.rhtml b/public/designs/themes/base/header.rhtml
deleted file mode 100644
index c341a40..0000000
--- a/public/designs/themes/base/header.rhtml
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/public/designs/themes/base/navigation.html.erb b/public/designs/themes/base/navigation.html.erb
new file mode 100644
index 0000000..f5ba0a2
--- /dev/null
+++ b/public/designs/themes/base/navigation.html.erb
@@ -0,0 +1,10 @@
+
+ <%= search_people_menu %>
+
+
+ <%= search_communities_menu %>
+
+
+ <%= search_contents_menu %>
+
+
diff --git a/public/designs/themes/base/navigation.rhtml b/public/designs/themes/base/navigation.rhtml
deleted file mode 100644
index f5ba0a2..0000000
--- a/public/designs/themes/base/navigation.rhtml
+++ /dev/null
@@ -1,10 +0,0 @@
-
- <%= search_people_menu %>
-
-
- <%= search_communities_menu %>
-
-
- <%= search_contents_menu %>
-
-
diff --git a/public/designs/themes/butter/footer.html.erb b/public/designs/themes/butter/footer.html.erb
new file mode 120000
index 0000000..3c5b5c0
--- /dev/null
+++ b/public/designs/themes/butter/footer.html.erb
@@ -0,0 +1 @@
+../profile-base/footer.html.erb
\ No newline at end of file
diff --git a/public/designs/themes/butter/footer.rhtml b/public/designs/themes/butter/footer.rhtml
deleted file mode 120000
index 18e6abd..0000000
--- a/public/designs/themes/butter/footer.rhtml
+++ /dev/null
@@ -1 +0,0 @@
-../profile-base/footer.rhtml
\ No newline at end of file
diff --git a/public/designs/themes/butter/header.html.erb b/public/designs/themes/butter/header.html.erb
new file mode 120000
index 0000000..067a2ee
--- /dev/null
+++ b/public/designs/themes/butter/header.html.erb
@@ -0,0 +1 @@
+../profile-base/header.html.erb
\ No newline at end of file
diff --git a/public/designs/themes/butter/header.rhtml b/public/designs/themes/butter/header.rhtml
deleted file mode 120000
index ab83dcb..0000000
--- a/public/designs/themes/butter/header.rhtml
+++ /dev/null
@@ -1 +0,0 @@
-../profile-base/header.rhtml
\ No newline at end of file
diff --git a/public/designs/themes/butter/site_title.html.erb b/public/designs/themes/butter/site_title.html.erb
new file mode 120000
index 0000000..bac189f
--- /dev/null
+++ b/public/designs/themes/butter/site_title.html.erb
@@ -0,0 +1 @@
+../profile-base/site_title.html.erb
\ No newline at end of file
diff --git a/public/designs/themes/butter/site_title.rhtml b/public/designs/themes/butter/site_title.rhtml
deleted file mode 120000
index a13a89e..0000000
--- a/public/designs/themes/butter/site_title.rhtml
+++ /dev/null
@@ -1 +0,0 @@
-../profile-base/site_title.rhtml
\ No newline at end of file
diff --git a/public/designs/themes/chameleon/footer.html.erb b/public/designs/themes/chameleon/footer.html.erb
new file mode 120000
index 0000000..3c5b5c0
--- /dev/null
+++ b/public/designs/themes/chameleon/footer.html.erb
@@ -0,0 +1 @@
+../profile-base/footer.html.erb
\ No newline at end of file
diff --git a/public/designs/themes/chameleon/footer.rhtml b/public/designs/themes/chameleon/footer.rhtml
deleted file mode 120000
index 18e6abd..0000000
--- a/public/designs/themes/chameleon/footer.rhtml
+++ /dev/null
@@ -1 +0,0 @@
-../profile-base/footer.rhtml
\ No newline at end of file
diff --git a/public/designs/themes/chameleon/header.html.erb b/public/designs/themes/chameleon/header.html.erb
new file mode 120000
index 0000000..067a2ee
--- /dev/null
+++ b/public/designs/themes/chameleon/header.html.erb
@@ -0,0 +1 @@
+../profile-base/header.html.erb
\ No newline at end of file
diff --git a/public/designs/themes/chameleon/header.rhtml b/public/designs/themes/chameleon/header.rhtml
deleted file mode 120000
index ab83dcb..0000000
--- a/public/designs/themes/chameleon/header.rhtml
+++ /dev/null
@@ -1 +0,0 @@
-../profile-base/header.rhtml
\ No newline at end of file
diff --git a/public/designs/themes/chameleon/site_title.html.erb b/public/designs/themes/chameleon/site_title.html.erb
new file mode 120000
index 0000000..bac189f
--- /dev/null
+++ b/public/designs/themes/chameleon/site_title.html.erb
@@ -0,0 +1 @@
+../profile-base/site_title.html.erb
\ No newline at end of file
diff --git a/public/designs/themes/chameleon/site_title.rhtml b/public/designs/themes/chameleon/site_title.rhtml
deleted file mode 120000
index a13a89e..0000000
--- a/public/designs/themes/chameleon/site_title.rhtml
+++ /dev/null
@@ -1 +0,0 @@
-../profile-base/site_title.rhtml
\ No newline at end of file
diff --git a/public/designs/themes/chocolate/footer.html.erb b/public/designs/themes/chocolate/footer.html.erb
new file mode 120000
index 0000000..3c5b5c0
--- /dev/null
+++ b/public/designs/themes/chocolate/footer.html.erb
@@ -0,0 +1 @@
+../profile-base/footer.html.erb
\ No newline at end of file
diff --git a/public/designs/themes/chocolate/footer.rhtml b/public/designs/themes/chocolate/footer.rhtml
deleted file mode 120000
index 18e6abd..0000000
--- a/public/designs/themes/chocolate/footer.rhtml
+++ /dev/null
@@ -1 +0,0 @@
-../profile-base/footer.rhtml
\ No newline at end of file
diff --git a/public/designs/themes/chocolate/header.html.erb b/public/designs/themes/chocolate/header.html.erb
new file mode 120000
index 0000000..067a2ee
--- /dev/null
+++ b/public/designs/themes/chocolate/header.html.erb
@@ -0,0 +1 @@
+../profile-base/header.html.erb
\ No newline at end of file
diff --git a/public/designs/themes/chocolate/header.rhtml b/public/designs/themes/chocolate/header.rhtml
deleted file mode 120000
index ab83dcb..0000000
--- a/public/designs/themes/chocolate/header.rhtml
+++ /dev/null
@@ -1 +0,0 @@
-../profile-base/header.rhtml
\ No newline at end of file
diff --git a/public/designs/themes/chocolate/site_title.html.erb b/public/designs/themes/chocolate/site_title.html.erb
new file mode 120000
index 0000000..bac189f
--- /dev/null
+++ b/public/designs/themes/chocolate/site_title.html.erb
@@ -0,0 +1 @@
+../profile-base/site_title.html.erb
\ No newline at end of file
diff --git a/public/designs/themes/chocolate/site_title.rhtml b/public/designs/themes/chocolate/site_title.rhtml
deleted file mode 120000
index a13a89e..0000000
--- a/public/designs/themes/chocolate/site_title.rhtml
+++ /dev/null
@@ -1 +0,0 @@
-../profile-base/site_title.rhtml
\ No newline at end of file
diff --git a/public/designs/themes/noosfero/footer.html.erb b/public/designs/themes/noosfero/footer.html.erb
new file mode 120000
index 0000000..97dded9
--- /dev/null
+++ b/public/designs/themes/noosfero/footer.html.erb
@@ -0,0 +1 @@
+../base/footer.html.erb
\ No newline at end of file
diff --git a/public/designs/themes/noosfero/footer.rhtml b/public/designs/themes/noosfero/footer.rhtml
deleted file mode 120000
index 7e3e084..0000000
--- a/public/designs/themes/noosfero/footer.rhtml
+++ /dev/null
@@ -1 +0,0 @@
-../base/footer.rhtml
\ No newline at end of file
diff --git a/public/designs/themes/noosfero/header.html.erb b/public/designs/themes/noosfero/header.html.erb
new file mode 100644
index 0000000..c341a40
--- /dev/null
+++ b/public/designs/themes/noosfero/header.html.erb
@@ -0,0 +1 @@
+
diff --git a/public/designs/themes/noosfero/header.rhtml b/public/designs/themes/noosfero/header.rhtml
deleted file mode 100644
index c341a40..0000000
--- a/public/designs/themes/noosfero/header.rhtml
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/public/designs/themes/noosfero/navigation.html.erb b/public/designs/themes/noosfero/navigation.html.erb
new file mode 120000
index 0000000..e4158f8
--- /dev/null
+++ b/public/designs/themes/noosfero/navigation.html.erb
@@ -0,0 +1 @@
+../base/navigation.html.erb
\ No newline at end of file
diff --git a/public/designs/themes/noosfero/navigation.rhtml b/public/designs/themes/noosfero/navigation.rhtml
deleted file mode 120000
index 5001a9c..0000000
--- a/public/designs/themes/noosfero/navigation.rhtml
+++ /dev/null
@@ -1 +0,0 @@
-../base/navigation.rhtml
\ No newline at end of file
diff --git a/public/designs/themes/noosfero/site_title.html.erb b/public/designs/themes/noosfero/site_title.html.erb
new file mode 100644
index 0000000..f5cc1aa
--- /dev/null
+++ b/public/designs/themes/noosfero/site_title.html.erb
@@ -0,0 +1 @@
+<%= link_to(image_tag("/designs/themes/noosfero/images/logo-noosfero.png"), environment.top_url) %>
diff --git a/public/designs/themes/noosfero/site_title.rhtml b/public/designs/themes/noosfero/site_title.rhtml
deleted file mode 100644
index f5cc1aa..0000000
--- a/public/designs/themes/noosfero/site_title.rhtml
+++ /dev/null
@@ -1 +0,0 @@
-<%= link_to(image_tag("/designs/themes/noosfero/images/logo-noosfero.png"), environment.top_url) %>
diff --git a/public/designs/themes/orange/footer.html.erb b/public/designs/themes/orange/footer.html.erb
new file mode 120000
index 0000000..3c5b5c0
--- /dev/null
+++ b/public/designs/themes/orange/footer.html.erb
@@ -0,0 +1 @@
+../profile-base/footer.html.erb
\ No newline at end of file
diff --git a/public/designs/themes/orange/footer.rhtml b/public/designs/themes/orange/footer.rhtml
deleted file mode 120000
index 18e6abd..0000000
--- a/public/designs/themes/orange/footer.rhtml
+++ /dev/null
@@ -1 +0,0 @@
-../profile-base/footer.rhtml
\ No newline at end of file
diff --git a/public/designs/themes/orange/header.html.erb b/public/designs/themes/orange/header.html.erb
new file mode 120000
index 0000000..067a2ee
--- /dev/null
+++ b/public/designs/themes/orange/header.html.erb
@@ -0,0 +1 @@
+../profile-base/header.html.erb
\ No newline at end of file
diff --git a/public/designs/themes/orange/header.rhtml b/public/designs/themes/orange/header.rhtml
deleted file mode 120000
index ab83dcb..0000000
--- a/public/designs/themes/orange/header.rhtml
+++ /dev/null
@@ -1 +0,0 @@
-../profile-base/header.rhtml
\ No newline at end of file
diff --git a/public/designs/themes/orange/site_title.html.erb b/public/designs/themes/orange/site_title.html.erb
new file mode 120000
index 0000000..bac189f
--- /dev/null
+++ b/public/designs/themes/orange/site_title.html.erb
@@ -0,0 +1 @@
+../profile-base/site_title.html.erb
\ No newline at end of file
diff --git a/public/designs/themes/orange/site_title.rhtml b/public/designs/themes/orange/site_title.rhtml
deleted file mode 120000
index a13a89e..0000000
--- a/public/designs/themes/orange/site_title.rhtml
+++ /dev/null
@@ -1 +0,0 @@
-../profile-base/site_title.rhtml
\ No newline at end of file
diff --git a/public/designs/themes/plum/footer.html.erb b/public/designs/themes/plum/footer.html.erb
new file mode 120000
index 0000000..3c5b5c0
--- /dev/null
+++ b/public/designs/themes/plum/footer.html.erb
@@ -0,0 +1 @@
+../profile-base/footer.html.erb
\ No newline at end of file
diff --git a/public/designs/themes/plum/footer.rhtml b/public/designs/themes/plum/footer.rhtml
deleted file mode 120000
index 18e6abd..0000000
--- a/public/designs/themes/plum/footer.rhtml
+++ /dev/null
@@ -1 +0,0 @@
-../profile-base/footer.rhtml
\ No newline at end of file
diff --git a/public/designs/themes/plum/header.html.erb b/public/designs/themes/plum/header.html.erb
new file mode 120000
index 0000000..067a2ee
--- /dev/null
+++ b/public/designs/themes/plum/header.html.erb
@@ -0,0 +1 @@
+../profile-base/header.html.erb
\ No newline at end of file
diff --git a/public/designs/themes/plum/header.rhtml b/public/designs/themes/plum/header.rhtml
deleted file mode 120000
index ab83dcb..0000000
--- a/public/designs/themes/plum/header.rhtml
+++ /dev/null
@@ -1 +0,0 @@
-../profile-base/header.rhtml
\ No newline at end of file
diff --git a/public/designs/themes/plum/site_title.html.erb b/public/designs/themes/plum/site_title.html.erb
new file mode 120000
index 0000000..bac189f
--- /dev/null
+++ b/public/designs/themes/plum/site_title.html.erb
@@ -0,0 +1 @@
+../profile-base/site_title.html.erb
\ No newline at end of file
diff --git a/public/designs/themes/plum/site_title.rhtml b/public/designs/themes/plum/site_title.rhtml
deleted file mode 120000
index a13a89e..0000000
--- a/public/designs/themes/plum/site_title.rhtml
+++ /dev/null
@@ -1 +0,0 @@
-../profile-base/site_title.rhtml
\ No newline at end of file
diff --git a/public/designs/themes/profile-base/footer.html.erb b/public/designs/themes/profile-base/footer.html.erb
new file mode 100644
index 0000000..9218869
--- /dev/null
+++ b/public/designs/themes/profile-base/footer.html.erb
@@ -0,0 +1,3 @@
+
diff --git a/public/designs/themes/profile-base/footer.rhtml b/public/designs/themes/profile-base/footer.rhtml
deleted file mode 100644
index 9218869..0000000
--- a/public/designs/themes/profile-base/footer.rhtml
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/public/designs/themes/profile-base/header.html.erb b/public/designs/themes/profile-base/header.html.erb
new file mode 100644
index 0000000..856bf3e
--- /dev/null
+++ b/public/designs/themes/profile-base/header.html.erb
@@ -0,0 +1,18 @@
+
+
+
diff --git a/public/designs/themes/profile-base/header.rhtml b/public/designs/themes/profile-base/header.rhtml
deleted file mode 100644
index 856bf3e..0000000
--- a/public/designs/themes/profile-base/header.rhtml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
diff --git a/public/designs/themes/profile-base/site_title.html.erb b/public/designs/themes/profile-base/site_title.html.erb
new file mode 100644
index 0000000..ead1cf1
--- /dev/null
+++ b/public/designs/themes/profile-base/site_title.html.erb
@@ -0,0 +1,5 @@
+<% if File.exists?(File.join(Rails.root, 'public', "/designs/themes/#{environment.theme}/images/thin-logo.png")) %>
+ <%= link_to(image_tag("/designs/themes/#{environment.theme}/images/thin-logo.png"), environment.top_url) %>
+<% else %>
+ <%= link_to(image_tag("/designs/themes/noosfero/images/thin-logo.png"), environment.top_url) %>
+<% end %>
diff --git a/public/designs/themes/profile-base/site_title.rhtml b/public/designs/themes/profile-base/site_title.rhtml
deleted file mode 100644
index ead1cf1..0000000
--- a/public/designs/themes/profile-base/site_title.rhtml
+++ /dev/null
@@ -1,5 +0,0 @@
-<% if File.exists?(File.join(Rails.root, 'public', "/designs/themes/#{environment.theme}/images/thin-logo.png")) %>
- <%= link_to(image_tag("/designs/themes/#{environment.theme}/images/thin-logo.png"), environment.top_url) %>
-<% else %>
- <%= link_to(image_tag("/designs/themes/noosfero/images/thin-logo.png"), environment.top_url) %>
-<% end %>
diff --git a/public/designs/themes/scarletred/footer.html.erb b/public/designs/themes/scarletred/footer.html.erb
new file mode 120000
index 0000000..3c5b5c0
--- /dev/null
+++ b/public/designs/themes/scarletred/footer.html.erb
@@ -0,0 +1 @@
+../profile-base/footer.html.erb
\ No newline at end of file
diff --git a/public/designs/themes/scarletred/footer.rhtml b/public/designs/themes/scarletred/footer.rhtml
deleted file mode 120000
index 18e6abd..0000000
--- a/public/designs/themes/scarletred/footer.rhtml
+++ /dev/null
@@ -1 +0,0 @@
-../profile-base/footer.rhtml
\ No newline at end of file
diff --git a/public/designs/themes/scarletred/header.html.erb b/public/designs/themes/scarletred/header.html.erb
new file mode 120000
index 0000000..067a2ee
--- /dev/null
+++ b/public/designs/themes/scarletred/header.html.erb
@@ -0,0 +1 @@
+../profile-base/header.html.erb
\ No newline at end of file
diff --git a/public/designs/themes/scarletred/header.rhtml b/public/designs/themes/scarletred/header.rhtml
deleted file mode 120000
index ab83dcb..0000000
--- a/public/designs/themes/scarletred/header.rhtml
+++ /dev/null
@@ -1 +0,0 @@
-../profile-base/header.rhtml
\ No newline at end of file
diff --git a/public/designs/themes/scarletred/site_title.html.erb b/public/designs/themes/scarletred/site_title.html.erb
new file mode 120000
index 0000000..bac189f
--- /dev/null
+++ b/public/designs/themes/scarletred/site_title.html.erb
@@ -0,0 +1 @@
+../profile-base/site_title.html.erb
\ No newline at end of file
diff --git a/public/designs/themes/scarletred/site_title.rhtml b/public/designs/themes/scarletred/site_title.rhtml
deleted file mode 120000
index a13a89e..0000000
--- a/public/designs/themes/scarletred/site_title.rhtml
+++ /dev/null
@@ -1 +0,0 @@
-../profile-base/site_title.rhtml
\ No newline at end of file
diff --git a/public/designs/themes/skyblue/footer.html.erb b/public/designs/themes/skyblue/footer.html.erb
new file mode 120000
index 0000000..3c5b5c0
--- /dev/null
+++ b/public/designs/themes/skyblue/footer.html.erb
@@ -0,0 +1 @@
+../profile-base/footer.html.erb
\ No newline at end of file
diff --git a/public/designs/themes/skyblue/footer.rhtml b/public/designs/themes/skyblue/footer.rhtml
deleted file mode 120000
index 18e6abd..0000000
--- a/public/designs/themes/skyblue/footer.rhtml
+++ /dev/null
@@ -1 +0,0 @@
-../profile-base/footer.rhtml
\ No newline at end of file
diff --git a/public/designs/themes/skyblue/header.html.erb b/public/designs/themes/skyblue/header.html.erb
new file mode 120000
index 0000000..067a2ee
--- /dev/null
+++ b/public/designs/themes/skyblue/header.html.erb
@@ -0,0 +1 @@
+../profile-base/header.html.erb
\ No newline at end of file
diff --git a/public/designs/themes/skyblue/header.rhtml b/public/designs/themes/skyblue/header.rhtml
deleted file mode 120000
index ab83dcb..0000000
--- a/public/designs/themes/skyblue/header.rhtml
+++ /dev/null
@@ -1 +0,0 @@
-../profile-base/header.rhtml
\ No newline at end of file
diff --git a/public/designs/themes/skyblue/site_title.html.erb b/public/designs/themes/skyblue/site_title.html.erb
new file mode 120000
index 0000000..bac189f
--- /dev/null
+++ b/public/designs/themes/skyblue/site_title.html.erb
@@ -0,0 +1 @@
+../profile-base/site_title.html.erb
\ No newline at end of file
diff --git a/public/designs/themes/skyblue/site_title.rhtml b/public/designs/themes/skyblue/site_title.rhtml
deleted file mode 120000
index a13a89e..0000000
--- a/public/designs/themes/skyblue/site_title.rhtml
+++ /dev/null
@@ -1 +0,0 @@
-../profile-base/site_title.rhtml
\ No newline at end of file
--
libgit2 0.21.2