diff --git a/.gitignore b/.gitignore
index 8387709b..d1b69986 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ config/environments/development.rb
 capfile
 config/environments/fcschinke09.rb
 *.swp
+public/**/*_cached.*
diff --git a/app/views/layouts/application.haml b/app/views/layouts/application.haml
index 1fffe16a..8f531233 100644
--- a/app/views/layouts/application.haml
+++ b/app/views/layouts/application.haml
@@ -3,16 +3,12 @@
   %head
     %meta{"http-equiv" => "content-type", :content => "text/html;charset=UTF-8"}
     %title= "FoodSoft - " + (yield(:title) or controller.controller_name)
-    = stylesheet_link_tag 'foodsoft'
+    = stylesheet_link_tag 'main', 'rails_messages', 'nav', :cache => "all_cached"
     = stylesheet_link_tag "print", :media => "print"
     <!--[if lte IE 7]>
     = stylesheet_link_tag 'ie_hacks'
     <![endif]-->
-    = javascript_include_tag 'prototype'
-    = javascript_include_tag 'effects'
-    = javascript_include_tag 'controls'
-    = javascript_include_tag 'application'
-    = javascript_include_tag('ordering') if (controller.controller_name == "ordering")
+    = javascript_include_tag 'prototype', 'effects', 'controls', 'application', 'ordering', :cache => "all_cached"
     = yield(:head)
   %body
     #logininfo= render :partial => 'shared/loginInfo'
diff --git a/config/environments/fcschinke.rb b/config/environments/fcschinke.rb
deleted file mode 100644
index 59aa5129..00000000
--- a/config/environments/fcschinke.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-# Settings specified here will take precedence over those in config/environment.rb
- 
-# In the development environment your application's code is reloaded on
-# every request. This slows down response time but is perfect for development
-# since you don't have to restart the webserver when you make code changes.
-config.cache_classes = false
- 
-# Log error messages when you accidentally call methods on nil.
-config.whiny_nils = true
- 
-# Show full error reports and disable caching
-config.action_controller.consider_all_requests_local = true
-config.action_controller.perform_caching = false
-config.action_view.debug_rjs = true
- 
-# Don't care if the mailer can't send
-config.action_mailer.raise_delivery_errors = false
- 
-# Configure an SMTP server for email sending in development mode:
-# (cf. http://rails.rubyonrails.com/classes/ActionMailer/Base.html for info on options)
-config.action_mailer.smtp_settings = {
-  :address => "smtp.gmx.net",
-  :port => 25,
-  :domain => "gmx.net",
-  :authentication => :login,
-  :user_name => "benjamin.meichsner@gmx.de",
-  :password => "ben234go"
-}
diff --git a/public/stylesheets/foodsoft.css b/public/stylesheets/foodsoft.css
deleted file mode 100644
index 8fbd6502..00000000
--- a/public/stylesheets/foodsoft.css
+++ /dev/null
@@ -1,5 +0,0 @@
-/* FoodSoft Style-Sheet */
-
-@import "main.css";
-@import "rails_messages.css";
-@import "nav.css";
\ No newline at end of file