--- a/backends/kiibohd.py	Mon Mar 21 23:06:27 2016 -0700
+++ b/backends/kiibohd.py	Sun May 08 17:16:41 2016 -0700
@@ -119,11 +119,14 @@
 
 		## Defines ##
 		self.fill_dict['Defines'] = ""
+		stateWordSize = ""
 
 		# Iterate through defines and lookup the variables
 		for define in variables.defines.keys():
 			if define in variables.overallVariables.keys():
 				self.fill_dict['Defines'] += "\n#define {0} {1}".format( variables.defines[ define ], variables.overallVariables[ define ].replace( '\n', ' \\\n' ) )
+				if define == "stateWordSize":
+					stateWordSize = variables.overallVariables[ define ]
 			else:
 				print( "{0} '{1}' not defined...".format( WARNING, define ) )
 
@@ -214,6 +217,8 @@
 		for result in range( 0, len( macros.resultsIndexSorted ) ):
 			self.fill_dict['ResultMacroList'] += "\tDefine_RM( {0} ),\n".format( result )
 		self.fill_dict['ResultMacroList'] += "};"
+		
+		results_count = len( macros.resultsIndexSorted );
 
 
 		## Result Macro Record ##
@@ -224,6 +229,7 @@
 		self.fill_dict['TriggerMacros'] = ""
 
 		# Iterate through each of the trigger macros
+		triggers_count = len( macros.triggersIndexSorted );
 		for trigger in range( 0, len( macros.triggersIndexSorted ) ):
 			self.fill_dict['TriggerMacros'] += "Guide_TM( {0} ) = {{ ".format( trigger )
 
@@ -249,6 +255,14 @@
 			self.fill_dict['TriggerMacros'] += "0 };\n"
 		self.fill_dict['TriggerMacros'] = self.fill_dict['TriggerMacros'][ :-1 ] # Remove last newline
 
+		# check for too small stateWordSize
+		if stateWordSize == "8" and (triggers_count > 255 or results_count > 255):
+			print ("{0} Over 255 trigger or result macros, changing stateWordSize from {1} to 16.".format( WARNING, stateWordSize ) )
+			print( "Results count: ", results_count )
+			print( "Triggers count:", triggers_count )
+			stateWordSize == "16"
+			self.fill_dict['Defines'] = self.fill_dict['Defines'].replace("StateWordSize_define 8", "StateWordSize_define 16")
+			#print (self.fill_dict['Defines'])
 
 		## Trigger Macro List ##
 		self.fill_dict['TriggerMacroList'] = "const TriggerMacro TriggerMacroList[] = {\n"