diff --git a/settingswrapper.php b/settingswrapper.php
index 6fcb3cd6..f9aa2e86 100644
--- a/settingswrapper.php
+++ b/settingswrapper.php
@@ -1,14 +1,13 @@
 <?php
-
 $l10n = OC_L10N::get('calendar');
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('calendar');
 
-$tmpl = new OCP\Template('calendar', 'part.choosecalendar.settings');
+$tmpl = new OCP\Template('calendar', 'settings');
 $timezone=OCP\Config::getUserValue(OCP\USER::getUser(),'calendar','timezone','');
 $tmpl->assign('timezone',$timezone);
 $tmpl->assign('timezones',DateTimeZone::listIdentifiers());
 $tmpl->assign('calendars', OC_Calendar_Calendar::allCalendars(OCP\USER::getUser()), false);
 
 OCP\Util::addscript('calendar','settings');
-$tmpl->printPage();
+$tmpl->printPage();
\ No newline at end of file
diff --git a/templates/part.choosecalendar.php b/templates/part.choosecalendar.php
deleted file mode 100644
index 5236c845..00000000
--- a/templates/part.choosecalendar.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<form id="calendar">
-	<p><b><?php p($l->t('Your calendars')); ?>:</b></p>
-	<table width="100%" style="border: 0;">
-	<?php
-	$option_calendars = OC_Calendar_Calendar::allCalendars(OCP\USER::getUser());
-	for($i = 0; $i < count($option_calendars); $i++) {
-		print_unescaped("<tr data-id='".OC_Util::sanitizeHTML($option_calendars[$i]['id'])."'>");
-		$tmpl = new OCP\Template('calendar', 'part.choosecalendar.rowfields');
-		$tmpl->assign('calendar', $option_calendars[$i]);
-		if ($option_calendars[$i]['userid'] != OCP\User::getUser()) {
-			$sharedCalendar = OCP\Share::getItemSharedWithBySource('calendar', $option_calendars[$i]['id']);
-			$shared = true;
-		} else {
-			$shared = false;
-		}
-		$tmpl->assign('shared', $shared);
-		$tmpl->printpage();
-		print_unescaped("</tr>");
-	}
-	?>
-	<tr>
-		<td colspan="6">
-			<input type="button" value="<?php p($l->t('New Calendar')) ?>" id="newCalendar">
-		</td>
-	</tr>
-	<tr>
-		<td colspan="6">
-			<p style="margin: 0 auto;width: 90%;"><input style="display:none;width: 90%;float: left;" type="text" id="caldav_url" title="<?php p($l->t("CalDav Link")); ?>"><img id="caldav_url_close" style="height: 20px;vertical-align: middle;display: none;" src="<?php p(OCP\Util::imagePath('core', 'actions/delete.svg')) ?>" alt="close"/></p>
-		</td>
-	</tr>
-	</table><br>
-	</fieldset>
-</form>
\ No newline at end of file
diff --git a/templates/part.choosecalendar.settings.php b/templates/part.choosecalendar.settings.php
deleted file mode 100644
index 803ac524..00000000
--- a/templates/part.choosecalendar.settings.php
+++ /dev/null
@@ -1,130 +0,0 @@
-<form id="calendar">
-	<p><b><?php p($l->t('Your calendars')); ?>:</b></p>
-	<table width="100%" style="border: 0;">
-	<?php
-	$option_calendars = OC_Calendar_Calendar::allCalendars(OCP\USER::getUser());
-	for($i = 0; $i < count($option_calendars); $i++) {
-		print_unescaped("<tr data-id='".OC_Util::sanitizeHTML($option_calendars[$i]['id'])."'>");
-		$tmpl = new OCP\Template('calendar', 'part.choosecalendar.rowfields');
-		$tmpl->assign('calendar', $option_calendars[$i]);
-		if ($option_calendars[$i]['userid'] != OCP\User::getUser()) {
-			$sharedCalendar = OCP\Share::getItemSharedWithBySource('calendar', $option_calendars[$i]['id']);
-			$shared = true;
-		} else {
-			$shared = false;
-		}
-		$tmpl->assign('shared', $shared);
-		$tmpl->printpage();
-		print_unescaped("</tr>");
-	}
-	?>
-	<tr>
-		<td colspan="6">
-			<input type="button" value="<?php p($l->t('New Calendar')) ?>" id="newCalendar">
-		</td>
-	</tr>
-	<tr>
-		<td colspan="6">
-			<p style="margin: 0 auto;width: 90%;"><input style="display:none;width: 90%;float: left;" type="text" id="caldav_url" title="<?php p($l->t("CalDav Link")); ?>"><img id="caldav_url_close" style="height: 20px;vertical-align: middle;display: none;" src="<?php p(OCP\Util::imagePath('core', 'actions/delete.svg')) ?>" alt="close"/></p>
-		</td>
-	</tr>
-	</table><br>
-	</fieldset>
-</form>
-<h2 id="title_general"><?php p($l->t('General')); ?></h2>
-<div id="general">
-	<table class="nostyle">
-		<tr>
-			<td>
-				<label for="timezone" class="bold"><?php p($l->t('Timezone'));?></label>
-				&nbsp;&nbsp;
-			</td>
-			<td>
-				<select style="display: none;" id="timezone" name="timezone">
-				<?php
-				$continent = '';
-				foreach($_['timezones'] as $timezone):
-					$ex=explode('/', $timezone, 2);//obtain continent,city
-					if (!isset($ex[1])) {
-						$ex[1] = $ex[0];
-						$ex[0] = "Other";
-					}
-					if ($continent!=$ex[0]):
-						if ($continent!="") print_unescaped('</optgroup>');
-						print_unescaped('<optgroup label="'.OC_Util::sanitizeHTML($ex[0]).'">');
-					endif;
-					$city=strtr($ex[1], '_', ' ');
-					$continent=$ex[0];
-					print_unescaped('<option value="'.OC_Util::sanitizeHTML($timezone).'"'.($_['timezone'] == $timezone?' selected="selected"':'').'>'.OC_Util::sanitizeHTML($city).'</option>');
-				endforeach;?>
-				</select>
-			</td>
-		</tr>
-		<tr>
-			<td>
-				&nbsp;&nbsp;
-			</td>
-			<td>
-				<input type="checkbox" name="timezonedetection" id="timezonedetection">
-				&nbsp;
-				<label for="timezonedetection"><?php p($l->t('Update timezone automatically')); ?></label>
-			</td>
-		</tr>
-		<tr>
-			<td>
-				<label for="timeformat" class="bold"><?php p($l->t('Time format'));?></label>
-				&nbsp;&nbsp;
-			</td>
-			<td>
-				<select style="display: none; width: 60px;" id="timeformat" title="<?php p("timeformat"); ?>" name="timeformat">
-					<option value="24" id="24h"><?php p($l->t("24h")); ?></option>
-					<option value="ampm" id="ampm"><?php p($l->t("12h")); ?></option>
-				</select>
-			</td>
-		</tr>
-		<tr>
-			<td>
-				<label for="firstday" class="bold"><?php p($l->t('Start week on'));?></label>
-				&nbsp;&nbsp;
-			</td>
-			<td>
-				<select style="display: none;" id="firstday" title="<?php p("First day"); ?>" name="firstday">
-					<option value="mo" id="mo"><?php p($l->t("Monday")); ?></option>
-					<option value="su" id="su"><?php p($l->t("Sunday")); ?></option>
-				</select>
-			</td>
-		</tr>
-		<tr class="advancedsettings">
-			<td>
-				<label for="" class="bold"><?php p($l->t('Cache'));?></label>
-				&nbsp;&nbsp;
-			</td>
-			<td>
-				<input id="cleancalendarcache" type="button" class="button" value="<?php p($l->t('Clear cache for repeating events'));?>">
-			</td>
-		</tr>
-	</table>
-</div>
-<h2 id="title_urls"><?php p($l->t('URLs')); ?></h2>
-<div id="urls">
-		<?php p($l->t('Calendar CalDAV syncing addresses')); ?> (<a href="http://owncloud.org/synchronisation/" target="_blank"><?php p($l->t('more info')); ?></a>)
-		<dl>
-		<dt><?php p($l->t('Primary address (Kontact et al)')); ?></dt>
-		<dd><code><?php print_unescaped(OCP\Util::linkToRemote('caldav')); ?></code></dd>
-		<dt><?php p($l->t('iOS/OS X')); ?></dt>
-		<dd><code><?php print_unescaped(OCP\Util::linkToRemote('caldav')); ?>principals/<?php p(OCP\USER::getUser()); ?></code>/</dd>
-		<dt><?php p($l->t('Read only iCalendar link(s)')); ?></dt>
-		<dd>
-			<?php foreach($_['calendars'] as $calendar) {
-			if($calendar['userid'] == OCP\USER::getUser()){
-				$uri = rawurlencode(html_entity_decode($calendar['uri'], ENT_QUOTES, 'UTF-8'));
-			}else{
-				$uri = rawurlencode(html_entity_decode($calendar['uri'], ENT_QUOTES, 'UTF-8')) . '_shared_by_' . $calendar['userid'];
-			}
-			?>
-			<a href="<?php p(OCP\Util::linkToRemote('caldav').'calendars/'.OCP\USER::getUser().'/'.$uri) ?>?export"><?php p(OCP\Util::sanitizeHTML($calendar['displayname'])) ?></a><br />
-			<?php } ?>
-		</dd>
-		</dl>
-	</div>
-</div>
diff --git a/templates/settings.php b/templates/settings.php
index 1000690c..a0b4af56 100644
--- a/templates/settings.php
+++ b/templates/settings.php
@@ -1,12 +1,36 @@
-<?php
-/**
- * Copyright (c) 2011 Bart Visscher <bartv@thisnet.nl>
- * Copyright (c) 2012 Georg Ehrke <ownclouddev at georgswebsite dot de>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-?>
+<form id="calendar">
+	<p><b><?php p($l->t('Your calendars')); ?>:</b></p>
+	<table width="100%" style="border: 0;">
+	<?php
+	$option_calendars = OC_Calendar_Calendar::allCalendars(OCP\USER::getUser());
+	for($i = 0; $i < count($option_calendars); $i++) {
+		print_unescaped("<tr data-id='".OC_Util::sanitizeHTML($option_calendars[$i]['id'])."'>");
+		$tmpl = new OCP\Template('calendar', 'part.choosecalendar.rowfields');
+		$tmpl->assign('calendar', $option_calendars[$i]);
+		if ($option_calendars[$i]['userid'] != OCP\User::getUser()) {
+			$sharedCalendar = OCP\Share::getItemSharedWithBySource('calendar', $option_calendars[$i]['id']);
+			$shared = true;
+		} else {
+			$shared = false;
+		}
+		$tmpl->assign('shared', $shared);
+		$tmpl->printpage();
+		print_unescaped("</tr>");
+	}
+	?>
+	<tr>
+		<td colspan="6">
+			<input type="button" value="<?php p($l->t('New Calendar')) ?>" id="newCalendar">
+		</td>
+	</tr>
+	<tr>
+		<td colspan="6">
+			<p style="margin: 0 auto;width: 90%;"><input style="display:none;width: 90%;float: left;" type="text" id="caldav_url" title="<?php p($l->t("CalDav Link")); ?>"><img id="caldav_url_close" style="height: 20px;vertical-align: middle;display: none;" src="<?php p(OCP\Util::imagePath('core', 'actions/delete.svg')) ?>" alt="close"/></p>
+		</td>
+	</tr>
+	</table><br>
+	</fieldset>
+</form>
 <h2 id="title_general"><?php p($l->t('General')); ?></h2>
 <div id="general">
 	<table class="nostyle">
@@ -104,4 +128,4 @@
 		</dd>
 		</dl>
 	</div>
-</div>
\ No newline at end of file
+</div>