diff --git a/Python.sublime-completions b/Python.sublime-completions
index d239de6..b7db216 100644
--- a/Python.sublime-completions
+++ b/Python.sublime-completions
@@ -8,7 +8,7 @@
 
       { "trigger": "layout.yesno_screen", "contents": "layout.yesno_screen(message='$0', yes=None, no=None)" },
 
-      { "trigger": "persistent", "contents": "persistent.${1:[variable]} = ${2:[value]}" },
+      { "trigger": "persistent", "contents": "persistent.${0:[variable]} = ${1:[value]}" },
 
       { "trigger": "renpy.add_layer", "contents": "renpy.add_layer(layer='$0', above=None, below=None, menu_clear=True)" },
 
@@ -26,9 +26,9 @@
       { "trigger": "renpy.count_dialogue_blocks", "contents": "renpy.count_dialogue_blocks()" },
       { "trigger": "renpy.count_seen_dialogue_blocks", "contents": "renpy.count_seen_dialogue_blocks()" },
 
-      { "trigger": "renpy.define_screen", "contents": "renpy.define_screen('${1:[screenName]}', '${2:[displayFunction]}', modal='False', zorder='0', tag=None, variant=None)" },
+      { "trigger": "renpy.define_screen", "contents": "renpy.define_screen('${0:[screenName]}', '${1:[displayFunction]}', modal='False', zorder='0', tag=None, variant=None)" },
       { "trigger": "renpy.diff_memory", "contents": "renpy.diff_memory(update=True)" },
-      { "trigger": "renpy.display_menu", "contents": "renpy.display_menu(items=('${1:[option]}','${2:[returnValue]}'), interact=True, screen='choice')" },
+      { "trigger": "renpy.display_menu", "contents": "renpy.display_menu(items=('${0:[option]}','${1:[returnValue]}'), interact=True, screen='choice')" },
       { "trigger": "renpy.dynamic", "contents": "renpy.dynamic()" },
 
       { "trigger": "renpy.end_replay", "contents": "renpy.end_replay()" },
@@ -40,20 +40,24 @@
       { "trigger": "renpy.full_restart", "contents": "renpy.full_restart(transition=False, label='_invoke_main_menu', target='_main_menu')" },
 
       { "trigger": "renpy.get_at_list", "contents": "renpy.get_at_list(name='$0', layer='master')" },
+      { "trigger": "renpy.get_attributes", "contents": "renpy.get_attributes(tag='$0', layer=None)" },
+      { "trigger": "renpy.get_available_image_tags", "contents": "renpy.get_available_image_tags()" },
       { "trigger": "renpy.get_autoreload", "contents": "renpy.get_autoreload()" },
-      { "trigger": "renpy.get_image_bounds", "contents": "renpy.get_image_bounds(tag=$0, width=None, height=None, layer='master')" },
+      { "trigger": "renpy.get_hidden_tags", "contents": "renpy.get_hidden_tags(layer='master')" },
+      { "trigger": "renpy.get_image_bounds", "contents": "renpy.get_image_bounds(tag='$0', width=None, height=None, layer='master')" },
       { "trigger": "renpy.get_image_load_log", "contents": "renpy.get_image_load_log(age=None)" },
       { "trigger": "renpy.get_mouse_pos", "contents": "renpy.get_mouse_pos()" },
+      { "trigger": "renpy.get_ordered_image_attributes", "contents": "renpy.get_ordered_image_attributes(tag='$0', attributes=(), sort=None)" },
       { "trigger": "renpy.get_physical_size", "contents": "renpy.get_physical_size()" },
       { "trigger": "renpy.get_placement", "contents": "renpy.get_placement(d=$0)" },
-      { "trigger": "renpy.get_refresh_rate", "contents": "renpy.get_refresh_rate(precision=${1:5})" },
+      { "trigger": "renpy.get_refresh_rate", "contents": "renpy.get_refresh_rate(precision=${0:5})" },
       { "trigger": "renpy.get_renderer_info", "contents": "renpy.get_renderer_info()" },
       { "trigger": "renpy.get_say_attributes", "contents": "renpy.get_say_attributes()" },
       { "trigger": "renpy.get_screen", "contents": "renpy.get_screen(name='$0', layer='screens')" },
       { "trigger": "renpy.get_showing_tags", "contents": "renpy.get_showing_tags(layer='master', sort=False)" },
       { "trigger": "renpy.get_side_image", "contents": "renpy.get_side_image(prefix_tag='$0', image_tag=None, not_showing=True, layer='master')" },
       { "trigger": "renpy.get_transition", "contents": "renpy.get_transition(layer=None)" },
-      { "trigger": "renpy.get_widget", "contents": "renpy.get_widget('${1:[screen]}', '${2:[id]}', layer='screens')" },
+      { "trigger": "renpy.get_widget", "contents": "renpy.get_widget('${0:[screen]}', '${1:[id]}', layer='screens')" },
       { "trigger": "renpy.get_widget_properties", "contents": "renpy.get_widget_properties(id='$0', screen=None, layer='screens')" },
 
       { "trigger": "renpy.has_image", "contents": "renpy.has_image(name='$0', exact=False)" },
@@ -99,7 +103,7 @@
       { "trigger": "renpy.quit_event", "contents": "renpy.quit_event()" },
 
       { "trigger": "renpy.random.random", "contents": "renpy.random.random()" },
-      { "trigger": "renpy.random.randint", "contents": "renpy.random.randint(${1:[min]}, ${2:[max]})" },
+      { "trigger": "renpy.random.randint", "contents": "renpy.random.randint(${0:[min]}, ${1:[max]})" },
       { "trigger": "renpy.random.choice", "contents": "renpy.random.choice(seq=[$0])" },
       { "trigger": "renpy.reload_script", "contents": "renpy.reload_script()" },
       { "trigger": "renpy.reset_physical_size", "contents": "renpy.reset_physical_size()" },
@@ -107,15 +111,15 @@
       { "trigger": "renpy.return_statement", "contents": "renpy.return_statement()" },
       { "trigger": "renpy.run", "contents": "renpy.run(action=$0)" },
       
-      { "trigger": "renpy.say", "contents": "renpy.say('${1:[whoIsTalking]}', '${2:[whatIsSaid]}', interact=True)" },
+      { "trigger": "renpy.say", "contents": "renpy.say('${0:[whoIsTalking]}', '${1:[whatIsSaid]}', interact=True)" },
       { "trigger": "renpy.scene", "contents": "renpy.scene(layer='master')" },
       { "trigger": "renpy.screenshot", "contents": "renpy.screenshot(filename='$0')" },
       { "trigger": "renpy.scry", "contents": "renpy.scry()" },
       { "trigger": "renpy.seen_audio", "contents": "renpy.seen_audio(filename='$0')" },
       { "trigger": "renpy.seen_image", "contents": "renpy.seen_image(name='$0')" },
       { "trigger": "renpy.set_autoreload", "contents": "renpy.set_autoreload(autoreload=$0)" },
-      { "trigger": "renpy.set_mouse_pos", "contents": "renpy.set_mouse_pos(${1:[x]}, ${2:[y]}, duration=0)" },
-      { "trigger": "renpy.set_physical_size", "contents": "renpy.set_physical_size(size=(${1:[x]}, ${2:[y]}))" },
+      { "trigger": "renpy.set_mouse_pos", "contents": "renpy.set_mouse_pos(${0:[x]}, ${1:[y]}, duration=0)" },
+      { "trigger": "renpy.set_physical_size", "contents": "renpy.set_physical_size(size=(${0:[x]}, ${1:[y]}))" },
       { "trigger": "renpy.show", "contents": "renpy.show(name='$0', at_list=[], layer='master', what=None, zorder=0, tag=None, behind=[])" },
       { "trigger": "renpy.show_layer_at", "contents": "renpy.show_layer_at(at_list=[$0], layer='master')" },
       { "trigger": "renpy.show_screen", "contents": "renpy.show_screen(_screen_name='$0')" },
diff --git a/RenpyLanguage.sublime-completions b/RenpyLanguage.sublime-completions
index 4e14375..e6eac2b 100644
--- a/RenpyLanguage.sublime-completions
+++ b/RenpyLanguage.sublime-completions
@@ -9,8 +9,8 @@
       { "trigger": "At", "contents": "At(displayable=$0)" },
       { "trigger": "AnimatedValue", "contents": "AnimatedValue(value=0.0, range=1.0, delay=1.0, old_value=None)" },
       { "trigger": "Character", "contents": "Character(name='$0')" },
-      { "trigger": "Composite", "contents": "Composite(size=(${1:[x]}, ${2:[y]}))" },
-      { "trigger": "Crop", "contents": "Crop(rect=(${1:[x]}, ${2:[y]}, ${3:[height]}, ${4:[width]}), child=${2:[imageToCrop]})" },
+      { "trigger": "Composite", "contents": "Composite(size=(${0:[x]}, ${1:[y]}))" },
+      { "trigger": "Crop", "contents": "Crop(rect=(${0:[x]}, ${1:[y]}, ${2:[height]}, ${3:[width]}), child=${4:[imageToCrop]})" },
       { "trigger": "DictValue", "contents": "DictValue(dict=$0, key=, range=, max_is_zero=False, style='bar', offset=0, step=None)" },
       { "trigger": "DisableAllInputValues", "contents": "DisableAllInputValues()" },
       { "trigger": "DynamicCharacter", "contents": "DynamicCharacter(name='$0')" },
@@ -32,32 +32,32 @@
       { "trigger": "FilePageName", "contents": "FilePageName(auto='a', quick='q')" },
       { "trigger": "FileSaveName", "contents": "FileSaveName(name='$0', empty='', page=None)" },
       { "trigger": "FileScreenshot", "contents": "FileScreenshot(name='$0', empty=None, page=None)" },
-      { "trigger": "FileSlotName", "contents": "FileSlotName(slot=$0, slots_per_page=, auto='a', quick='q', format='%s%d')" },
+      { "trigger": "FileSlotName", "contents": "FileSlotName(slot=$0, slots_per_page=$1, auto='a', quick='q', format='%s%d')" },
       { "trigger": "FileTime", "contents": "FileTime(name='$0', format='%b %d, %H:%M', empty='', page=None)" },
       { "trigger": "FileUsedSlots", "contents": "FileUsedSlots(page=None, highest_first=True)" },
       { "trigger": "Function", "contents": "Function(callable=$0)" },
       { "trigger": "Gallery", "contents": "Gallery()" },
       { "trigger": "GamepadCalibrate", "contents": "GamepadCalibrate()" },
-      { "trigger": "GamepadExists", "contents": "GamepadExists(developer=${1:True})" },
+      { "trigger": "GamepadExists", "contents": "GamepadExists(developer=${0:True})" },
       { "trigger": "Help", "contents": "Help(help=None)" },
       { "trigger": "Hide", "contents": "Hide(screen=$0, transition=None)" },
       { "trigger": "HideInterface", "contents": "HideInterface()" },
       { "trigger": "If", "contents": "If(expression=$0, true=None, false=None)" },
       { "trigger": "InvertSelected", "contents": "InvertSelected(action=$0)" },
       { "trigger": "Jump", "contents": "Jump(label=$0)" },
-      { "trigger": "LayeredImageProxy", "contents": "LayeredImageProxy(name=${1:[name]}, transform=${2:None}))" },
-      { "trigger": "LiveComposite", "contents": "LiveComposite(size=(${1:[x]}, ${2:[y]}))" },
-      { "trigger": "LiveCrop", "contents": "LiveCrop(rect=(${1:[x]}, ${2:[y]}, ${3:[height]}, ${4:[width]}), child=${2:[imageToCrop]})" },
+      { "trigger": "LayeredImageProxy", "contents": "LayeredImageProxy(name=${0:[name]}, transform=${1:None}))" },
+      { "trigger": "LiveComposite", "contents": "LiveComposite(size=(${0:[x]}, ${1:[y]}))" },
+      { "trigger": "LiveCrop", "contents": "LiveCrop(rect=(${0:[x]}, ${1:[y]}, ${2:[height]}, ${3:[width]}), child=${4:[imageToCrop]})" },
       { "trigger": "MainMenu", "contents": "MainMenu(confirm=True)" },
       { "trigger": "MixerValue", "contents": "MixerValue(mixer=$0)" },
-      { "trigger": "MouseMove", "contents": "MouseMove(${1:[x]}, ${2:[y]}, duration=0)" },
+      { "trigger": "MouseMove", "contents": "MouseMove(${0:[x]}, ${1:[y]}, duration=0)" },
       { "trigger": "Movie", "contents": "Movie(fps=24, size=None, properties=$0)" },
       { "trigger": "NullAction", "contents": "NullAction()" },
       { "trigger": "Notify", "contents": "Notify(message=$0)" },
       { "trigger": "OpenURL", "contents": "OpenURL(url=$0)" },
-      { "trigger": "PauseAudio", "contents": "PauseAudio('${1:[channel]}', value=True)" },
-      { "trigger": "Play", "contents": "Play('${1:[channel]}', '${2:[file]}', selected=None)" },
-      { "trigger": "PlayCharacterVoice", "contents": "PlayCharacterVoice('${1:[voice_tag]}', '${2:[sample]}')" },
+      { "trigger": "PauseAudio", "contents": "PauseAudio('${0:[channel]}', value=True)" },
+      { "trigger": "Play", "contents": "Play('${0:[channel]}', '${1:[file]}', selected=None)" },
+      { "trigger": "PlayCharacterVoice", "contents": "PlayCharacterVoice('${0:[voice_tag]}', '${1:[sample]}')" },
       { "trigger": "Position", "contents": "Position($0)" },
       { "trigger": "Preference", "contents": "Preference(name='$0', value=None)" },
       { "trigger": "Queue", "contents": "Queue(channel=$0, file=)" },
@@ -69,15 +69,16 @@
       { "trigger": "RollForward", "contents": "RollForward()" },
       { "trigger": "Rollback", "contents": "Rollback()" },
       { "trigger": "Screenshot", "contents": "Screenshot()" },
+      { "trigger": "Scroll", "contents": "Scroll(id=$0, direction=$1, amount=u'step')" },
       { "trigger": "SelectedIf", "contents": "SelectedIf(expression=$0)" },
       { "trigger": "SensitiveIf", "contents": "SensitiveIf(expression=$0)" },
       { "trigger": "SetCharacterVolume", "contents": "SetCharacterVolume(voice_tag='$0', volume=None)" },
-      { "trigger": "SetDict", "contents": "SetDict(dict=$0, $key=, $value=)" },
-      { "trigger": "SetField", "contents": "SetField(object=$0, field=, value=)" },
-      { "trigger": "SetMixer", "contents": "SetMixer(mixer=$0, volume=)" },
-      { "trigger": "SetScreenVariable", "contents": "SetScreenVariable(name='$0', value=)" },
-      { "trigger": "SetVariable", "contents": "SetVariable(variable=$0, value=)" },
-      { "trigger": "SetVoiceMute", "contents": "SetVoiceMute('${1:[voice_tag]}', ${2:[setToMute]})" },
+      { "trigger": "SetDict", "contents": "SetDict(dict=$0, key=$1, value=$2)" },
+      { "trigger": "SetField", "contents": "SetField(object=$0, field=$1, value=$2)" },
+      { "trigger": "SetMixer", "contents": "SetMixer(mixer=$0, volume=$1)" },
+      { "trigger": "SetScreenVariable", "contents": "SetScreenVariable(name='$0', value=$1)" },
+      { "trigger": "SetVariable", "contents": "SetVariable(variable=$0, value=$1)" },
+      { "trigger": "SetVoiceMute", "contents": "SetVoiceMute('${0:[voice_tag]}', ${1:[setToMute]})" },
       { "trigger": "Show", "contents": "Show(screen=$0, transition=None)" },
       { "trigger": "ShowMenu", "contents": "ShowMenu(screen=None)" },
       { "trigger": "ShowTransient", "contents": "ShowTransient(screen=$0)" },
@@ -87,13 +88,13 @@
       { "trigger": "StaticValue", "contents": "StaticValue(value=0.0, range=1.0)" },
       { "trigger": "Stop", "contents": "Stop(channel=$0)" },
       { "trigger": "Text", "contents": "Text(text=$0, slow=False, slow_done=None, slow_speed=None, slow_start=0, slow_abortable=False, style='default')" },
-      { "trigger": "ToggleDict", "contents": "ToggleDict(dict=$0, key=, true_value=None, false_value=None)" },
-      { "trigger": "ToggleField", "contents": "ToggleField(object=$0, field=, true_value=None, false_value=None)" },
+      { "trigger": "ToggleDict", "contents": "ToggleDict(dict=$0, key=$1, true_value=None, false_value=None)" },
+      { "trigger": "ToggleField", "contents": "ToggleField(object=$0, field=$1, true_value=None, false_value=None)" },
       { "trigger": "ToggleScreenVariable", "contents": "ToggleScreenVariable(name='$0', true_value=None, false_value=None)" },
       { "trigger": "ToggleVariable", "contents": "ToggleVariable(variable=$0, true_value=None, false_value=None)" },
       { "trigger": "ToggleVoiceMute", "contents": "ToggleVoiceMute(voice_tag=$0, invert=False)" },
       { "trigger": "Tooltip", "contents": "Tooltip()" },
-      { "trigger": "VariableValue", "contents": "VariableValue(variable=$0, range=, max_is_zero=False, style='bar', offset=0, step=None)" },
+      { "trigger": "VariableValue", "contents": "VariableValue(variable=$0, range=$1, max_is_zero=False, style='bar', offset=0, step=None)" },
       { "trigger": "VoiceReplay", "contents": "VoiceReplay()" },
       { "trigger": "With", "contents": "With(transition=$0)" },
       { "trigger": "XScrollValue", "contents": "XScrollValue(viewport=$0)" },