65 files changed, 25 insertions, 12 deletions

diff --git a/css/images/no.png b/core/css/images/no.png
index fdc0f421255..fdc0f421255 100644
--- a/css/images/no.png
+++ b/core/css/images/no.png
diff --git a/css/images/ui-bg_diagonals-thick_90_eeeeee_40x40.png b/core/css/images/ui-bg_diagonals-thick_90_eeeeee_40x40.png
index 6348115e6be..6348115e6be 100644
--- a/css/images/ui-bg_diagonals-thick_90_eeeeee_40x40.png
+++ b/core/css/images/ui-bg_diagonals-thick_90_eeeeee_40x40.png
diff --git a/css/images/ui-bg_flat_15_cd0a0a_40x100.png b/core/css/images/ui-bg_flat_15_cd0a0a_40x100.png
index 7680b5437cf..7680b5437cf 100644
--- a/css/images/ui-bg_flat_15_cd0a0a_40x100.png
+++ b/core/css/images/ui-bg_flat_15_cd0a0a_40x100.png
diff --git a/css/images/ui-bg_glass_100_e4f1fb_1x400.png b/core/css/images/ui-bg_glass_100_e4f1fb_1x400.png
index 705a32ea35d..705a32ea35d 100644
--- a/css/images/ui-bg_glass_100_e4f1fb_1x400.png
+++ b/core/css/images/ui-bg_glass_100_e4f1fb_1x400.png
diff --git a/css/images/ui-bg_glass_50_3baae3_1x400.png b/core/css/images/ui-bg_glass_50_3baae3_1x400.png
index baabca6baaf..baabca6baaf 100644
--- a/css/images/ui-bg_glass_50_3baae3_1x400.png
+++ b/core/css/images/ui-bg_glass_50_3baae3_1x400.png
diff --git a/css/images/ui-bg_glass_80_d7ebf9_1x400.png b/core/css/images/ui-bg_glass_80_d7ebf9_1x400.png
index d9387e9507e..d9387e9507e 100644
--- a/css/images/ui-bg_glass_80_d7ebf9_1x400.png
+++ b/core/css/images/ui-bg_glass_80_d7ebf9_1x400.png
diff --git a/css/images/ui-bg_highlight-hard_100_f2f5f7_1x100.png b/core/css/images/ui-bg_highlight-hard_100_f2f5f7_1x100.png
index 28b566c2c29..28b566c2c29 100644
--- a/css/images/ui-bg_highlight-hard_100_f2f5f7_1x100.png
+++ b/core/css/images/ui-bg_highlight-hard_100_f2f5f7_1x100.png
diff --git a/css/images/ui-bg_highlight-hard_70_000000_1x100.png b/core/css/images/ui-bg_highlight-hard_70_000000_1x100.png
index d5882978043..d5882978043 100644
--- a/css/images/ui-bg_highlight-hard_70_000000_1x100.png
+++ b/core/css/images/ui-bg_highlight-hard_70_000000_1x100.png
diff --git a/css/images/ui-bg_highlight-soft_100_deedf7_1x100.png b/core/css/images/ui-bg_highlight-soft_100_deedf7_1x100.png
index 2289d3c7d7b..2289d3c7d7b 100644
--- a/css/images/ui-bg_highlight-soft_100_deedf7_1x100.png
+++ b/core/css/images/ui-bg_highlight-soft_100_deedf7_1x100.png
diff --git a/css/images/ui-bg_highlight-soft_25_ffef8f_1x100.png b/core/css/images/ui-bg_highlight-soft_25_ffef8f_1x100.png
index 54aff0cb974..54aff0cb974 100644
--- a/css/images/ui-bg_highlight-soft_25_ffef8f_1x100.png
+++ b/core/css/images/ui-bg_highlight-soft_25_ffef8f_1x100.png
diff --git a/css/images/ui-icons_2694e8_256x240.png b/core/css/images/ui-icons_2694e8_256x240.png
index 9d192c2f659..9d192c2f659 100644
--- a/css/images/ui-icons_2694e8_256x240.png
+++ b/core/css/images/ui-icons_2694e8_256x240.png
diff --git a/css/images/ui-icons_2e83ff_256x240.png b/core/css/images/ui-icons_2e83ff_256x240.png
index 09d1cdc856c..09d1cdc856c 100644
--- a/css/images/ui-icons_2e83ff_256x240.png
+++ b/core/css/images/ui-icons_2e83ff_256x240.png
diff --git a/css/images/ui-icons_3d80b3_256x240.png b/core/css/images/ui-icons_3d80b3_256x240.png
index f13b206645b..f13b206645b 100644
--- a/css/images/ui-icons_3d80b3_256x240.png
+++ b/core/css/images/ui-icons_3d80b3_256x240.png
diff --git a/css/images/ui-icons_72a7cf_256x240.png b/core/css/images/ui-icons_72a7cf_256x240.png
index 0d20b730833..0d20b730833 100644
--- a/css/images/ui-icons_72a7cf_256x240.png
+++ b/core/css/images/ui-icons_72a7cf_256x240.png
diff --git a/css/images/ui-icons_ffffff_256x240.png b/core/css/images/ui-icons_ffffff_256x240.png
index 42f8f992c72..42f8f992c72 100644
--- a/css/images/ui-icons_ffffff_256x240.png
+++ b/core/css/images/ui-icons_ffffff_256x240.png
diff --git a/css/jquery-ui-1.8.10.custom.css b/core/css/jquery-ui-1.8.10.custom.css
index 1f376ca99d3..1f376ca99d3 100644
--- a/css/jquery-ui-1.8.10.custom.css
+++ b/core/css/jquery-ui-1.8.10.custom.css
diff --git a/css/styles.css b/core/css/styles.css
index 5027a6b6fe9..5027a6b6fe9 100644
--- a/css/styles.css
+++ b/core/css/styles.css
diff --git a/img/actions/arrow-down.png b/core/img/actions/arrow-down.png
index 03f201428ad..03f201428ad 100644
--- a/img/actions/arrow-down.png
+++ b/core/img/actions/arrow-down.png
diff --git a/img/actions/arrow-left.png b/core/img/actions/arrow-left.png
index b56cfee03df..b56cfee03df 100644
--- a/img/actions/arrow-left.png
+++ b/core/img/actions/arrow-left.png
diff --git a/img/actions/arrow-right.png b/core/img/actions/arrow-right.png
index 0acee70bcdd..0acee70bcdd 100644
--- a/img/actions/arrow-right.png
+++ b/core/img/actions/arrow-right.png
diff --git a/img/actions/arrow-up.png b/core/img/actions/arrow-up.png
index 5e423213fbd..5e423213fbd 100644
--- a/img/actions/arrow-up.png
+++ b/core/img/actions/arrow-up.png
diff --git a/img/actions/go-home.png b/core/img/actions/go-home.png
index 3802c98fc46..3802c98fc46 100644
--- a/img/actions/go-home.png
+++ b/core/img/actions/go-home.png
diff --git a/img/body_background.jpg b/core/img/body_background.jpg
index c3d0102f711..c3d0102f711 100644
--- a/img/body_background.jpg
+++ b/core/img/body_background.jpg
diff --git a/img/drop-arrow.png b/core/img/drop-arrow.png
index 315395d5d42..315395d5d42 100644
--- a/img/drop-arrow.png
+++ b/core/img/drop-arrow.png
diff --git a/img/favicon-touch.png b/core/img/favicon-touch.png
index 20af826523c..20af826523c 100644
--- a/img/favicon-touch.png
+++ b/core/img/favicon-touch.png
diff --git a/img/favicon.png b/core/img/favicon.png
index a7ee766dfa8..a7ee766dfa8 100644
--- a/img/favicon.png
+++ b/core/img/favicon.png
diff --git a/img/header-a.png b/core/img/header-a.png
index 46fb0977ee2..46fb0977ee2 100644
--- a/img/header-a.png
+++ b/core/img/header-a.png
diff --git a/img/header-login.png b/core/img/header-login.png
index b0160e02d1f..b0160e02d1f 100644
--- a/img/header-login.png
+++ b/core/img/header-login.png
diff --git a/img/header-settings-a.png b/core/img/header-settings-a.png
index a72271be6a4..a72271be6a4 100644
--- a/img/header-settings-a.png
+++ b/core/img/header-settings-a.png
diff --git a/img/header-settings.png b/core/img/header-settings.png
index 7e6b70b5903..7e6b70b5903 100644
--- a/img/header-settings.png
+++ b/core/img/header-settings.png
diff --git a/img/header.png b/core/img/header.png
index d377f65186d..d377f65186d 100644
--- a/img/header.png
+++ b/core/img/header.png
diff --git a/img/layout/back.png b/core/img/layout/back.png
index 86abbe0cabe..86abbe0cabe 100644
--- a/img/layout/back.png
+++ b/core/img/layout/back.png
diff --git a/img/layout/logout.png b/core/img/layout/logout.png
index 74dcd33bee7..74dcd33bee7 100644
--- a/img/layout/logout.png
+++ b/core/img/layout/logout.png
diff --git a/img/layout/settings.png b/core/img/layout/settings.png
index ff650ecb0b0..ff650ecb0b0 100644
--- a/img/layout/settings.png
+++ b/core/img/layout/settings.png
diff --git a/img/mimetypes/file.png b/core/img/mimetypes/file.png
index 49790448897..49790448897 100644
--- a/img/mimetypes/file.png
+++ b/core/img/mimetypes/file.png
diff --git a/img/owncloud-logo-medium-white.png b/core/img/owncloud-logo-medium-white.png
index d4d06fdd62d..d4d06fdd62d 100644
--- a/img/owncloud-logo-medium-white.png
+++ b/core/img/owncloud-logo-medium-white.png
diff --git a/img/owncloud-logo-small-white.png b/core/img/owncloud-logo-small-white.png
index 397ddf91341..397ddf91341 100644
--- a/img/owncloud-logo-small-white.png
+++ b/core/img/owncloud-logo-small-white.png
diff --git a/img/places/folder.png b/core/img/places/folder.png
index 3edbe257a34..3edbe257a34 100644
--- a/img/places/folder.png
+++ b/core/img/places/folder.png
diff --git a/img/weather-clear.png b/core/img/weather-clear.png
index 0acf7a9b2af..0acf7a9b2af 100644
--- a/img/weather-clear.png
+++ b/core/img/weather-clear.png
diff --git a/js/jquery-1.5.min.js b/core/js/jquery-1.5.min.js
index 9144b8ae98c..9144b8ae98c 100644
--- a/js/jquery-1.5.min.js
+++ b/core/js/jquery-1.5.min.js
diff --git a/js/jquery-ui-1.8.10.custom.min.js b/core/js/jquery-ui-1.8.10.custom.min.js
index 7d4ff1cec10..7d4ff1cec10 100644
--- a/js/jquery-ui-1.8.10.custom.min.js
+++ b/core/js/jquery-ui-1.8.10.custom.min.js
diff --git a/js/js.js b/core/js/js.js
index 7e44b7ce6d5..7e44b7ce6d5 100644
--- a/js/js.js
+++ b/core/js/js.js
diff --git a/js/setup.js b/core/js/setup.js
index b4616b8b14c..b4616b8b14c 100644
--- a/js/setup.js
+++ b/core/js/setup.js
diff --git a/l10n/de.php b/core/l10n/de.php
index fb00345e69d..fb00345e69d 100644
--- a/l10n/de.php
+++ b/core/l10n/de.php
diff --git a/l10n/de.po b/core/l10n/de.po
index 19b12ca4aac..19b12ca4aac 100644
--- a/l10n/de.po
+++ b/core/l10n/de.po
diff --git a/l10n/javascript.php b/core/l10n/javascript.php
index a1e84487f63..a1e84487f63 100644
--- a/l10n/javascript.php
+++ b/core/l10n/javascript.php
diff --git a/l10n/l10n-de.php b/core/l10n/l10n-de.php
index f3084b05df8..f3084b05df8 100644
--- a/l10n/l10n-de.php
+++ b/core/l10n/l10n-de.php
diff --git a/l10n/messages.pot b/core/l10n/messages.pot
index 591a1c724e3..591a1c724e3 100644
--- a/l10n/messages.pot
+++ b/core/l10n/messages.pot
diff --git a/l10n/nl.php b/core/l10n/nl.php
index 712444c8006..712444c8006 100644
--- a/l10n/nl.php
+++ b/core/l10n/nl.php
diff --git a/l10n/nl.po b/core/l10n/nl.po
index 7a819e81dd8..7a819e81dd8 100644
--- a/l10n/nl.po
+++ b/core/l10n/nl.po
diff --git a/l10n/xgettextfiles b/core/l10n/xgettextfiles
index b5d83a880d4..b5d83a880d4 100644
--- a/l10n/xgettextfiles
+++ b/core/l10n/xgettextfiles
diff --git a/templates/404.php b/core/templates/404.php
index b287571d166..b287571d166 100644
--- a/templates/404.php
+++ b/core/templates/404.php
diff --git a/templates/error.php b/core/templates/error.php
index ae3f029708f..ae3f029708f 100644
--- a/templates/error.php
+++ b/core/templates/error.php
diff --git a/templates/installation.php b/core/templates/installation.php
index 93c00547ab9..93c00547ab9 100644
--- a/templates/installation.php
+++ b/core/templates/installation.php
diff --git a/templates/layout.admin.php b/core/templates/layout.admin.php
index 1fcd4568f8c..1fcd4568f8c 100644
--- a/templates/layout.admin.php
+++ b/core/templates/layout.admin.php
diff --git a/templates/layout.guest.php b/core/templates/layout.guest.php
index ce99b00b9f6..ce99b00b9f6 100644
--- a/templates/layout.guest.php
+++ b/core/templates/layout.guest.php
diff --git a/templates/layout.user.php b/core/templates/layout.user.php
index f21db202a83..f21db202a83 100644
--- a/templates/layout.user.php
+++ b/core/templates/layout.user.php
diff --git a/templates/login.php b/core/templates/login.php
index e0f6ce23e2e..e0f6ce23e2e 100644
--- a/templates/login.php
+++ b/core/templates/login.php
diff --git a/templates/logout.php b/core/templates/logout.php
index 8cbbdd9cc8d..8cbbdd9cc8d 100644
--- a/templates/logout.php
+++ b/core/templates/logout.php
diff --git a/templates/part.pagenavi.php b/core/templates/part.pagenavi.php
index 0602b793882..0602b793882 100644
--- a/templates/part.pagenavi.php
+++ b/core/templates/part.pagenavi.php
diff --git a/templates/part.searchbox.php b/core/templates/part.searchbox.php
index 7465a7326ee..7465a7326ee 100644
--- a/templates/part.searchbox.php
+++ b/core/templates/part.searchbox.php
diff --git a/files/css/files.css b/files/css/files.css
index 7c7965ab847..702ddefc19c 100644
--- a/files/css/files.css
+++ b/files/css/files.css
@@ -110,5 +110,5 @@ table td.filename a
 	width:16px;
 	display: -moz-inline-box; /* fallback for older firefox versions*/
 	display: inline-block;
-	background-image:url('../../img/drop-arrow.png');
+	background-image:url('../img/drop-arrow.png');
 }
\ No newline at end of file
diff --git a/files/img/drop-arrow.png b/files/img/drop-arrow.png
new file mode 100644
index 00000000000..315395d5d42
--- /dev/null
+++ b/files/img/drop-arrow.png
diff --git a/lib/helper.php b/lib/helper.php
index 072607f742b..6f7d7ce251e 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -44,6 +44,9 @@ class OC_HELPER {
 				return $WEBROOT . '/apps/' . $app . $file;
 			}
 		}
+		else{
+			$app = 'core';
+		}
 		return $WEBROOT . '/' . $app . $file;
 	}
 
@@ -58,14 +61,16 @@ class OC_HELPER {
 	public static function imagePath( $app, $image ){
 		global $SERVERROOT;
 		global $WEBROOT;
+		
 		// Check if the app is in the app folder
 		if( file_exists( "$SERVERROOT/apps/$app/img/$image" )){
 			return "$WEBROOT/apps/$app/img/$image";
 		}
-		if( !empty( $app )){
+		elseif( !empty( $app )){
 			return "$WEBROOT/$app/img/$image";
-		}else{
-			return "$WEBROOT/img/$image";
+		}
+		else{
+			return "$WEBROOT/core/img/$image";
 		}
 	}
 
@@ -84,15 +89,15 @@ class OC_HELPER {
 
 		// Is it a dir?
 		if( $mimetype == "dir" ){
-			return "$WEBROOT/img/places/folder.png";
+			return "$WEBROOT/core/img/places/folder.png";
 		}
 
 		// Icon exists?
-		if( file_exists( "$SERVERROOT/img/mimetypes/$mimetype.png" )){
-			return "$WEBROOT/img/mimetypes/$mimetype.png";
+		if( file_exists( "$SERVERROOT/core/img/mimetypes/$mimetype.png" )){
+			return "$WEBROOT/core/img/mimetypes/$mimetype.png";
 		}
 		else{
-			return "$WEBROOT/img/mimetypes/file.png";
+			return "$WEBROOT/core/img/mimetypes/file.png";
 		}
 	}
 
diff --git a/lib/template.php b/lib/template.php
index 6b9a1c38e11..69065e1ea16 100644
--- a/lib/template.php
+++ b/lib/template.php
@@ -95,8 +95,8 @@ class OC_TEMPLATE{
 		global $SERVERROOT;
 
 		// Get the right template folder
-		$template = "$SERVERROOT/templates/";
-		if( $app != "core" && $app != "" ){
+		$template = "$SERVERROOT/core/templates/";
+		if( $app != "" ){
 			// Check if the app is in the app folder
 			if( file_exists( "$SERVERROOT/apps/$app/templates/" )){
 				$template = "$SERVERROOT/apps/$app/templates/";
@@ -222,16 +222,24 @@ class OC_TEMPLATE{
 			foreach(OC_UTIL::$scripts as $script){
 				if(is_file("$SERVERROOT/apps/$script.js" )){
 					$page->append( "jsfiles", "$WEBROOT/apps/$script.js" );
-				}else{
+				}
+				elseif(is_file("$SERVERROOT/$script.js" )){
 					$page->append( "jsfiles", "$WEBROOT/$script.js" );
 				}
+				else{
+					$page->append( "jsfiles", "$WEBROOT/core/$script.js" );
+				}
 			}
 			foreach(OC_UTIL::$styles as $style){
 				if(is_file("$SERVERROOT/apps/$style.css" )){
 					$page->append( "cssfiles", "$WEBROOT/apps/$style.css" );
-				}else{
+				}
+				elseif(is_file("$SERVERROOT/$style.css" )){
 					$page->append( "cssfiles", "$WEBROOT/$style.css" );
 				}
+				else{
+					$page->append( "cssfiles", "$WEBROOT/core/$style.css" );
+				}
 			}
 
 			// Add css files and js files