diff --git a/.htaccess b/.htaccess
index 085cc665ded5bb9323730d8eb5e5c35b6349d0fa..79904f8a9dab38ff08b39568f682295794321521 100644
--- a/.htaccess
+++ b/.htaccess
@@ -13,7 +13,7 @@ RewriteEngine on
RewriteRule .* - [env=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
RewriteRule ^.well-known/host-meta /public.php?service=host-meta [QSA,L]
RewriteRule ^.well-known/carddav /remote.php/carddav/ [R]
-RewriteRule ^.well-known/caldav /remote.php/caldav/ [R]
+RewriteRule ^.well-known/caldav /remote.php/caldav/ [R]
RewriteRule ^apps/([^/]*)/(.*\.(css|php))$ index.php?app=$1&getfile=$2 [QSA,L]
RewriteRule ^remote/(.*) remote.php [QSA,L]
</IfModule>
diff --git a/apps/remoteStorage/auth.php b/apps/remoteStorage/auth.php
index fcbeda449101f0c28f7da72cec91d3bd04f11f39..a54be37b2e6dec7e2ba43aeed76487ba83aaf745 100755
--- a/apps/remoteStorage/auth.php
+++ b/apps/remoteStorage/auth.php
@@ -67,7 +67,7 @@ if($userId && $appUrl && $categories) {
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<link rel="shortcut icon" href="../../../core/img/favicon.png" /><link rel="apple-touch-icon-precomposed" href="../../../core/img/favicon-touch.png" />
<link rel="stylesheet" href="../../../core/css/styles.css" type="text/css" media="screen" />
- <link rel="stylesheet" href="?app=remoteStorage&getfile=auth.css" type="text/css" media="screen" />
+ <link rel="stylesheet" href="../../../core/css/auth.css" type="text/css" media="screen" />
</head>
<body id="body-login">
<div id="login">
@@ -78,7 +78,7 @@ if($userId && $appUrl && $categories) {
</header>
<section id="main">
<div id="oauth">
- <h2><img src="?app=remoteStorage&getfile=remoteStorage-big.png" alt="remoteStorage" /></h2>
+ <h2><img src="../../../core/img/remoteStorage-big.png" alt="remoteStorage" /></h2>
<p><strong><?php $appUrlParts = explode('/', $_GET['redirect_uri']); echo htmlentities($appUrlParts[2]); ?></strong>
requests read & write access to your
<?php
diff --git a/apps/remoteStorage/auth.css b/core/css/auth.css
similarity index 100%
rename from apps/remoteStorage/auth.css
rename to core/css/auth.css
diff --git a/apps/remoteStorage/remoteStorage-big.png b/core/img/remoteStorage-big.png
similarity index 100%
rename from apps/remoteStorage/remoteStorage-big.png
rename to core/img/remoteStorage-big.png