diff --git a/aegisub/src/command/app.cpp b/aegisub/src/command/app.cpp
index 7820ba49c..6683eea6e 100644
--- a/aegisub/src/command/app.cpp
+++ b/aegisub/src/command/app.cpp
@@ -62,8 +62,7 @@ namespace cmd {
 /// @{
 
 /// Launch about dialogue.
-class app_about: public Command {
-public:
+struct app_about : public Command {
 	CMD_NAME("app/about")
 	STR_MENU("&About..")
 	STR_DISP("About")
@@ -76,8 +75,7 @@ public:
 
 
 /// Display audio and subtitles.
-class app_display_audio_subs: public Command {
-public:
+struct app_display_audio_subs : public Command {
 	CMD_NAME("app/display/audio_subs")
 	STR_MENU("Audio+Subs View")
 	STR_DISP("Audio+Subs View")
@@ -90,8 +88,7 @@ public:
 
 
 /// Display audio, video and subtitles.
-class app_display_full: public Command {
-public:
+struct app_display_full : public Command {
 	CMD_NAME("app/display/full")
 	STR_MENU("Full view")
 	STR_DISP("Full view")
@@ -104,8 +101,7 @@ public:
 
 
 /// Display subtitles only.
-class app_display_subs: public Command {
-public:
+struct app_display_subs : public Command {
 	CMD_NAME("app/display/subs")
 	STR_MENU("Subs Only View")
 	STR_DISP("Subs Only View")
@@ -118,8 +114,7 @@ public:
 
 
 /// Display video and subtitles only.
-class app_display_video_subs: public Command {
-public:
+struct app_display_video_subs : public Command {
 	CMD_NAME("app/display/video_subs")
 	STR_MENU("Video+Subs View")
 	STR_DISP("Video+Subs View")
@@ -132,8 +127,7 @@ public:
 
 
 /// Exit the application.
-class app_exit: public Command {
-public:
+struct app_exit : public Command {
 	CMD_NAME("app/exit")
 	STR_MENU("E&xit")
 	STR_DISP("Exit")
@@ -146,8 +140,7 @@ public:
 
 
 /// Select Aegisub interface language
-class app_language: public Command {
-public:
+struct app_language : public Command {
 	CMD_NAME("app/language")
 	STR_MENU("&Language...")
 	STR_DISP("Language")
@@ -177,8 +170,7 @@ public:
 
 
 /// Event log.
-class app_log: public Command {
-public:
+struct app_log : public Command {
 	CMD_NAME("app/log")
 	STR_MENU("&Log window...")
 	STR_DISP("Log window")
@@ -191,8 +183,7 @@ public:
 
 
 /// Open a new application window.
-class app_new_window: public Command {
-public:
+struct app_new_window : public Command {
 	CMD_NAME("app/new_window")
 	STR_MENU("New Window")
 	STR_DISP("New Window")
@@ -205,8 +196,7 @@ public:
 
 
 /// Configure Aegisub.
-class app_options: public Command {
-public:
+struct app_options : public Command {
 	CMD_NAME("app/options")
 	STR_MENU("&Options..")
 	STR_DISP("Options")
@@ -223,8 +213,7 @@ public:
 
 
 /// Check to see if there is a new version of Aegisub available.
-class app_updates: public Command {
-public:
+struct app_updates : public Command {
 	CMD_NAME("app/updates")
 	STR_MENU("&Check for Updates..")
 	STR_DISP("Check for Updates")
diff --git a/aegisub/src/command/audio.cpp b/aegisub/src/command/audio.cpp
index 3f7d63f36..ac83ec4a0 100644
--- a/aegisub/src/command/audio.cpp
+++ b/aegisub/src/command/audio.cpp
@@ -55,8 +55,7 @@ namespace cmd {
 
 
 /// Closes the currently open audio file.
-class audio_close: public Command {
-public:
+struct audio_close : public Command {
 	CMD_NAME("audio/close")
 	STR_MENU("&Close Audio")
 	STR_DISP("Close Audio")
@@ -69,8 +68,7 @@ public:
 
 
 /// Opens an audio file.
-class audio_open: public Command {
-public:
+struct audio_open : public Command {
 	CMD_NAME("audio/open")
 	STR_MENU("&Open Audio File..")
 	STR_DISP("Open Audio File")
@@ -91,8 +89,7 @@ public:
 
 
 /// Open a 150 minutes blank audio clip, for debugging.
-class audio_open_blank: public Command {
-public:
+struct audio_open_blank : public Command {
 	CMD_NAME("audio/open/blank")
 	STR_MENU("Open 2h30 Blank Audio")
 	STR_DISP("Open 2h30 Blank Audio")
@@ -105,8 +102,7 @@ public:
 
 
 /// Open a 150 minutes noise-filled audio clip, for debugging.
-class audio_open_noise: public Command {
-public:
+struct audio_open_noise : public Command {
 	CMD_NAME("audio/open/noise")
 	STR_MENU("Open 2h30 Noise Audio")
 	STR_DISP("Open 2h30 Noise Audio")
@@ -119,8 +115,7 @@ public:
 
 
 /// Opens the audio from the current video file.
-class audio_open_video: public Command {
-public:
+struct audio_open_video : public Command {
 	CMD_NAME("audio/open/video")
 	STR_MENU("Open Audio from &Video")
 	STR_DISP("Open Audio from Video")
@@ -133,8 +128,7 @@ public:
 
 
 /// Display audio as a frequency-power spectrograph.
-class audio_view_spectrum: public Command {
-public:
+struct audio_view_spectrum : public Command {
 	CMD_NAME("audio/view/spectrum")
 	STR_MENU("Spectrum Display")
 	STR_DISP("Spectrum Display")
@@ -147,8 +141,7 @@ public:
 
 
 /// Display audio as a linear amplitude graph.
-class audio_view_waveform: public Command {
-public:
+struct audio_view_waveform : public Command {
 	CMD_NAME("audio/view/waveform")
 	STR_MENU("Waveform Display")
 	STR_DISP("Waveform Display")
diff --git a/aegisub/src/command/automation.cpp b/aegisub/src/command/automation.cpp
index a753a925b..eb86d5a77 100644
--- a/aegisub/src/command/automation.cpp
+++ b/aegisub/src/command/automation.cpp
@@ -56,8 +56,7 @@ namespace cmd {
 
 
 /// Open automation manager.
-class am_manager: public Command {
-public:
+struct am_manager : public Command {
 	CMD_NAME("am/manager")
 	STR_MENU("&Automation..")
 	STR_DISP("Automation")
diff --git a/aegisub/src/command/edit.cpp b/aegisub/src/command/edit.cpp
index e9d8f8d7e..950665f0c 100644
--- a/aegisub/src/command/edit.cpp
+++ b/aegisub/src/command/edit.cpp
@@ -57,8 +57,7 @@ namespace cmd {
 
 
 /// Copy subtitles.
-class edit_line_copy: public Command {
-public:
+struct edit_line_copy : public Command {
 	CMD_NAME("edit/line/copy")
 	STR_MENU("Copy Lines")
 	STR_DISP("Copy Lines")
@@ -75,8 +74,7 @@ public:
 
 
 /// Cut subtitles.
-class edit_line_cut: public Command {
-public:
+struct edit_line_cut: public Command {
 	CMD_NAME("edit/line/cut")
 	STR_MENU("Cut Lines")
 	STR_DISP("Cut Lines")
@@ -93,8 +91,7 @@ public:
 
 
 /// Delete currently selected lines.
-class edit_line_delete: public Command {
-public:
+struct edit_line_delete : public Command {
 	CMD_NAME("edit/line/delete")
 	STR_MENU("Delete Lines")
 	STR_DISP("Delete Lines")
@@ -107,8 +104,7 @@ public:
 
 
 /// Duplicate the selected lines.
-class edit_line_duplicate: public Command {
-public:
+struct edit_line_duplicate : public Command {
 	CMD_NAME("edit/line/duplicate")
 	STR_MENU("&Duplicate Lines")
 	STR_DISP("Duplicate Lines")
@@ -122,8 +118,7 @@ public:
 
 
 /// Duplicate lines and shift by one frame.
-class edit_line_duplicate_shift: public Command {
-public:
+struct edit_line_duplicate_shift : public Command {
 	CMD_NAME("edit/line/duplicate/shift")
 	STR_MENU("&Duplicate and Shift by 1 Frame")
 	STR_DISP("Duplicate and Shift by 1 Frame")
@@ -137,8 +132,7 @@ public:
 
 
 /// Joins selected lines in a single one, as karaoke.
-class edit_line_join_as_karaoke: public Command {
-public:
+struct edit_line_join_as_karaoke : public Command {
 	CMD_NAME("edit/line/join/as_karaoke")
 	STR_MENU("As &Karaoke")
 	STR_DISP("As Karaoke")
@@ -152,8 +146,7 @@ public:
 
 
 /// Joins selected lines in a single one, concatenating text together.
-class edit_line_join_concatenate: public Command {
-public:
+struct edit_line_join_concatenate : public Command {
 	CMD_NAME("edit/line/join/concatenate")
 	STR_MENU("&Concatenate")
 	STR_DISP("Concatenate")
@@ -167,8 +160,7 @@ public:
 
 
 /// Joins selected lines in a single one, keeping text of first and discarding remaining.
-class edit_line_join_keep_first: public Command {
-public:
+struct edit_line_join_keep_first : public Command {
 	CMD_NAME("edit/line/join/keep_first")
 	STR_MENU("Keep &First")
 	STR_DISP("Keep First")
@@ -182,8 +174,7 @@ public:
 
 
 /// Paste subtitles.
-class edit_line_paste: public Command {
-public:
+struct edit_line_paste : public Command {
 	CMD_NAME("edit/line/paste")
 	STR_MENU("Paste Lines")
 	STR_DISP("Paste Lines")
@@ -200,8 +191,7 @@ public:
 
 
 /// Paste subtitles over others.
-class edit_line_paste_over: public Command {
-public:
+struct edit_line_paste_over : public Command {
 	CMD_NAME("edit/line/paste/over")
 	STR_MENU("Paste Lines Over..")
 	STR_DISP("Paste Lines Over")
@@ -214,8 +204,7 @@ public:
 
 
 /// Recombine subtitles when they have been split and merged.
-class edit_line_recombine: public Command {
-public:
+struct edit_line_recombine : public Command {
 	CMD_NAME("edit/line/recombine")
 	STR_MENU("Recombine Lines")
 	STR_DISP("Recombine Lines")
@@ -228,8 +217,7 @@ public:
 
 
 /// Uses karaoke timing to split line into multiple smaller lines.
-class edit_line_split_by_karaoke: public Command {
-public:
+struct edit_line_split_by_karaoke : public Command {
 	CMD_NAME("edit/line/split/by_karaoke")
 	STR_MENU("Split Lines (by karaoke)")
 	STR_DISP("Split Lines (by karaoke)")
@@ -251,8 +239,7 @@ public:
 
 
 /// Swaps the two selected lines.
-class edit_line_swap: public Command {
-public:
+struct edit_line_swap : public Command {
 	CMD_NAME("edit/line/swap")
 	STR_MENU("Swap Lines")
 	STR_DISP("Swap Lines")
@@ -266,8 +253,7 @@ public:
 
 
 /// Redoes last action.
-class edit_redo: public Command {
-public:
+struct edit_redo : public Command {
 	CMD_NAME("edit/redo")
 	STR_MENU("&Redo")
 	STR_DISP("Redo")
@@ -281,8 +267,7 @@ public:
 
 
 /// Find and replace words in subtitles.
-class edit_search_replace: public Command {
-public:
+struct edit_search_replace : public Command {
 	CMD_NAME("edit/search_replace")
 	STR_MENU("Search and &Replace..")
 	STR_DISP("Search and Replace")
@@ -296,8 +281,7 @@ public:
 
 
 /// Undoes last action.
-class edit_undo: public Command {
-public:
+struct edit_undo : public Command {
 	CMD_NAME("edit/undo")
 	STR_MENU("&Undo")
 	STR_DISP("Undo")
diff --git a/aegisub/src/command/grid.cpp b/aegisub/src/command/grid.cpp
index 58668a051..a3dc07fee 100644
--- a/aegisub/src/command/grid.cpp
+++ b/aegisub/src/command/grid.cpp
@@ -55,8 +55,7 @@ namespace cmd {
 
 
 /// Move to the next subtitle line.
-class grid_line_next: public Command {
-public:
+struct grid_line_next : public Command {
 	CMD_NAME("grid/line/next")
 	STR_MENU("Next Line")
 	STR_DISP("Next Line")
@@ -69,8 +68,7 @@ public:
 
 
 /// Move to the previous line.
-class grid_line_prev: public Command {
-public:
+struct grid_line_prev : public Command {
 	CMD_NAME("grid/line/prev")
 	STR_MENU("Previous Line")
 	STR_DISP("Previous Line")
@@ -83,8 +81,7 @@ public:
 
 
 /// Cycle through tag hiding modes.
-class grid_tag_cycle_hiding: public Command {
-public:
+struct grid_tag_cycle_hiding : public Command {
 	CMD_NAME("grid/tag/cycle_hiding")
 	STR_MENU("Cycle Tag Hiding")
 	STR_DISP("Cycle Tag Hiding")
@@ -113,8 +110,7 @@ public:
 
 
 /// Hide override tags in the subtitle grid.
-class grid_tags_hide: public Command {
-public:
+struct grid_tags_hide : public Command {
 	CMD_NAME("grid/tags/hide")
 	STR_MENU("Hide Tags")
 	STR_DISP("Hide Tags")
@@ -128,8 +124,7 @@ public:
 
 
 /// Show full override tags in the subtitle grid.
-class grid_tags_show: public Command {
-public:
+struct grid_tags_show : public Command {
 	CMD_NAME("grid/tags/show")
 	STR_MENU("Show Tags")
 	STR_DISP("Show Tags")
@@ -143,8 +138,7 @@ public:
 
 
 /// Replace override tags in the subtitle grid with a simplified placeholder.
-class grid_tags_simplify: public Command {
-public:
+struct grid_tags_simplify : public Command {
 	CMD_NAME("grid/tags/simplify")
 	STR_MENU("Simplify Tags")
 	STR_DISP("Simplify Tags")
diff --git a/aegisub/src/command/help.cpp b/aegisub/src/command/help.cpp
index f558b17bf..7a67c34de 100644
--- a/aegisub/src/command/help.cpp
+++ b/aegisub/src/command/help.cpp
@@ -57,8 +57,7 @@ namespace cmd {
 
 
 /// Visit Aegisub's bug tracker.
-class help_bugs: public Command {
-public:
+struct help_bugs : public Command {
 	CMD_NAME("help/bugs")
 	STR_MENU("&Bug Tracker..")
 	STR_DISP("Bug Tracker")
@@ -80,8 +79,7 @@ public:
 
 
 /// Help topics.
-class help_contents: public Command {
-public:
+struct help_contents : public Command {
 	CMD_NAME("help/contents")
 	STR_MENU("&Contents..")
 	STR_DISP("Contents")
@@ -94,8 +92,7 @@ public:
 
 
 /// Resource files.
-class help_files: public Command {
-public:
+struct help_files : public Command {
 	CMD_NAME("help/files")
 	STR_MENU("&All Files")
 	STR_DISP("All Files")
@@ -113,8 +110,7 @@ public:
 
 
 /// Visit Aegisub's forums.
-class help_forums: public Command {
-public:
+struct help_forums : public Command {
 	CMD_NAME("help/forums")
 	STR_MENU("&Forums..")
 	STR_DISP("Forums")
@@ -127,8 +123,7 @@ public:
 
 
 /// Visit Aegisub's official IRC channel.
-class help_irc: public Command {
-public:
+struct help_irc : public Command {
 	CMD_NAME("help/irc")
 	STR_MENU("&IRC Channel..")
 	STR_DISP("IRC Channel")
@@ -141,8 +136,7 @@ public:
 
 
 /// Visit Aegisub's official website.
-class help_website: public Command {
-public:
+struct help_website : public Command {
 	CMD_NAME("help/website")
 	STR_MENU("&Website..")
 	STR_DISP("Website")
diff --git a/aegisub/src/command/keyframe.cpp b/aegisub/src/command/keyframe.cpp
index 6c0c84374..4c52a4347 100644
--- a/aegisub/src/command/keyframe.cpp
+++ b/aegisub/src/command/keyframe.cpp
@@ -55,8 +55,7 @@ namespace cmd {
 
 
 /// Closes the currently open keyframes list.
-class keyframe_close: public Command {
-public:
+struct keyframe_close : public Command {
 	CMD_NAME("keyframe/close")
 	STR_MENU("Close Keyframes")
 	STR_DISP("Close Keyframes")
@@ -69,8 +68,7 @@ public:
 
 
 /// Opens a keyframe list file.
-class keyframe_open: public Command {
-public:
+struct keyframe_open : public Command {
 	CMD_NAME("keyframe/open")
 	STR_MENU("Open Keyframes..")
 	STR_DISP("Open Keyframes")
@@ -94,8 +92,7 @@ public:
 
 
 /// Saves the current keyframe list.
-class keyframe_save: public Command {
-public:
+struct keyframe_save : public Command {
 	CMD_NAME("keyframe/save")
 	STR_MENU("Save Keyframes..")
 	STR_DISP("Save Keyframes")
diff --git a/aegisub/src/command/menu_.cpp b/aegisub/src/command/menu_.cpp
index b7f25d3a8..19926aff8 100644
--- a/aegisub/src/command/menu_.cpp
+++ b/aegisub/src/command/menu_.cpp
@@ -49,8 +49,7 @@ namespace cmd {
 
 
 /// Audio manipulation.
-class main_audio: public Command {
-public:
+struct main_audio : public Command {
 	CMD_NAME("main/audio")
 	STR_MENU("Audio")
 	STR_DISP("Audio")
@@ -61,8 +60,7 @@ public:
 };
 
 /// Automation manipulation and scripts.
-class main_automation: public Command {
-public:
+struct main_automation : public Command {
 	CMD_NAME("main/automation")
 	STR_MENU("Automation")
 	STR_DISP("Automation")
@@ -76,8 +74,7 @@ public:
 
 
 /// Editing operations.
-class main_edit: public Command {
-public:
+struct main_edit : public Command {
 	CMD_NAME("main/edit")
 	STR_MENU("&Edit")
 	STR_DISP("Edit")
@@ -88,8 +85,7 @@ public:
 };
 
 /// Sort lines by column.
-class main_edit_sort_lines: public Command {
-public:
+struct main_edit_sort_lines : public Command {
 	CMD_NAME("main/edit/sort lines")
 	STR_MENU("Sort Lines")
 	STR_DISP("Sort Lines")
@@ -101,8 +97,7 @@ public:
 
 
 /// Operations on subtitles.
-class main_file: public Command {
-public:
+struct main_file : public Command {
 	CMD_NAME("main/file")
 	STR_MENU("&File")
 	STR_DISP("File")
@@ -114,8 +109,7 @@ public:
 
 
 /// Help options.
-class main_help: public Command {
-public:
+struct main_help : public Command {
 	CMD_NAME("main/help")
 	STR_MENU("Help")
 	STR_DISP("Help")
@@ -127,8 +121,7 @@ public:
 
 
 /// Subtitle manipulation.
-class main_main_subtitle: public Command {
-public:
+struct main_main_subtitle : public Command {
 	CMD_NAME("main/subtitle")
 	STR_MENU("&Subtitle")
 	STR_DISP("Subtitle")
@@ -139,8 +132,7 @@ public:
 };
 
 /// Insert lines into currently active subtitle file.
-class main_subtitle_insert_lines: public Command {
-public:
+struct main_subtitle_insert_lines : public Command {
 	CMD_NAME("main/subtitle/insert lines")
 	STR_MENU("&Insert Lines")
 	STR_DISP("Insert Lines")
@@ -152,8 +144,7 @@ public:
 
 
 /// Sort lines by column.
-class main_subtitle_sort_lines: public Command {
-public:
+struct main_subtitle_sort_lines : public Command {
 	CMD_NAME("main/subtitle/sort lines")
 	STR_MENU("Sort Lines")
 	STR_DISP("Sort Lines")
@@ -165,8 +156,7 @@ public:
 
 
 /// Merge 2 or more lines together.
-class main_subtitle_join_lines: public Command {
-public:
+struct main_subtitle_join_lines : public Command {
 	CMD_NAME("main/subtitle/join lines")
 	STR_MENU("Join Lines")
 	STR_DISP("Join Lines")
@@ -178,8 +168,7 @@ public:
 
 
 /// Time manipulation.
-class main_timing: public Command {
-public:
+struct main_timing : public Command {
 	CMD_NAME("main/timing")
 	STR_MENU("&Timing")
 	STR_DISP("Timing")
@@ -191,8 +180,7 @@ public:
 
 
 /// Make time continous.
-class main_timing_make_times_continous: public Command {
-public:
+struct main_timing_make_times_continous : public Command {
 	CMD_NAME("main/timing/make times continous")
 	STR_MENU("Make Times Continous")
 	STR_DISP("Make Times Continous")
@@ -204,8 +192,7 @@ public:
 
 
 /// Video operations.
-class main_video: public Command {
-public:
+struct main_video : public Command {
 	CMD_NAME("main/video")
 	STR_MENU("&Video")
 	STR_DISP("Video")
@@ -230,8 +217,7 @@ public Command { public:
 
 
 /// Set zoom level.
-class main_video_set_zoom: public Command {
-public:
+struct main_video_set_zoom : public Command {
 	CMD_NAME("main/video/set zoom")
 	STR_MENU("Set Zoom")
 	STR_DISP("Set Zoom")
@@ -243,8 +229,7 @@ public:
 
 
 /// View options.
-class main_view: public Command {
-public:
+struct main_view : public Command {
 	CMD_NAME("main/view")
 	STR_MENU("View")
 	STR_DISP("View")
diff --git a/aegisub/src/command/recent.cpp b/aegisub/src/command/recent.cpp
index 1cf89ec56..efd5ce061 100644
--- a/aegisub/src/command/recent.cpp
+++ b/aegisub/src/command/recent.cpp
@@ -54,8 +54,7 @@ namespace cmd {
 
 
 /// Open recent audio.
-class recent_audio: public Command {
-public:
+struct recent_audio : public Command {
 	CMD_NAME("recent/audio")
 	STR_MENU("Recent")
 	STR_DISP("Recent")
@@ -68,8 +67,7 @@ public:
 
 
 /// Recent keyframes.
-class recent_keyframe: public Command {
-public:
+struct recent_keyframe : public Command {
 	CMD_NAME("recent/keyframe")
 	STR_MENU("Recent")
 	STR_DISP("Recent")
@@ -82,8 +80,7 @@ public:
 
 
 /// Recently opened subtitles.
-class recent_subtitle: public Command {
-public:
+struct recent_subtitle : public Command {
 	CMD_NAME("recent/subtitle")
 	STR_MENU("Recent")
 	STR_DISP("Recent")
@@ -97,8 +94,7 @@ public:
 
 
 /// Recent timecodes.
-class recent_timecode: public Command {
-public:
+struct recent_timecode : public Command {
 	CMD_NAME("recent/timecode")
 	STR_MENU("Recent")
 	STR_DISP("Recent")
@@ -112,8 +108,7 @@ public:
 
 
 /// Recently opened videos.
-class recent_video: public Command {
-public:
+struct recent_video : public Command {
 	CMD_NAME("recent/video")
 	STR_MENU("Recent")
 	STR_DISP("Recent")
diff --git a/aegisub/src/command/subtitle.cpp b/aegisub/src/command/subtitle.cpp
index b966139e3..e98ae362e 100644
--- a/aegisub/src/command/subtitle.cpp
+++ b/aegisub/src/command/subtitle.cpp
@@ -68,8 +68,7 @@ namespace cmd {
 
 
 /// Open the attachment list.
-class subtitle_attachment: public Command {
-public:
+struct subtitle_attachment : public Command {
 	CMD_NAME("subtitle/attachment")
 	STR_MENU("&Attachments..")
 	STR_DISP("Attachments")
@@ -83,8 +82,7 @@ public:
 
 
 /// Find words in subtitles.
-class subtitle_find: public Command {
-public:
+struct subtitle_find : public Command {
 	CMD_NAME("subtitle/find")
 	STR_MENU("&Find..")
 	STR_DISP("Find")
@@ -98,8 +96,7 @@ public:
 
 
 /// Find next match of last word.
-class subtitle_find_next: public Command {
-public:
+struct subtitle_find_next : public Command {
 	CMD_NAME("subtitle/find/next")
 	STR_MENU("Find Next")
 	STR_DISP("Find Next")
@@ -130,8 +127,7 @@ static void insert_subtitle_at_video(agi::Context *c, bool after) {
 }
 
 /// Inserts a line after current.
-class subtitle_insert_after: public Command {
-public:
+struct subtitle_insert_after : public Command {
 	CMD_NAME("subtitle/insert/after")
 	STR_MENU("&After Current")
 	STR_DISP("After Current")
@@ -165,8 +161,7 @@ public:
 };
 
 /// Inserts a line after current, starting at video time.
-class subtitle_insert_after_videotime: public Command {
-public:
+struct subtitle_insert_after_videotime : public Command {
 	CMD_NAME("subtitle/insert/after/videotime")
 	STR_MENU("After Current, at Video Time")
 	STR_DISP("After Current, at Video Time")
@@ -179,8 +174,7 @@ public:
 
 
 /// Inserts a line before current.
-class subtitle_insert_before: public Command {
-public:
+struct subtitle_insert_before : public Command {
 	CMD_NAME("subtitle/insert/before")
 	STR_MENU("&Before Current")
 	STR_DISP("Before Current")
@@ -217,8 +211,7 @@ public:
 
 
 /// Inserts a line before current, starting at video time.
-class subtitle_insert_before_videotime: public Command {
-public:
+struct subtitle_insert_before_videotime : public Command {
 	CMD_NAME("subtitle/insert/before/videotime")
 	STR_MENU("Before Current, at Video Time")
 	STR_DISP("Before Current, at Video Time")
@@ -231,8 +224,7 @@ public:
 
 
 /// New subtitles.
-class subtitle_new: public Command {
-public:
+struct subtitle_new : public Command {
 	CMD_NAME("subtitle/new")
 	STR_MENU("&New Subtitles")
 	STR_DISP("New Subtitles")
@@ -245,8 +237,7 @@ public:
 
 
 /// Opens a subtitles file.
-class subtitle_open: public Command {
-public:
+struct subtitle_open : public Command {
 	CMD_NAME("subtitle/open")
 	STR_MENU("&Open Subtitles..")
 	STR_DISP("Open Subtitles")
@@ -265,8 +256,7 @@ public:
 
 
 /// Opens a subtitles file with a specific charset.
-class subtitle_open_charset: public Command {
-public:
+struct subtitle_open_charset : public Command {
 	CMD_NAME("subtitle/open/charset")
 	STR_MENU("&Open Subtitles with Charset..")
 	STR_DISP("Open Subtitles with Charset")
@@ -290,8 +280,7 @@ public:
 
 
 /// Opens the subtitles from the current video file.
-class subtitle_open_video: public Command {
-public:
+struct subtitle_open_video : public Command {
 	CMD_NAME("subtitle/open/video")
 	STR_MENU("Open Subtitles from &Video")
 	STR_DISP("Open Subtitles from Video")
@@ -304,8 +293,7 @@ public:
 
 
 /// Open script properties window.
-class subtitle_properties: public Command {
-public:
+struct subtitle_properties : public Command {
 	CMD_NAME("subtitle/properties")
 	STR_MENU("&Properties..")
 	STR_DISP("Properties")
@@ -320,8 +308,7 @@ public:
 
 
 /// Saves subtitles.
-class subtitle_save: public Command {
-public:
+struct subtitle_save : public Command {
 	CMD_NAME("subtitle/save")
 	STR_MENU("&Save Subtitles")
 	STR_DISP("Save Subtitles")
@@ -334,8 +321,7 @@ public:
 
 
 /// Saves subtitles with another name.
-class subtitle_save_as: public Command {
-public:
+struct subtitle_save_as : public Command {
 	CMD_NAME("subtitle/save/as")
 	STR_MENU("Save Subtitles as..")
 	STR_DISP("Save Subtitles as")
@@ -348,8 +334,7 @@ public:
 
 
 /// Selects all lines that are currently visible on video frame.
-class subtitle_select_visiblek: public Command {
-public:
+struct subtitle_select_visiblek : public Command {
 	CMD_NAME("subtitle/select/visible")
 	STR_MENU("Select Visible")
 	STR_DISP("Select Visible")
@@ -363,8 +348,7 @@ public:
 
 
 /// Open spell checker.
-class subtitle_spellcheck: public Command {
-public:
+struct subtitle_spellcheck : public Command {
 	CMD_NAME("subtitle/spellcheck")
 	STR_MENU("Spe&ll Checker..")
 	STR_DISP("Spell Checker")
@@ -379,8 +363,7 @@ public:
 
 
 /// 
-class subtitle_tags_show: public Command {
-public:
+struct subtitle_tags_show : public Command {
 	CMD_NAME("subtitle/tags/show")
 	STR_MENU("XXX: No idea")
 	STR_DISP("XXX: No idea")
diff --git a/aegisub/src/command/time.cpp b/aegisub/src/command/time.cpp
index 8d47cb3c4..f3dd05557 100644
--- a/aegisub/src/command/time.cpp
+++ b/aegisub/src/command/time.cpp
@@ -57,8 +57,7 @@ namespace cmd {
 
 
 /// Changes times of subs so end times begin on next's start time.
-class time_continous_end: public Command {
-public:
+struct time_continous_end : public Command {
 	CMD_NAME("time/continous/end")
 	STR_MENU("Change &End")
 	STR_DISP("Change End")
@@ -72,8 +71,7 @@ public:
 
 
 /// Changes times of subs so start times begin on previous's end time.
-class time_continous_start: public Command {
-public:
+struct time_continous_start : public Command {
 	CMD_NAME("time/continous/start")
 	STR_MENU("Change &Start")
 	STR_DISP("Change Start")
@@ -88,8 +86,7 @@ public:
 
 
 /// Shift selection so first selected line starts at current frame.
-class time_frame_current: public Command {
-public:
+struct time_frame_current : public Command {
 	CMD_NAME("time/frame/current")
 	STR_MENU("Shift to Current Frame")
 	STR_DISP("Shift to Current Frame")
@@ -123,8 +120,7 @@ public:
 
 
 /// Shift subtitles by time or frames.
-class time_shift: public Command {
-public:
+struct time_shift : public Command {
 	CMD_NAME("time/shift")
 	STR_MENU("S&hift Times..")
 	STR_DISP("Shift Times")
@@ -139,8 +135,7 @@ public:
 
 
 /// Set end of selected subtitles to current video frame.
-class time_snap_end_video: public Command {
-public:
+struct time_snap_end_video : public Command {
 	CMD_NAME("time/snap/end_video")
 	STR_MENU("Snap End to Video")
 	STR_DISP("Snap End to Video")
@@ -153,8 +148,7 @@ public:
 
 
 /// Shift selected subtitles so first selected starts at this frame.
-class time_snap_frame: public Command {
-public:
+struct time_snap_frame : public Command {
 	CMD_NAME("time/snap/frame")
 	STR_MENU("Shift Subtitles to Frame")
 	STR_DISP("Shift Subtitles to Frame")
@@ -183,8 +177,7 @@ public:
 
 
 /// Set start and end of subtitles to the keyframes around current video frame.
-class time_snap_scene: public Command {
-public:
+struct time_snap_scene : public Command {
 	CMD_NAME("time/snap/scene")
 	STR_MENU("Snap to Scene")
 	STR_DISP("Snap to Scene")
@@ -239,8 +232,7 @@ public:
 
 
 /// Set start of selected subtitles to current video frame.
-class time_snap_start_video: public Command {
-public:
+struct time_snap_start_video : public Command {
 	CMD_NAME("time/snap/start_video")
 	STR_MENU("Snap Start to Video")
 	STR_DISP("Snap Start to Video")
@@ -253,8 +245,7 @@ public:
 
 
 /// Sort all subtitles by their end times.
-class time_sort_end: public Command {
-public:
+struct time_sort_end : public Command {
 	CMD_NAME("time/sort/end")
 	STR_MENU("&End Time")
 	STR_DISP("End Time")
@@ -268,8 +259,7 @@ public:
 
 
 /// Sort all subtitles by their start times.
-class time_sort_start: public Command {
-public:
+struct time_sort_start : public Command {
 	CMD_NAME("time/sort/start")
 	STR_MENU("&Start Time")
 	STR_DISP("Start Time")
@@ -283,8 +273,7 @@ public:
 
 
 /// Sort all subtitles by their style names.
-class time_sort_style: public Command {
-public:
+struct time_sort_style : public Command {
 	CMD_NAME("time/sort/style")
 	STR_MENU("St&yle Name")
 	STR_DISP("Style Name")
diff --git a/aegisub/src/command/timecode.cpp b/aegisub/src/command/timecode.cpp
index c718e37ff..b4e8e7f86 100644
--- a/aegisub/src/command/timecode.cpp
+++ b/aegisub/src/command/timecode.cpp
@@ -56,8 +56,7 @@ namespace cmd {
 
 
 /// Closes the currently open timecodes file.
-class timecode_close: public Command {
-public:
+struct timecode_close : public Command {
 	CMD_NAME("timecode/close")
 	STR_MENU("Close Timecodes File")
 	STR_DISP("Close Timecodes File")
@@ -70,8 +69,7 @@ public:
 
 
 /// Opens a VFR timecodes v1 or v2 file.
-class timecode_open: public Command {
-public:
+struct timecode_open : public Command {
 	CMD_NAME("timecode/open")
 	STR_MENU("Open Timecodes File..")
 	STR_DISP("Open Timecodes File")
@@ -90,8 +88,7 @@ public:
 
 
 /// Saves a VFR timecodes v2 file.
-class timecode_save: public Command {
-public:
+struct timecode_save : public Command {
 	CMD_NAME("timecode/save")
 	STR_MENU("Save Timecodes File..")
 	STR_DISP("Save Timecodes File")
diff --git a/aegisub/src/command/tool.cpp b/aegisub/src/command/tool.cpp
index a73719cca..70e8ba6ab 100644
--- a/aegisub/src/command/tool.cpp
+++ b/aegisub/src/command/tool.cpp
@@ -64,8 +64,7 @@ namespace cmd {
 
 
 /// Launch ASSDraw3 tool for vector drawing.
-class tool_assdraw: public Command {
-public:
+struct tool_assdraw : public Command {
 	CMD_NAME("tool/assdraw")
 	STR_MENU("ASSDraw3...")
 	STR_DISP("ASSDraw3")
@@ -77,8 +76,7 @@ public:
 };
 
 /// Saves a copy of subtitles with processing applied to it.
-class tool_export: public Command {
-public:
+struct tool_export : public Command {
 	CMD_NAME("tool/export")
 	STR_MENU("Export Subtitles..")
 	STR_DISP("Export Subtitles")
@@ -92,8 +90,7 @@ public:
 
 
 /// Open fonts collector.
-class tool_font_collector: public Command {
-public:
+struct tool_font_collector : public Command {
 	CMD_NAME("tool/font_collector")
 	STR_MENU("&Fonts Collector..")
 	STR_DISP("Fonts Collector")
@@ -107,8 +104,7 @@ public:
 
 
 /// Selects lines based on defined criterea.
-class tool_line_select: public Command {
-public:
+struct tool_line_select : public Command {
 	CMD_NAME("tool/line/select")
 	STR_MENU("Select Lines..")
 	STR_DISP("Select Lines")
@@ -122,8 +118,7 @@ public:
 
 
 /// Changes resolution and modifies subtitles to conform to change.
-class tool_resampleres: public Command {
-public:
+struct tool_resampleres : public Command {
 	CMD_NAME("tool/resampleres")
 	STR_MENU("Resample Resolution..")
 	STR_DISP("Resample Resolution")
@@ -137,8 +132,7 @@ public:
 
 
 /// Open styling assistant.
-class tool_style_assistant: public Command {
-public:
+struct tool_style_assistant : public Command {
 	CMD_NAME("tool/style/assistant")
 	STR_MENU("St&yling Assistant..")
 	STR_DISP("Styling Assistant")
@@ -153,8 +147,7 @@ public:
 
 
 /// Open styles manager.
-class tool_style_manager: public Command {
-public:
+struct tool_style_manager : public Command {
 	CMD_NAME("tool/style/manager")
 	STR_MENU("&Styles Manager..")
 	STR_DISP("Styles Manager")
@@ -168,8 +161,7 @@ public:
 
 
 /// Open Kanji timer.
-class tool_time_kanji: public Command {
-public:
+struct tool_time_kanji : public Command {
 	CMD_NAME("tool/time/kanji")
 	STR_MENU("Kanji Timer..")
 	STR_DISP("Kanji Timer")
@@ -182,8 +174,7 @@ public:
 
 
 /// Launch timing post-processor.
-class tool_time_postprocess: public Command {
-public:
+struct tool_time_postprocess : public Command {
 	CMD_NAME("tool/time/postprocess")
 	STR_MENU("Timing Post-Processor..")
 	STR_DISP("Timing Post-Processor")
@@ -196,8 +187,7 @@ public:
 
 
 /// Open translation assistant.
-class tool_translation_assistant: public Command {
-public:
+struct tool_translation_assistant : public Command {
 	CMD_NAME("tool/translation_assistant")
 	STR_MENU("&Translation Assistant..")
 	STR_DISP("Translation Assistant")
diff --git a/aegisub/src/command/video.cpp b/aegisub/src/command/video.cpp
index aa13a54e0..08cdf1cd7 100644
--- a/aegisub/src/command/video.cpp
+++ b/aegisub/src/command/video.cpp
@@ -64,8 +64,7 @@ namespace cmd {
 
 
 /// Forces video to 2.35 aspect ratio.
-class video_aspect_cinematic: public Command {
-public:
+struct video_aspect_cinematic : public Command {
 	CMD_NAME("video/aspect/cinematic")
 	STR_MENU("&Cinematic (2.35)")
 	STR_DISP("Cinematic (235)")
@@ -80,8 +79,7 @@ public:
 
 
 /// Forces video to a custom aspect ratio.
-class video_aspect_custom: public Command {
-public:
+struct video_aspect_custom : public Command {
 	CMD_NAME("video/aspect/custom")
 	STR_MENU("Custom..")
 	STR_DISP("Custom")
@@ -138,8 +136,7 @@ public:
 
 
 /// Leave video on original aspect ratio.
-class video_aspect_default: public Command {
-public:
+struct video_aspect_default : public Command {
 	CMD_NAME("video/aspect/default")
 	STR_MENU("&Default")
 	STR_DISP("Default")
@@ -155,8 +152,7 @@ public:
 
 
 /// Forces video to 4:3 aspect ratio.
-class video_aspect_full: public Command {
-public:
+struct video_aspect_full : public Command {
 	CMD_NAME("video/aspect/full")
 	STR_MENU("&Fullscreen (4:3)")
 	STR_DISP("Fullscreen (4:3)")
@@ -171,8 +167,7 @@ public:
 
 
 /// Forces video to 16:9 aspect ratio.
-class video_aspect_wide: public Command {
-public:
+struct video_aspect_wide : public Command {
 	CMD_NAME("video/aspect/wide")
 	STR_MENU("&Widescreen (16:9)")
 	STR_DISP("Widescreen (16:9)")
@@ -187,8 +182,7 @@ public:
 
 
 /// Closes the currently open video file.
-class video_close: public Command {
-public:
+struct video_close : public Command {
 	CMD_NAME("video/close")
 	STR_MENU("&Close Video")
 	STR_DISP("Close Video")
@@ -202,8 +196,7 @@ public:
 
 
 /// Detach video, displaying it in a separate Window.
-class video_detach: public Command {
-public:
+struct video_detach : public Command {
 	CMD_NAME("video/detach")
 	STR_MENU("Detach Video")
 	STR_DISP("Detach Video")
@@ -216,8 +209,7 @@ public:
 
 
 /// Shows video details.
-class video_details: public Command {
-public:
+struct video_details : public Command {
 	CMD_NAME("video/details")
 	STR_MENU("Show Video Details..")
 	STR_DISP("Show Video Details")
@@ -231,8 +223,7 @@ public:
 
 
 /// 
-class video_focus_seek: public Command {
-public:
+struct video_focus_seek : public Command {
 	CMD_NAME("video/focus_seek")
 	STR_MENU("XXX: no idea")
 	STR_DISP("XXX: no idea")
@@ -252,8 +243,7 @@ public:
 
 
 /// Seek to the next frame.
-class video_frame_next: public Command {
-public:
+struct video_frame_next : public Command {
 	CMD_NAME("video/frame/next")
 	STR_MENU("Next Frame")
 	STR_DISP("Next Frame")
@@ -266,8 +256,7 @@ public:
 
 
 /// Play video.
-class video_frame_play: public Command {
-public:
+struct video_frame_play : public Command {
 	CMD_NAME("video/frame/play")
 	STR_MENU("Play")
 	STR_DISP("Play")
@@ -280,8 +269,7 @@ public:
 
 
 /// Seek to the previous frame.
-class video_frame_prev: public Command {
-public:
+struct video_frame_prev : public Command {
 	CMD_NAME("video/frame/prev")
 	STR_MENU("Previous Frame")
 	STR_DISP("Previous Frame")
@@ -294,8 +282,7 @@ public:
 
 
 /// Jump to frame or time.
-class video_jump: public Command {
-public:
+struct video_jump : public Command {
 	CMD_NAME("video/jump")
 	STR_MENU("&Jump to..")
 	STR_DISP("Jump to")
@@ -312,8 +299,7 @@ public:
 
 
 /// Jumps the video to the end frame of current subtitle.
-class video_jump_end: public Command {
-public:
+struct video_jump_end : public Command {
 	CMD_NAME("video/jump/end")
 	STR_MENU("Jump Video to End")
 	STR_DISP("Jump Video to End")
@@ -326,8 +312,7 @@ public:
 
 
 /// Jumps the video to the start frame of current subtitle.
-class video_jump_start: public Command {
-public:
+struct video_jump_start : public Command {
 	CMD_NAME("video/jump/start")
 	STR_MENU("Jump Video to Start")
 	STR_DISP("Jump Video to Start")
@@ -340,8 +325,7 @@ public:
 
 
 /// Opens a video file.
-class video_open: public Command {
-public:
+struct video_open : public Command {
 	CMD_NAME("video/open")
 	STR_MENU("&Open Video..")
 	STR_DISP("Open Video")
@@ -361,8 +345,7 @@ public:
 
 
 /// Opens a video clip with solid colour.
-class video_open_dummy: public Command {
-public:
+struct video_open_dummy : public Command {
 	CMD_NAME("video/open/dummy")
 	STR_MENU("Use Dummy Video..")
 	STR_DISP("Use Dummy Video")
@@ -378,8 +361,7 @@ public:
 
 
 /// Show a mask over the video.
-class video_show_overscan: public Command {
-public:
+struct video_show_overscan : public Command {
 	CMD_NAME("video/show_overscan")
 	STR_MENU("Show Overscan Mask")
 	STR_DISP("Show Overscan Mask")
@@ -441,8 +423,7 @@ public:
 
 
 /// Zoom video in.
-class video_zoom_in: public Command {
-public:
+struct video_zoom_in : public Command {
 	CMD_NAME("video/zoom/in")
 	STR_MENU("Zoom In")
 	STR_DISP("Zoom In")
@@ -455,8 +436,7 @@ public:
 
 
 /// Zoom video out.
-class video_zoom_out: public Command {
-public:
+struct video_zoom_out : public Command {
 	CMD_NAME("video/zoom/out")
 	STR_MENU("Zoom Out")
 	STR_DISP("Zoom Out")