diff --git a/UGV4.tox b/UGV4.tox
index f17e31a..b06afd7 100644
Binary files a/UGV4.tox and b/UGV4.tox differ
diff --git a/UberGui_V4_Release.toe b/UberGui_V4_Release.toe
index a8f35a0..77374ec 100644
Binary files a/UberGui_V4_Release.toe and b/UberGui_V4_Release.toe differ
diff --git a/python/UG4.py b/python/UG4.py
index 7224395..8cb5cca 100644
--- a/python/UG4.py
+++ b/python/UG4.py
@@ -44,7 +44,17 @@ def Regenerate(self, SRC ):
 			uberGuiOverrideDat = SRC.op('Uberguiconfigoverride')
 			
 			publicPageNames = self.publicLookup.row(1)[0].val.split(',')
-			parTuplets = [ x for x in SRC.customTuplets if x[0].enable == True and x[0].page.name in publicPageNames ]
+			all_pars = SRC.builtinPars + SRC.customPars
+			all_pars = [ x for x in all_pars if x.page != None ]
+			captured_pars = [ x for x in all_pars if x.page.name in publicPageNames ]
+			
+			# old way.
+			# parTuplets = [ x for x in SRC.customTuplets if x[0].enable == True and x[0].page.name in publicPageNames ]
+			parTuplets = self.generate_par_tuple_list(captured_pars)
+			
+
+			# for each in parTuplets:
+			# 	print( [x.name for x in each] )
 			
 			FirstHeader = 1
 			
@@ -255,6 +265,17 @@ def Regenerate(self, SRC ):
 		else:
 			HTML_FINAL.text = ''
 	
+	def generate_par_tuple_list(self, parlist):
+
+		par_tuples = []
+		for par in parlist:
+			if par.vecIndex == 0:
+				par_tuples += [[par]]
+			elif par.vecIndex > 0:
+				par_tuples[-1] += [par]
+		
+		return par_tuples
+
 	
 	def ParseTitle(self,titleStr):
 		'''
@@ -1708,4 +1729,4 @@ def TraceFunctionCall( self ):
 
 		print('-'*(source_max+line_max+function_max+11))
 
-		return
\ No newline at end of file
+		return