diff --git a/plugins.py b/plugins.py
index 6710129..3e10d05 100644
--- a/plugins.py
+++ b/plugins.py
@@ -13,7 +13,7 @@ import urllib.request
 # from common import *
 
 from common import conf_load, conf_save, RATE_GLOBAL, RATE_NO_SILENCE, VERSION, RATE_INTERACTIVE, BUFSIZ, \
-	USER_AGENT, extract_title
+	USER_AGENT, extract_title, RATE_FUN, RATE_NO_LIMIT
 from local_config import set_conf, conf
 from string_constants import excuses, moin_strings_hi, moin_strings_bye, cakes
 
@@ -163,7 +163,7 @@ def parse_dsa(**args):
 	}
 
 
-@pluginfunction('skynet', 'parse skynet', ptypes_PARSE)
+@pluginfunction('skynet', 'parse skynet', ptypes_PARSE, ratelimit_class=RATE_FUN | RATE_GLOBAL)
 def parse_skynet(**args):
 	if 'skynet' in args['data'].lower():
 		log.info('sent skynet reply')
@@ -209,7 +209,7 @@ def parse_moin(**args):
 					}
 
 
-@pluginfunction('latex', r'reacts on \LaTeX', ptypes_PARSE)
+@pluginfunction('latex', r'reacts on \LaTeX', ptypes_PARSE, ratelimit_class=RATE_FUN | RATE_GLOBAL)
 def parse_latex(**args):
 	if r'\LaTeX' in args['data']:
 		return {
@@ -217,7 +217,7 @@ def parse_latex(**args):
 		}
 
 
-@pluginfunction('me-action', 'reacts to /me.*%{bot_user}', ptypes_PARSE)
+@pluginfunction('me-action', 'reacts to /me.*%{bot_user}', ptypes_PARSE, ratelimit_class=RATE_FUN | RATE_GLOBAL)
 def parse_slash_me(**args):
 	if args['data'].lower().startswith('/me') and (conf('bot_user') in args['data'].lower()):
 		log.info('sent /me reply')
@@ -285,7 +285,7 @@ def command_version(argv, **args):
 	}
 
 
-@pluginfunction('klammer', 'prints an anoying paper clip aka. Karl Klammer', ptypes_COMMAND)
+@pluginfunction('klammer', 'prints an anoying paper clip aka. Karl Klammer', ptypes_COMMAND, ratelimit_class=RATE_FUN | RATE_GLOBAL)
 def command_klammer(argv, **args):
 	if 'klammer' != argv[0]:
 		return
@@ -304,7 +304,7 @@ def command_klammer(argv, **args):
 	}
 
 
-@pluginfunction('unikot', 'prints an unicode string', ptypes_COMMAND)
+@pluginfunction('unikot', 'prints an unicode string', ptypes_COMMAND, ratelimit_class=RATE_FUN | RATE_GLOBAL)
 def command_unicode(argv, **args):
 	if 'unikot' != argv[0]:
 		return
@@ -487,7 +487,7 @@ def command_teatimer(argv, **args):
 	}
 
 
-@pluginfunction('decode', 'prints the long description of an unicode character', ptypes_COMMAND)
+@pluginfunction('decode', 'prints the long description of an unicode character', ptypes_COMMAND, ratelimit_class=RATE_INTERACTIVE)
 def command_decode(argv, **args):
 	if 'decode' != argv[0]:
 		return
@@ -570,7 +570,7 @@ def usersetting_get(argv, args):
 	}
 
 
-@pluginfunction('set', 'modify a user setting', ptypes_COMMAND)
+@pluginfunction('set', 'modify a user setting', ptypes_COMMAND, ratelimit_class=RATE_NO_LIMIT)
 def command_usersetting(argv, **args):
 	if 'set' != argv[0]:
 		return
@@ -617,7 +617,7 @@ def command_usersetting(argv, **args):
 	return usersetting_get(argv, args)
 
 
-@pluginfunction('cake', 'displays a cake ASCII art', ptypes_COMMAND)
+@pluginfunction('cake', 'displays a cake ASCII art', ptypes_COMMAND, ratelimit_class=RATE_FUN | RATE_GLOBAL)
 def command_cake(argv, **args):
 	if 'cake' != argv[0]:
 		return
@@ -678,8 +678,6 @@ def command_wp(argv, lang='de', **args):
 	if 'wp' != argv[0]:
 		return
 
-	log.info('plugin called')
-
 	query = ' '.join(argv[1:])
 
 	if query == '':
@@ -872,7 +870,7 @@ def command_show_recordlist(argv, **args):
 	}
 
 
-@pluginfunction('dsa-watcher', 'automatically crawls for newly published Debian Security Announces', ptypes_COMMAND)
+@pluginfunction('dsa-watcher', 'automatically crawls for newly published Debian Security Announces', ptypes_COMMAND, ratelimit_class=RATE_NO_SILENCE)
 def command_dsa_watcher(argv, **_):
 	"""
 	TODO: rewrite so that a last_dsa_date is used instead, then all DSAs since then printed and the date set to now()
diff --git a/urlbot.py b/urlbot.py
index 4af4230..075b0f8 100755
--- a/urlbot.py
+++ b/urlbot.py
@@ -4,10 +4,18 @@
 import random
 import re
 import sys
-import time
 
-from common import conf_load, conf_save, \
-	extract_title, RATE_GLOBAL, RATE_CHAT, rate_limit_classes
+from common import (
+	conf_load, conf_save,
+	extract_title,
+	rate_limit_classes,
+	RATE_GLOBAL,
+	RATE_CHAT,
+	RATE_NO_SILENCE,
+	RATE_EVENT,
+	# rate_limited,
+	rate_limit,
+	RATE_URL)
 from idlebot import IdleBot, start
 from plugins import (
 	plugins as plugin_storage,
@@ -105,6 +113,7 @@ class UrlBot(IdleBot):
 			conf_save(blob)
 			set_conf('persistent_locked', False)
 
+	# @rate_limited(10)
 	def send_reply(self, message, msg_obj=None):
 		"""
 		Send a reply to a message
@@ -114,7 +123,7 @@ class UrlBot(IdleBot):
 		if str is not type(message):
 			message = '\n'.join(message)
 
-		if conf('debug_mode'):
+		if conf('debug_mode', False):
 			print(message)
 		else:
 			if msg_obj:
@@ -140,9 +149,8 @@ class UrlBot(IdleBot):
 		ret = None
 		out = []
 		for url in result:
-			self.push_ratelimit()
-			if self.check_ratelimit(msg_obj):
-				return False
+			# if rate_limit(RATE_NO_SILENCE | RATE_GLOBAL):
+			# 	return False
 
 			flag = False
 			for b in conf('url_blacklist'):
@@ -199,7 +207,7 @@ class UrlBot(IdleBot):
 			out.append(message)
 			ret = True
 
-		if ret:
+		if ret and rate_limit(RATE_URL | RATE_GLOBAL):
 			self.send_reply(out, msg_obj)
 		return ret
 
@@ -239,39 +247,6 @@ class UrlBot(IdleBot):
 		self.data_parse_commands(msg_obj)
 		self.data_parse_other(msg_obj)
 
-	def push_ratelimit(self, ratelimit_class=RATE_GLOBAL):  # FIXME: separate counters
-		local_history = self.hist_ts[ratelimit_class]
-		local_history.append(time.time())
-
-		if conf('hist_max_count') < len(local_history):
-			local_history.pop(0)
-		self.hist_ts[ratelimit_class] = local_history
-
-	def check_ratelimit(self, ratelimit_class=RATE_GLOBAL):  # FIXME: separate counters
-
-		local_history = self.hist_ts[ratelimit_class]
-
-		if conf('hist_max_count') < len(local_history):
-			first = local_history.pop(0)
-			self.hist_ts[ratelimit_class] = local_history
-
-			if (time.time() - first) < conf('hist_max_time'):
-				if self.hist_flag[ratelimit_class]:
-					self.hist_flag[ratelimit_class] = False
-					# FIXME: this is very likely broken now
-					self.send_reply('(rate limited to %d messages in %d seconds, try again at %s)' % (
-							conf('hist_max_count'),
-							conf('hist_max_time'),
-							time.strftime('%T %Z', time.localtime(local_history[0] + conf('hist_max_time')))
-						)
-					)
-
-				self.logger.warn('rate limiting exceeded: ' + local_history)
-				return True
-
-		self.hist_flag[ratelimit_class] = True
-		return False
-
 	def data_parse_commands(self, msg_obj):
 		"""
 		react to a message with the bots nick
@@ -299,14 +274,13 @@ class UrlBot(IdleBot):
 		reply_user = msg_obj['mucnick']
 
 		# TODO: check how several commands/plugins in a single message behave (also with rate limiting)
-		for p in plugin_storage[ptypes_COMMAND]:
-			if self.check_ratelimit(p.ratelimit_class):
+		reacted = False
+		for plugin in plugin_storage[ptypes_COMMAND]:
+
+			if not plugin_enabled_get(plugin):
 				continue
 
-			if not plugin_enabled_get(p):
-				continue
-
-			ret = p(
+			ret = plugin(
 				data=data,
 				cmd_list=[pl.plugin_name for pl in plugin_storage[ptypes_COMMAND]],
 				parser_list=[pl.plugin_name for pl in plugin_storage[ptypes_PARSE]],
@@ -316,30 +290,15 @@ class UrlBot(IdleBot):
 			)
 
 			if ret:
-				if 'event' in ret:
-					event = ret["event"]
-					if 'msg' in event:
-						register_event(event["time"], self.send_reply, event['msg'])
-					elif 'command' in event:
-						command = event["command"]
-						register_event(event["time"], command[0], command[1])
-				if 'msg' in list(ret.keys()):
-					self.push_ratelimit(RATE_CHAT)
-					if self.check_ratelimit(RATE_CHAT):
-						return False
+				self._run_action(ret, plugin, msg_obj)
+				reacted = True
 
+		if not reacted and rate_limit(RATE_GLOBAL):
+			ret = else_command({'reply_user': reply_user})
+			if ret:
+				if 'msg' in ret:
 					self.send_reply(ret['msg'], msg_obj)
 
-				return None
-
-		ret = else_command({'reply_user': reply_user})
-		if ret:
-			if self.check_ratelimit(RATE_GLOBAL):
-				return False
-
-			if 'msg' in list(ret.keys()):
-				self.send_reply(ret['msg'], msg_obj)
-
 	def data_parse_other(self, msg_obj):
 		"""
 		react to any message
@@ -350,21 +309,33 @@ class UrlBot(IdleBot):
 		data = msg_obj['body']
 		reply_user = msg_obj['mucnick']
 
-		for p in plugin_storage[ptypes_PARSE]:
-			if self.check_ratelimit(p.ratelimit_class):
+		for plugin in plugin_storage[ptypes_PARSE]:
+			if not plugin_enabled_get(plugin):
 				continue
 
-			if not plugin_enabled_get(p):
-				continue
-
-			ret = p(reply_user=reply_user, data=data)
+			ret = plugin(reply_user=reply_user, data=data)
 
 			if ret:
-				if 'msg' in list(ret.keys()):
-					self.push_ratelimit(RATE_CHAT)
-					self.send_reply(ret['msg'], msg_obj)
+				self._run_action(ret, plugin, msg_obj)
 
+	def _run_action(self, plugin_action, plugin, msg_obj):
+		"""
+		Execute the plugin's execution plan
+		:param plugin_action: dict with event and/or msg
+		:param plugin: plugin obj
+		:param msg_obj: xmpp message obj
+		"""
+		if 'event' in plugin_action:
+			event = plugin_action["event"]
+			if 'msg' in event:
+				register_event(event["time"], self.send_reply, event['msg'])
+			elif 'command' in event:
+				command = event["command"]
+				if rate_limit(RATE_EVENT):
+					register_event(event["time"], command[0], command[1])
+
+		if 'msg' in plugin_action and rate_limit(RATE_CHAT | plugin.ratelimit_class):
+			self.send_reply(plugin_action['msg'], msg_obj)
 
 if '__main__' == __name__:
 	start(UrlBot, True)
-