diff --git a/index.php b/index.php
index f084bb13..b33f8bc2 100644
--- a/index.php
+++ b/index.php
@@ -38,7 +38,7 @@ OCP\Util::addStyle('calendar', 'style');
 OCP\Util::addscript('', 'jquery.multiselect');
 OCP\Util::addStyle('', 'jquery.multiselect');
 OCP\Util::addscript('calendar','jquery.multi-autocomplete');
-OCP\Util::addscript('','oc-vcategories');
+OCP\Util::addscript('','tags');
 OCP\Util::addscript('calendar','on-event');
 OCP\App::setActiveNavigationEntry('calendar_index');
 $tmpl = new OCP\Template('calendar', 'calendar', 'user');
diff --git a/js/calendar.js b/js/calendar.js
index c68c0cb4..4a81a73a 100644
--- a/js/calendar.js
+++ b/js/calendar.js
@@ -438,7 +438,7 @@ Calendar={
 			$('#'+id).addClass('active');
 		},
 		categoriesChanged:function(newcategories){
-			categories = $.map(newcategories, function(v) {return v;});
+			categories = $.map(newcategories, function(v) {return v.name;});
 			console.log('Calendar categories changed to: ' + categories);
 			$('#category').multiple_autocomplete('option', 'source', categories);
 		},
@@ -947,9 +947,13 @@ $(document).ready(function(){
 		}
 	});
 	fillWindow($('#content'));
-	OCCategories.changed = Calendar.UI.categoriesChanged;
-	OCCategories.app = 'calendar';
-	OCCategories.type = 'event';
+
+	$(OC.Tags).on('change', function(event, data) {
+		if(data.type === 'event') {
+			Calendar.UI.categoriesChanged(data.tags);
+		}
+	});
+
 	$('#oneweekview_radio').click(function(){
 		$('#fullcalendar').fullCalendar('changeView', 'agendaWeek');
 	});
diff --git a/js/on-event.js b/js/on-event.js
index 669d14a6..bd671f7a 100644
--- a/js/on-event.js
+++ b/js/on-event.js
@@ -8,7 +8,7 @@ $('#caldav_url').live('mouseover', function () {
 	$('#caldav_url').select();
 });
 $('#editCategories').live('click', function () {
-	$(this).tipsy('hide');OCCategories.edit();
+	$(this).tipsy('hide');OC.Tags.edit('event');
 });
 $('#allday_checkbox').live('click', function () {
 	Calendar.UI.lockTime();
diff --git a/lib/app.php b/lib/app.php
index 660f6f0c..baf24087 100644
--- a/lib/app.php
+++ b/lib/app.php
@@ -157,7 +157,11 @@ class OC_Calendar_App{
 	 * @return (array) $categories
 	 */
 	public static function getCategoryOptions() {
+		$getNames = function($tag) {
+			return $tag['name'];
+		};
 		$categories = self::getVCategories()->getTags();
+		$categories = array_map($getNames, $categories);
 		return $categories;
 	}