diff --git a/src/damaris/gui/DamarisGUI.py b/src/damaris/gui/DamarisGUI.py
index f7c8f96..c952364 100644
--- a/src/damaris/gui/DamarisGUI.py
+++ b/src/damaris/gui/DamarisGUI.py
@@ -1150,31 +1150,41 @@ class ScriptWidgets:
 
         keywords = """for if else elif in print try finally except global lambda not or pass def
 class import from as return yield while continue break assert None True False AccumulatedValue
-Accumulation MeasurementResult ADC_Result Experiment synchronize sleep result data isinstance
-issubclass min max abs pow range xrange log_range lin_range staggered_range int float zip file
+Accumulation MeasurementResult ADC_Result Experiment synchronize sleep result data
+issubclass min max abs pow range xrange log_range lin_range staggered_range file
 combine_ranges interleaved_range get_sampling_rate uses_statistics write_to_csv write_to_hdf
-get_job_id get_description set_description get_xdata get_ydata set_xdate set_ydata"""
+get_job_id get_description set_description get_xdata get_ydata set_xdata set_ydata
+ttl_pulse ttls rf_pulse state_start state_end wait record loop_start loop_end set_frequency
+set_pfg set_dac set_phase set_pts_local get_length set_title get_title add_lineplotdata 
+add_errorplotdata get_number_of_channels get_style set_style get_xlabel set_xlabel 
+get_ylabel set_ylabel"""
 
-        keywordsbuffer = gtksourceview2.Buffer()
-        keywordsbuffer.set_text(keywords)
+        self.keywordsbuffer = gtksourceview2.Buffer()
+        self.keywordsbuffer.set_text(keywords)
 
         compexp = self.experiment_script_textview.get_completion()
         compres = self.data_handling_textview.get_completion()
 
-        compwgen = gtksourceview2.CompletionWords()
-        compwgen.register(keywordsbuffer)
+        compexp.set_property("show-headers", True)
+        compres.set_property("show-headers", True)
 
-        compwexp = gtksourceview2.CompletionWords()
-        compwexp.register(self.experiment_script_textbuffer)
+        self.compwgen = gtksourceview2.CompletionWords.new("Keywords", None)
+        self.compwgen.register(self.keywordsbuffer)
+        self.compwgen.set_property("minimum-word-size", 1)
 
-        compwres = gtksourceview2.CompletionWords()
-        compwres.register(self.data_handling_textbuffer)
+        self.compwexp = gtksourceview2.CompletionWords.new("Words", None)
+        self.compwexp.register(self.experiment_script_textbuffer)
+        self.compwexp.set_property("minimum-word-size", 2)
 
-        compexp.add_provider(compwgen)
-        compres.add_provider(compwgen)
+        self.compwres = gtksourceview2.CompletionWords.new("Words", None)
+        self.compwres.register(self.data_handling_textbuffer)
+        self.compwres.set_property("minimum-word-size", 2)
 
-        compexp.add_provider(compwexp)
-        compres.add_provider(compwres)
+        compexp.add_provider(self.compwgen)
+        compres.add_provider(self.compwgen)
+
+        compexp.add_provider(self.compwexp)
+        compres.add_provider(self.compwres)
 
         # script fonts are atlered by configuration
         # clipboard