@@ -54,14 +54,14 @@
  * \param target The target on which to call the selector
  * \param selector The selector to call on the target
  * \param repeats Whether the timer repeats after it has been executed
  * \return A new, autoreleased timer
  */
-+ scheduledTimerWithTimeInterval: (double)interval
-			  target: (id)target
-			selector: (SEL)selector
-			 repeats: (BOOL)repeats;
++ (instancetype)scheduledTimerWithTimeInterval: (double)interval
+					target: (id)target
+				      selector: (SEL)selector
+				       repeats: (BOOL)repeats;
 
 /**
  * \brief Creates and schedules a new timer with the specified time interval.
  *
  * \param interval The time interval after which the timer should be executed
@@ -70,15 +70,15 @@
  * \param selector The selector to call on the target
  * \param object An object to pass when calling the selector on the target
  * \param repeats Whether the timer repeats after it has been executed
  * \return A new, autoreleased timer
  */
-+ scheduledTimerWithTimeInterval: (double)interval
-			  target: (id)target
-			selector: (SEL)selector
-			  object: (id)object
-			 repeats: (BOOL)repeats;
++ (instancetype)scheduledTimerWithTimeInterval: (double)interval
+					target: (id)target
+				      selector: (SEL)selector
+					object: (id)object
+				       repeats: (BOOL)repeats;
 
 /**
  * \brief Creates and schedules a new timer with the specified time interval.
  *
  * \param interval The time interval after which the timer should be executed
@@ -90,16 +90,16 @@
  * \param object2 The second object to pass when calling the selector on the
  *		  target
  * \param repeats Whether the timer repeats after it has been executed
  * \return A new, autoreleased timer
  */
-+ scheduledTimerWithTimeInterval: (double)interval
-			  target: (id)target
-			selector: (SEL)selector
-			  object: (id)object1
-			  object: (id)object2
-			 repeats: (BOOL)repeats;
++ (instancetype)scheduledTimerWithTimeInterval: (double)interval
+					target: (id)target
+				      selector: (SEL)selector
+					object: (id)object1
+					object: (id)object2
+				       repeats: (BOOL)repeats;
 
 #ifdef OF_HAVE_BLOCKS
 /**
  * \brief Creates and schedules a new timer with the specified time interval.
  *
@@ -107,13 +107,13 @@
  *		   when fired
  * \param repeats Whether the timer repeats after it has been executed
  * \param block The block to invoke when the timer fires
  * \return A new, autoreleased timer
  */
-+ scheduledTimerWithTimeInterval: (double)interval
-			 repeats: (BOOL)repeats
-			   block: (of_timer_block_t)block;
++ (instancetype)scheduledTimerWithTimeInterval: (double)interval
+				       repeats: (BOOL)repeats
+					 block: (of_timer_block_t)block;
 #endif
 
 /**
  * \brief Creates a new timer with the specified time interval.
  *
@@ -122,14 +122,14 @@
  * \param target The target on which to call the selector
  * \param selector The selector to call on the target
  * \param repeats Whether the timer repeats after it has been executed
  * \return A new, autoreleased timer
  */
-+ timerWithTimeInterval: (double)interval
-		 target: (id)target
-	       selector: (SEL)selector
-		repeats: (BOOL)repeats;
++ (instancetype)timerWithTimeInterval: (double)interval
+			       target: (id)target
+			     selector: (SEL)selector
+			      repeats: (BOOL)repeats;
 
 /**
  * \brief Creates a new timer with the specified time interval.
  *
  * \param interval The time interval after which the timer should be executed
@@ -138,15 +138,15 @@
  * \param selector The selector to call on the target
  * \param object An object to pass when calling the selector on the target
  * \param repeats Whether the timer repeats after it has been executed
  * \return A new, autoreleased timer
  */
-+ timerWithTimeInterval: (double)interval
-		 target: (id)target
-	       selector: (SEL)selector
-		 object: (id)object
-		repeats: (BOOL)repeats;
++ (instancetype)timerWithTimeInterval: (double)interval
+			       target: (id)target
+			     selector: (SEL)selector
+			       object: (id)object
+			      repeats: (BOOL)repeats;
 
 /**
  * \brief Creates a new timer with the specified time interval.
  *
  * \param interval The time interval after which the timer should be executed
@@ -158,16 +158,16 @@
  * \param object2 The second object to pass when calling the selector on the
  *		  target
  * \param repeats Whether the timer repeats after it has been executed
  * \return A new, autoreleased timer
  */
-+ timerWithTimeInterval: (double)interval
-		 target: (id)target
-	       selector: (SEL)selector
-		 object: (id)object1
-		 object: (id)object2
-		repeats: (BOOL)repeats;
++ (instancetype)timerWithTimeInterval: (double)interval
+			       target: (id)target
+			     selector: (SEL)selector
+			       object: (id)object1
+			       object: (id)object2
+			      repeats: (BOOL)repeats;
 
 #ifdef OF_HAVE_BLOCKS
 /**
  * \brief Creates a new timer with the specified time interval.
  *
@@ -175,13 +175,13 @@
  *		   when fired
  * \param repeats Whether the timer repeats after it has been executed
  * \param block The block to invoke when the timer fires
  * \return A new, autoreleased timer
  */
-+ timerWithTimeInterval: (double)interval
-		repeats: (BOOL)repeats
-		  block: (of_timer_block_t)block;
++ (instancetype)timerWithTimeInterval: (double)interval
+			      repeats: (BOOL)repeats
+				block: (of_timer_block_t)block;
 #endif
 
 /**
  * \brief Initializes an already allocated timer with the specified time
  *	  interval.