diff --git a/vendor/plugins/design/lib/design.rb b/vendor/plugins/design/lib/design.rb
index 2bcd59d..1b559f0 100644
--- a/vendor/plugins/design/lib/design.rb
+++ b/vendor/plugins/design/lib/design.rb
@@ -26,4 +26,35 @@ module Design
     data[:design] # redundant, but makes more clear the return value
   end
   protected :design
+
+  # returns the path to the designs directory, relative to the +public+
+  # directory of your application.
+  #
+  # Defaults to #{RAILS_ROOT}/public/designs
+  def Design.design_root
+    Design.instance_variable_get('@design_root') || 'designs'
+  end
+
+  # sets the path to the designs directory.
+  #
+  # Passing nil resets +design_root+ to its default value.
+  def Design.design_root=(dir)
+    Design.instance_variable_set('@design_root', dir)
+  end
+
+  # :nodoc:
+  #
+  # used for testing
+  def Design.public_filesystem_root
+    Design.instance_variable_get('@public_filesystem_root') || File.join(RAILS_ROOT, 'public')
+  end
+
+  # :nodoc:
+  #
+  # used for testing
+  def Design.public_filesystem_root=(value)
+    Design.instance_variable_set('@public_filesystem_root', value)
+  end
+
+
 end
diff --git a/vendor/plugins/design/lib/design/helper.rb b/vendor/plugins/design/lib/design/helper.rb
index 8ef6e17..2d06429 100644
--- a/vendor/plugins/design/lib/design/helper.rb
+++ b/vendor/plugins/design/lib/design/helper.rb
@@ -76,45 +76,40 @@ module Design
       end
     end
 
-    # TODO: test stuff below this comment
+    ####################################
+    # TEMPLATES
+    ####################################
 
-    ########################################################
-    # Template
-    ########################################################
-    # Load all the javascript files of a existing template with the template_name passed as argument.
-    #
-    # The files loaded are in the path:
+    # Generates <script> tags for all existing javascript files of the current
+    # design template.
     #
-    # 'public/templates/#{template_name}/javascripts/*'
-    #
-    # If a invalid template it's passed the default template is applied
-    def javascript_include_tag_for_template
-      template_javascript_dir = Dir.glob("#{RAILS_ROOT}/public/templates/#{@ft_config[:template]}/javascripts/*.js")
+    # The javascript files must be named as *.js and must be under
+    # #{RAILS_ROOT}/public/#{Design.design_root}/templates/#{templatename}/javascripts.
+    def design_template_javascript_include_tags
+      pattern = File.join(Design.public_filesystem_root, Design.design_root, 'templates', design.template, 'javascripts', '*.js')
+      javascript_files = Dir.glob(pattern)
 
-      return if template_javascript_dir.blank?
+      return '' if javascript_files.empty?
 
-      parse_path(template_javascript_dir).map do |filename|
-        javascript_include_tag(filename)
-      end
+      javascript_files.map do |filename|
+        javascript_include_tag('/' + File.join(Design.design_root, 'templates', design.template, 'javascripts', File.basename(filename)))
+      end.join("\n")
     end
 
-    # Load all the css files of a existing template with the template_name passed as argument.
-    #
-    # The files loaded are in the path:
+    # Generates links to all the CSS files provided by the template being used.
     #
-    # 'public/templates/#{template_name}/stylesheets/*'
-    # If a invalid template it's passed the default template is applied
-    def stylesheet_link_tag_for_template
-      template_stylesheet_dir = Dir.glob("#{RAILS_ROOT}/public/templates/#{@ft_config[:template]}/stylesheets/*.css")
-
-      if template_stylesheet_dir.blank?
-        flash[:notice] = _("There is no stylesheets in directory %s of template %s.") % [ template_stylesheet_dir, @ft_config[:template]]
-        return
-      end
+    # The CSS files must be named as *.css and live in the directory
+    # #{RAILS_ROOT}/public/#{Design.design_root}/templates/#{templatename}/stylesheets/
+    def design_template_stylesheet_link_tags
 
-      parse_path(template_stylesheet_dir).map do |filename|
-        stylesheet_link_tag(filename)
-      end
+      pattern = File.join(Design.public_filesystem_root, Design.design_root, 'templates', design.template, 'stylesheets', '*.css')
+      stylesheet_files = Dir.glob(pattern)
+
+      return '' if stylesheet_files.empty?
+
+      stylesheet_files.map do |filename|
+        stylesheet_link_tag('/' + File.join(Design.design_root, 'templates', design.template, 'stylesheets', File.basename(filename)))
+      end.join("\n")
     end
 
 
@@ -122,42 +117,37 @@ module Design
     #THEMES 
     #################################################
 
-    # Load all the css files of a existing theme with the @ft_config[:theme] passed as argument in owner object.
-    #
-    # The files loaded are in the path:
+    # generates links for all existing theme CSS files in the current design.
     #
-    # 'public/themes/#{theme_name}/*'
-    # If a invalid theme it's passed the 'default' theme is applied
-    def stylesheet_link_tag_for_theme
-      path = "#{RAILS_ROOT}/public/themes/#{@ft_config[:theme]}/"
-      theme_dir = Dir.glob(path+"*")
-
-      return if theme_dir.blank?
-
-      parse_path(theme_dir).map do |filename|
-        stylesheet_link_tag(filename)
-      end
+    # The CSS files must be named as *.css and live in the directory
+    # #{RAILS_ROOT}/public/#{Design.design_root}/themes/{theme_name}/
+    def design_theme_stylesheet_link_tags
+      pattern = File.join(Design.public_filesystem_root, Design.design_root, 'themes', design.theme, '*.css')
+      stylesheet_files = Dir.glob(pattern)
 
-    end
+      return '' if stylesheet_files.empty?
 
+      stylesheet_files.map do |filename|
+        stylesheet_link_tag('/' + File.join(Design.design_root, 'themes', design.theme, File.basename(filename)))
+      end.join("\n")
 
-    #Display a given icon passed as argument
-    #The icon path should be '/icons/{icon_theme}/{icon_image}'
-    def display_icon(icon, options = {})
-      image_tag("/icons/#{@ft_config[:icon_theme]}/#{icon}.png", options)
     end
 
-    private
- 
+    ###############################################
+    # ICON THEME STUFF
+    ###############################################
 
-    # Check if the current controller is the controller that allows layout editing
-    def edit_mode?
-      controller.flexible_template_edit_template?
-    end 
-
-    def parse_path(files_path = [], remove_until = 'public')
-      remove_until = remove_until.gsub(/\//, '\/')
-      files_path.map{|f| f.gsub(/.*#{remove_until}/, '')}
+    # displays the icon given named after the +icon+ argument, using the
+    # current icon_theme.
+    #
+    # There must be a file named +icon+.png in the directory 
+    # #{RAILS_ROOT}/public/designs/icons/#{icon_theme}
+    # 
+    # Ths optional +options+ argument is passed untouched to the image_tag
+    # Rails helper
+    def design_display_icon(icon, options = {})
+      filename = (icon =~ /\.png$/) ? icon : (icon + '.png')
+      image_tag('/' + File.join(Design.design_root, 'icons', design.icon_theme, filename), options)
     end
 
   end # END OF module Helper
diff --git a/vendor/plugins/design/test/design_helper_test.rb b/vendor/plugins/design/test/design_helper_test.rb
index 8dc3e4a..f8f010a 100644
--- a/vendor/plugins/design/test/design_helper_test.rb
+++ b/vendor/plugins/design/test/design_helper_test.rb
@@ -38,6 +38,27 @@ class DesignHelperTestController < ActionController::Base
   def index
     render :inline => '<%= design_display("my content") %>'
   end
+
+  def javascript
+    render :inline => '<%=  design_template_javascript_include_tags %>'
+  end
+
+  def template_stylesheets
+    render :inline => '<%= design_template_stylesheet_link_tags  %>'
+  end
+
+  def theme_stylesheets
+    render :inline => '<%= design_theme_stylesheet_link_tags %>'
+  end
+
+  def icons
+    # one with extension and other without
+    render :inline => '
+      <%= design_display_icon("something") %>
+      <%= design_display_icon("another.png") %>
+    '
+  end
+
 end
 
 class DesignHelperTest < Test::Unit::TestCase
@@ -46,6 +67,12 @@ class DesignHelperTest < Test::Unit::TestCase
     @controller = DesignHelperTestController.new
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
+
+    Design.public_filesystem_root = File.join(File.dirname(__FILE__))
+  end
+
+  def teardown
+    Design.public_filesystem_root = nil
   end
 
   def test_should_generate_all_boxes
@@ -78,4 +105,46 @@ class DesignHelperTest < Test::Unit::TestCase
     assert_tag :tag => 'div', :content => "this is a fixed content block hacked for testing", :attributes => { :class => 'block' }
   end
 
+  def test_should_provide_javascript_link_if_available
+    get :javascript
+    assert_tag :tag => 'script', :attributes => {
+      :type => 'text/javascript',
+      :src => '/designs/templates/default/javascripts/one.js'
+    }
+    assert_tag :tag => 'script', :attributes => {
+      :type => 'text/javascript',
+      :src => '/designs/templates/default/javascripts/two.js'
+    }
+  end
+
+  def test_should_provide_stylesheet_links_if_available
+    get :template_stylesheets
+    assert_tag :tag => 'link', :attributes => {
+      :type => 'text/css',
+      :href => '/designs/templates/default/stylesheets/one.css'
+    }
+    assert_tag :tag => 'link', :attributes => {
+      :type => 'text/css',
+      :href => '/designs/templates/default/stylesheets/two.css'
+    }
+  end
+
+  def test_should_provide_theme_stylesheet_links_if_available
+    get :theme_stylesheets
+    assert_tag :tag => 'link', :attributes => {
+      :type => 'text/css',
+      :href => '/designs/themes/default/one.css'
+    }
+  end
+
+  def test_should_support_displaying_icons
+    get :icons
+    assert_tag :tag => 'img', :attributes => {
+      :src => '/designs/icons/default/something.png'
+    }
+    assert_tag :tag => 'img', :attributes => {
+      :src => '/designs/icons/default/another.png'
+    }
+  end
+
 end
diff --git a/vendor/plugins/design/test/design_test.rb b/vendor/plugins/design/test/design_test.rb
index b8688e4..e99d66e 100644
--- a/vendor/plugins/design/test/design_test.rb
+++ b/vendor/plugins/design/test/design_test.rb
@@ -31,4 +31,23 @@ class DesignTest < Test::Unit::TestCase
     assert_kind_of Hash, FixedDesignTestController.design_plugin_config
   end
 
+  def test_should_be_able_to_change_design_root
+    Design.design_root = 'some_design_root'
+    assert_equal 'some_design_root', Design.design_root
+    Design.design_root = nil # reset
+  end
+
+  def test_should_provide_a_sensible_default_for_design_root
+    Design.design_root = nil
+    assert_equal File.join('designs'), Design.design_root
+  end
+
+  # used for testing
+  def test_changing_public_filesystem_root
+    Design.public_filesystem_root = 'test'
+    assert_equal 'test', Design.public_filesystem_root
+    Design.public_filesystem_root = nil
+    assert_equal File.join(RAILS_ROOT, 'public'), Design.public_filesystem_root
+  end
+
 end
diff --git a/vendor/plugins/design/test/designs/icons/default/another.png b/vendor/plugins/design/test/designs/icons/default/another.png
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/vendor/plugins/design/test/designs/icons/default/another.png
diff --git a/vendor/plugins/design/test/designs/icons/default/something.png b/vendor/plugins/design/test/designs/icons/default/something.png
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/vendor/plugins/design/test/designs/icons/default/something.png
diff --git a/vendor/plugins/design/test/designs/themes/default/one.css b/vendor/plugins/design/test/designs/themes/default/one.css
new file mode 100644
index 0000000..40a8c17
--- /dev/null
+++ b/vendor/plugins/design/test/designs/themes/default/one.css
@@ -0,0 +1 @@
+/* empty */
--
libgit2 0.21.2