diff --git a/keywords.txt b/keywords.txt
index a6fd73c..1c99b3e 100644
--- a/keywords.txt
+++ b/keywords.txt
@@ -1,158 +1,158 @@
 # ezTime object
 
-ezTime					KEYWORD3
-error					KEYWORD2
-errorString				KEYWORD2
-debugLevel				KEYWORD2
-timeStatus				KEYWORD2
-now						KEYWORD2
-breakTime				KEYWORD2
-makeTime				KEYWORD2
-makeUmpteenthTime		KEYWORD2
-compileTime				KEYWORD2
-monthString				KEYWORD2
-dayString				KEYWORD2
-secondChanged			KEYWORD2
-minuteChanged			KEYWORD2
-queryNTP				KEYWORD2
-updateNow				KEYWORD2
-setServer				KEYWORD2
-setInterval				KEYWORD2
-waitForSync				KEYWORD2
-urlEncode				KEYWORD2
-zeropad					KEYWORD2
+ezTime	KEYWORD3
+error	KEYWORD2
+errorString	KEYWORD2
+debugLevel	KEYWORD2
+timeStatus	KEYWORD2
+now	KEYWORD2
+breakTime	KEYWORD2
+makeTime	KEYWORD2
+makeUmpteenthTime	KEYWORD2
+compileTime	KEYWORD2
+monthString	KEYWORD2
+dayString	KEYWORD2
+secondChanged	KEYWORD2
+minuteChanged	KEYWORD2
+queryNTP	KEYWORD2
+updateNow	KEYWORD2
+setServer	KEYWORD2
+setInterval	KEYWORD2
+waitForSync	KEYWORD2
+urlEncode	KEYWORD2
+zeropad	KEYWORD2
 
 # Timezone object
 
-Timezone				KEYWORD1
-UTC						KEYWORD3
-DefaultTZ				KEYWORD3
-setPosix				KEYWORD2
-getPosix				KEYWORD2
-tzTime					KEYWORD2
-setDefault				KEYWORD2
-isDST					KEYWORD2
-getTimezoneName			KEYWORD2
-getOffset				KEYWORD2
-now						KEYWORD2
-setTime					KEYWORD2
-dateTime				KEYWORD2
-hour					KEYWORD2
-minute					KEYWORD2
-second					KEYWORD2
-ms						KEYWORD2
-day						KEYWORD2
-weekday					KEYWORD2
-month					KEYWORD2
-year					KEYWORD2
-dayOfYear				KEYWORD2
-weekISO					KEYWORD2
-yearISO					KEYWORD2
-setLocation				KEYWORD2
-setCache				KEYWORD2
-clearCache				KEYWORD2
-getOlsen				KEYWORD2
+Timezone	KEYWORD1
+UTC	KEYWORD3
+DefaultTZ	KEYWORD3
+setPosix	KEYWORD2
+getPosix	KEYWORD2
+tzTime	KEYWORD2
+setDefault	KEYWORD2
+isDST	KEYWORD2
+getTimezoneName	KEYWORD2
+getOffset	KEYWORD2
+now	KEYWORD2
+setTime	KEYWORD2
+dateTime	KEYWORD2
+hour	KEYWORD2
+minute	KEYWORD2
+second	KEYWORD2
+ms	KEYWORD2
+day	KEYWORD2
+weekday	KEYWORD2
+month	KEYWORD2
+year	KEYWORD2
+dayOfYear	KEYWORD2
+weekISO	KEYWORD2
+yearISO	KEYWORD2
+setLocation	KEYWORD2
+setCache	KEYWORD2
+clearCache	KEYWORD2
+getOlsen	KEYWORD2
 
 # TimeLib compatibility
 
-numberOfSeconds			KEYWORD2
-numberOfMinutes			KEYWORD2
-numberOfHours			KEYWORD2
-dayOfWeek				KEYWORD2
-elapsedDays				KEYWORD2
-elapsedSecsToday		KEYWORD2
-previousMidnight		KEYWORD2
-nextMidnight			KEYWORD2
-elapsedSecsThisWeek		KEYWORD2
-previousSunday			KEYWORD2
-nextSunday				KEYWORD2
-minutesToTime_t			KEYWORD2
-hoursToTime_t			KEYWORD2
-daysToTime_t			KEYWORD2
-weeksToTime_t			KEYWORD2
-hourFormat12			KEYWORD2
-isAM					KEYWORD2
-isPM					KEYWORD2
-monthStr				KEYWORD2
-monthShortStr			KEYWORD2
-dayStr					KEYWORD2
-dayShortStr				KEYWORD2
-SECS_PER_MIN			LITERAL1
-SECS_PER_HOUR			LITERAL1
-DAYS_PER_WEEK			LITERAL1
-SECS_PER_WEEK			LITERAL1
-SECS_PER_YEAR			LITERAL1
-SECS_YR_2000			LITERAL1
+numberOfSeconds	KEYWORD2
+numberOfMinutes	KEYWORD2
+numberOfHours	KEYWORD2
+dayOfWeek	KEYWORD2
+elapsedDays	KEYWORD2
+elapsedSecsToday	KEYWORD2
+previousMidnight	KEYWORD2
+nextMidnight	KEYWORD2
+elapsedSecsThisWeek	KEYWORD2
+previousSunday	KEYWORD2
+nextSunday	KEYWORD2
+minutesToTime_t	KEYWORD2
+hoursToTime_t	KEYWORD2
+daysToTime_t	KEYWORD2
+weeksToTime_t	KEYWORD2
+hourFormat12	KEYWORD2
+isAM	KEYWORD2
+isPM	KEYWORD2
+monthStr	KEYWORD2
+monthShortStr	KEYWORD2
+dayStr	KEYWORD2
+dayShortStr	KEYWORD2
+SECS_PER_MIN	LITERAL1
+SECS_PER_HOUR	LITERAL1
+DAYS_PER_WEEK	LITERAL1
+SECS_PER_WEEK	LITERAL1
+SECS_PER_YEAR	LITERAL1
+SECS_YR_2000	LITERAL1
 
 # Errors
 
-NO_ERROR				LITERAL1
-LAST_ERROR				LITERAL1
-NO_NETWORK				LITERAL1
-TIMEOUT					LITERAL1
-CONNECT_FAILED			LITERAL1
-DATA_NOT_FOUND			LITERAL1
-LOCKED_TO_UTC			LITERAL1
-NO_CACHE_SET			LITERAL1
-CACHE_TOO_SMALL			LITERAL1
+NO_ERROR	LITERAL1
+LAST_ERROR	LITERAL1
+NO_NETWORK	LITERAL1
+TIMEOUT	LITERAL1
+CONNECT_FAILED	LITERAL1
+DATA_NOT_FOUND	LITERAL1
+LOCKED_TO_UTC	LITERAL1
+NO_CACHE_SET	LITERAL1
+CACHE_TOO_SMALL	LITERAL1
 
 # Debug levels
 
-NONE 					LITERAL1
-ERROR					LITERAL1
-INFO					LITERAL1
-DEBUG					LITERAL1
+NONE	LITERAL1
+ERROR	LITERAL1
+INFO	LITERAL1
+DEBUG	LITERAL1
 
 # time indicators
 
-TIME_NOW				LITERAL1
-LAST_READ				LITERAL1
-LOCAL_TIME				LITERAL1
-UTC_TIME				LITERAL1
+TIME_NOW	LITERAL1
+LAST_READ	LITERAL1
+LOCAL_TIME	LITERAL1
+UTC_TIME	LITERAL1
 
 # Date and time formats
 
-ISO8601_YWD				LITERAL1
-ATOM 					LITERAL1	
-COOKIE					LITERAL1	
-ISO8601					LITERAL1
-RFC822					LITERAL1
-RFC850					LITERAL1
-RFC1036					LITERAL1
-RFC1123					LITERAL1
-RFC2822					LITERAL1
-RFC3339 				LITERAL1
-RFC3339_EXT				LITERAL1
-RSS						LITERAL1
-W3C						LITERAL1
+ISO8601_YWD	LITERAL1
+ATOM	LITERAL1
+COOKIE	LITERAL1
+ISO8601	LITERAL1
+RFC822	LITERAL1
+RFC850	LITERAL1
+RFC1036	LITERAL1
+RFC1123	LITERAL1
+RFC2822	LITERAL1
+RFC3339	LITERAL1
+RFC3339_EXT	LITERAL1
+RSS	LITERAL1
+W3C	LITERAL1
 
 
 #defines to make code more readable
 
-SUNDAY					LITERAL1
-MONDAY					LITERAL1
-TUESDAY					LITERAL1
-WEDNESDAY				LITERAL1
-THURSDAY				LITERAL1
-FRIDAY					LITERAL1
-SATURDAY				LITERAL1
-		
-JANUARY					LITERAL1
-FEBRUARI				LITERAL1
-MARCH					LITERAL1
-APRIL					LITERAL1
-MAY						LITERAL1
-JUNE					LITERAL1
-JULY					LITERAL1
-AUGUST					LITERAL1
-SEPTEMBER				LITERAL1
-OCTOBER					LITERAL1
-NOVEMBER				LITERAL1
-DECEMBER				LITERAL1
-		
-FIRST					LITERAL1
-SECOND					LITERAL1
-THIRD					LITERAL1
-FOURTH					LITERAL1
-LAST					LITERAL1
+SUNDAY	LITERAL1
+MONDAY	LITERAL1
+TUESDAY	LITERAL1
+WEDNESDAY	LITERAL1
+THURSDAY	LITERAL1
+FRIDAY	LITERAL1
+SATURDAY	LITERAL1
+
+JANUARY	LITERAL1
+FEBRUARI	LITERAL1
+MARCH	LITERAL1
+APRIL	LITERAL1
+MAY	LITERAL1
+JUNE	LITERAL1
+JULY	LITERAL1
+AUGUST	LITERAL1
+SEPTEMBER	LITERAL1
+OCTOBER	LITERAL1
+NOVEMBER	LITERAL1
+DECEMBER	LITERAL1
+
+FIRST	LITERAL1
+SECOND	LITERAL1
+THIRD	LITERAL1
+FOURTH	LITERAL1
+LAST	LITERAL1