diff --git a/src/addresses.h b/src/addresses.h
index 18f012969f..cf565bfb0a 100644
--- a/src/addresses.h
+++ b/src/addresses.h
@@ -119,6 +119,9 @@
 
 #define RCT2_ADDRESS_WINDOW_DPI						0x009DEA74
 
+#define RCT2_ADDRESS_NUM_DSOUND_DEVICES				0x009E2B88
+#define RCT2_ADDRESS_DSOUND_DEVICES					0x009E2B8C
+
 #define RCT2_ADDRESS_CMDLINE						0x009E2D98
 
 #define RCT2_ADDRESS_LAND_RAISE_COST				0x009E2E1C
diff --git a/src/strings.h b/src/strings.h
index c6d547bdb9..7a92046a84 100644
--- a/src/strings.h
+++ b/src/strings.h
@@ -217,6 +217,8 @@ enum {
 	STR_PLACE_SCENERY_TIP = 1159,
 	STR_ADJUST_WATER_TIP = 1160,
 
+	STR_OPTIONS = 1168,
+
 	STR_BUILD_FOOTPATH_TIP = 1173,
 	STR_CANT_BUILD_FOOTPATH_HERE = 1176,
 	STR_CANT_REMOVE_FOOTPATH_FROM_HERE = 1177,
@@ -362,9 +364,14 @@ enum {
 	STR_DISTANCE_AND_SPEED = 2329,
 	STR_TEMPERATURE = 2330,
 	STR_HEIGHT_LABELS = 2331,
+	STR_UNITS = 2332,
+	STR_SOUND = 2333,
+	STR_DISPLAY = 2346,
 	STR_DISPLAY_RESOLUTION = 2360,
-	STR_TILE_EDGE_SMOOTHING_TIP = 2362,
-	STR_TURN_GRIDLINES_ON_TIP = 2364,
+	STR_TILE_SMOOTHING = 2361,
+	STR_TILE_SMOOTHING_TIP = 2362,
+	STR_GRIDLINES = 2363,
+	STR_GRIDLINES_TIP = 2364,
 
 	//STR_NONE = 2368,
 	STR_LOW = 2369,
@@ -415,7 +422,11 @@ enum {
 
 	STR_PROFIT_PER_WEEK_AND_PARK_VALUE_TIP = 2482,
 
-	STR_REAL_NAME_TOGGLE_TIP = 2488,
+	STR_CONTROLS = 2485,
+	STR_GENERAL = 2486,
+	STR_REAL_NAME = 2487,
+	STR_REAL_NAME_TIP = 2488,
+	STR_HOTKEY = 2489,
 
 	STR_ENTER_NAME_INTO_SCENARIO_CHART = 2790,
 
@@ -423,8 +434,9 @@ enum {
 	STR_SORT = 2795,
 	STR_RIDE_LIST_SORT_TIP = 2796,
 
-	STR_SCREEN_EDGE_SCROLL_TIP = 2798,
-	STR_CHANGE_HOTKEY_TIP = 2799,
+	STR_SCREEN_EDGE_SCROLLING = 2797,
+	STR_SCREEN_EDGE_SCROLLING_TIP = 2798,
+	STR_HOTKEY_TIP = 2799,
 
 	STR_TOTAL_ADMISSIONS = 2800,
 	STR_INCOME_FROM_ADMISSIONS = 2801,
@@ -512,6 +524,7 @@ enum {
 
 	STR_OBJECTIVE = 3322,
 
+	STR_SAVE_PLUGIN_DATA = 3333,
 	STR_SAVE_PLUGIN_DATA_TIP = 3334,
 
 	STR_GAME_TOOLS = 3341,
@@ -520,6 +533,7 @@ enum {
 	STR_ROLLER_COASTER_DESIGNER = 3344,
 	STR_TRACK_DESIGNS_MANAGER = 3345,
 
+	STR_SOUND_FORCED_SOFTWARE_BUFFER_MIXING = 3362,
 	STR_SOUND_FORCED_SOFTWARE_BUFFER_MIXING_TIP = 3363,
 
 	STR_TUTORIAL_BEGINNERS = 3385,
diff --git a/src/widget.c b/src/widget.c
index c2d386e705..3aa909e355 100644
--- a/src/widget.c
+++ b/src/widget.c
@@ -155,9 +155,8 @@ void widget_draw(rct_drawpixelinfo *dpi, rct_window *w, int widgetIndex)
 		widget_scroll_draw(dpi, w, widgetIndex);
 		break;
 	case WWT_CHECKBOX:
-		widget_checkbox_draw(dpi, w, widgetIndex);
-		break;
 	case WWT_24:
+		widget_checkbox_draw(dpi, w, widgetIndex);
 		break;
 	case WWT_25:
 		break;
@@ -736,12 +735,14 @@ static void widget_checkbox_draw(rct_drawpixelinfo *dpi, rct_window *w, int widg
 	colour = w->colours[widget->colour];
 
 	// checkbox
-	gfx_fill_rect_inset(dpi, l, t, l + 9, b - 1, colour, 0x60);
+	if (widget->type != WWT_24) {
+		gfx_fill_rect_inset(dpi, l, t, l + 9, b - 1, colour, 0x60);
 
-	// fill it when checkbox is pressed
-	if (widget_is_pressed(w, widgetIndex)) {
-		RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_FONT_SPRITE_BASE, uint16) = 224;
-		gfx_draw_string(dpi, (char*)0x009DED72, colour & 0x7F, l, t);
+		// fill it when checkbox is pressed
+		if (widget_is_pressed(w, widgetIndex)) {
+			RCT2_GLOBAL(RCT2_ADDRESS_CURRENT_FONT_SPRITE_BASE, uint16) = 224;
+			gfx_draw_string(dpi, (char*)0x009DED72, colour & 0x7F, l, t);
+		}
 	}
 
 	// draw the text
diff --git a/src/window_game_top_toolbar.c b/src/window_game_top_toolbar.c
index f4c8b26890..d64bb1b862 100644
--- a/src/window_game_top_toolbar.c
+++ b/src/window_game_top_toolbar.c
@@ -377,8 +377,8 @@ static void window_game_top_toolbar_dropdown()
 			window_about_open();
 			break;
 		case 4:		// options
-			//window_options_open();
-			RCT2_CALLPROC_EBPSAFE(0x006BAC5B);
+			window_options_open();
+			//RCT2_CALLPROC_EBPSAFE(0x006BAC5B);
 			break;
 		case 5:		// screenshot
 			RCT2_GLOBAL(RCT2_ADDRESS_SCREENSHOT_COUNTDOWN, sint8) = 10;
diff --git a/src/window_options.c b/src/window_options.c
index 6899affa08..a9f81e2eeb 100644
--- a/src/window_options.c
+++ b/src/window_options.c
@@ -22,56 +22,78 @@
 #include "strings.h"
 #include "widget.h"
 #include "window.h"
+#include "window_dropdown.h"
 
 static enum WINDOW_OPTIONS_WIDGET_IDX {
 	WIDX_BACKGROUND,
 	WIDX_TITLE,
 	WIDX_CLOSE,
-	WIDX_SOUND_DROPDOWN = 5,
-	WIDX_MUSIC = 6,
-	WIDX_SOUND_QUALITY = 8,
-	WIDX_CURRENCY = 12,
-	WIDX_DISTANCE = 14,
-	WIDX_TEMPERATURE = 16,
-	WIDX_HEIGHT_LABELS = 18,
-	WIDX_RESOLUTION = 21,
-	WIDX_CONSTRUCTION_MARKER = 25
+	WIDX_SOUND_GROUP,
+	WIDX_SOUND,
+	WIDX_SOUND_DROPDOWN,
+	WIDX_MUSIC,
+	WIDX_MUSIC_DROPDOWN,
+	WIDX_SOUND_QUALITY,
+	WIDX_SOUND_QUALITY_DROPDOWN,
+	WIDX_SOUND_SW_BUFFER_CHECKBOX,
+	WIDX_UNITS_GROUP,
+	WIDX_CURRENCY,
+	WIDX_CURRENCY_DROPDOWN,
+	WIDX_DISTANCE,
+	WIDX_DISTANCE_DROPDOWN,
+	WIDX_TEMPERATURE,
+	WIDX_TEMPERATURE_DROPDOWN,
+	WIDX_HEIGHT_LABELS,
+	WIDX_HEIGHT_LABELS_DROPDOWN,
+	WIDX_DISPLAY_GROUP,
+	WIDX_RESOLUTION,
+	WIDX_RESOLUTION_DROPDOWN,
+	WIDX_TILE_SMOOTHING_CHECKBOX,
+	WIDX_GRIDLINES_CHECKBOX,
+	WIDX_CONSTRUCTION_MARKER,
+	WIDX_CONSTRUCTION_MARKER_DROPDOWN,
+	WIDX_CONTROLS_GROUP,
+	WIDX_SCREEN_EDGE_SCROLLING,
+	WIDX_HOTKEY_DROPDOWN,
+	WIDX_GENERAL_GROUP,
+	WIDX_REAL_NAME_CHECKBOX,
+	WIDX_SAVE_PLUGIN_DATA_CHECKBOX
 };
 
 static rct_widget window_options_widgets[] = {
-	{ WWT_FRAME,			0,	0,		309,	0,		371,	0x0FFFFFFFF,	STR_NONE },
-	{ WWT_CAPTION,			0,	1,		308,	1,		14,		0x490,			STR_WINDOW_TITLE_TIP },
-	{ WWT_CLOSEBOX,			0,	297,	307,	2,		13,		0x338,			STR_CLOSE_WINDOW_TIP },
-	{ WWT_GROUPBOX,			0,	3,		306,	17,		93,		0x91D,			STR_NONE },
-	{ WWT_DROPDOWN,			0,	10,		299,	31,		42,		0x361,			STR_NONE },
+	{ WWT_FRAME,			0,	0,		309,	0,		371,	STR_NONE,		STR_NONE },
+	{ WWT_CAPTION,			0,	1,		308,	1,		14,		STR_OPTIONS,	STR_WINDOW_TITLE_TIP },
+	{ WWT_CLOSEBOX,			0,	297,	307,	2,		13,		STR_CLOSE_X,	STR_CLOSE_WINDOW_TIP },
+	{ WWT_GROUPBOX,			0,	3,		306,	17,		93,		STR_SOUND,		STR_NONE },
+	{ WWT_DROPDOWN,			0,	10,		299,	31,		42,		0x361,			STR_NONE },	// sound
 	{ WWT_DROPDOWN_BUTTON,	0,	288,	298,	32,		41,		0x36C,			STR_NONE },
-	{ WWT_DROPDOWN,			0,	155,	299,	46,		57,		0x365,			STR_NONE },
+	{ WWT_DROPDOWN,			0,	155,	299,	46,		57,		0x365,			STR_NONE },	// music
 	{ WWT_DROPDOWN_BUTTON,	0,	288,	298,	47,		56,		0x36C,			STR_NONE },
-	{ WWT_DROPDOWN,			0,	155,	299,	61,		72,		0x366,			STR_NONE },
+	{ WWT_DROPDOWN,			0,	155,	299,	61,		72,		0x366,			STR_NONE },	// sound quality
 	{ WWT_DROPDOWN_BUTTON,	0,	288,	298,	62,		71,		0x36C,			STR_NONE },
-	{ WWT_CHECKBOX,			0,	10,		299,	76,		87,		0x0D22,			STR_SOUND_FORCED_SOFTWARE_BUFFER_MIXING_TIP },
-	{ WWT_GROUPBOX,			0,	3,		306,	100,	176,	0x91C,			STR_NONE },
-	{ WWT_DROPDOWN,			0,	155,	299,	114,	125,	0x367,			STR_NONE },
+	{ WWT_CHECKBOX,			0,	10,		299,	76,		87,		STR_SOUND_FORCED_SOFTWARE_BUFFER_MIXING, STR_SOUND_FORCED_SOFTWARE_BUFFER_MIXING_TIP },
+	{ WWT_GROUPBOX,			0,	3,		306,	100,	176,	STR_UNITS,		STR_NONE },
+	{ WWT_DROPDOWN,			0,	155,	299,	114,	125,	0x367,			STR_NONE },	// currency
 	{ WWT_DROPDOWN_BUTTON,	0,	288,	298,	115,	124,	0x36C,			STR_NONE },
-	{ WWT_DROPDOWN,			0,	155,	299,	129,	140,	0x368,			STR_NONE },
+	{ WWT_DROPDOWN,			0,	155,	299,	129,	140,	0x368,			STR_NONE },	// distance
 	{ WWT_DROPDOWN_BUTTON,	0,	288,	298,	130,	139,	0x36C,			STR_NONE },
-	{ WWT_DROPDOWN,			0,	155,	299,	144,	155,	0x36B,			STR_NONE },
+	{ WWT_DROPDOWN,			0,	155,	299,	144,	155,	0x36B,			STR_NONE },	// temperature
 	{ WWT_DROPDOWN_BUTTON,	0,	288,	298,	145,	154,	0x36C,			STR_NONE },
-	{ WWT_DROPDOWN,			0,	155,	299,	159,	170,	0x364,			STR_NONE },
+	{ WWT_DROPDOWN,			0,	155,	299,	159,	170,	0x364,			STR_NONE },	// height labels
 	{ WWT_DROPDOWN_BUTTON,	0,	288,	298,	160,	169,	0x36C,			STR_NONE },
-	{ WWT_GROUPBOX,			0,	3,		306,	182,	258,	0x92A,			STR_NONE },
-	{ WWT_DROPDOWN,			0,	155,	299,	196,	207,	0x348,			STR_NONE },
+	{ WWT_GROUPBOX,			0,	3,		306,	182,	258,	STR_DISPLAY,	STR_NONE },
+	{ WWT_DROPDOWN,			0,	155,	299,	196,	207,	0x348,			STR_NONE },	// resolution
 	{ WWT_DROPDOWN_BUTTON,	0,	288,	298,	197,	206,	0x36C,			STR_NONE },
-	{ WWT_CHECKBOX,			0,	10,		299,	212,	223,	0x939,			STR_TILE_EDGE_SMOOTHING_TIP },
-	{ WWT_CHECKBOX,			0,	10,		299,	227,	238,	0x93B,			STR_TURN_GRIDLINES_ON_TIP },
-	{ WWT_DROPDOWN,			0,	155,	299,	241,	252,	0x0FFFFFFFF,	STR_NONE },
+	{ WWT_CHECKBOX,			0,	10,		299,	212,	223,	STR_TILE_SMOOTHING, STR_TILE_SMOOTHING_TIP },
+	{ WWT_CHECKBOX,			0,	10,		299,	227,	238,	STR_GRIDLINES,	STR_GRIDLINES_TIP },
+	{ WWT_DROPDOWN,			0,	155,	299,	241,	252,	STR_NONE,		STR_NONE },	// construction marker
 	{ WWT_DROPDOWN_BUTTON,	0,	288,	298,	242,	251,	0x36C,			STR_NONE },
-	{ WWT_GROUPBOX,			0,	3,		306,	264,	310,	0x9B5,			STR_NONE },
-	{ WWT_CHECKBOX,			2,	10,		299,	279,	290,	0x0AED,			STR_SCREEN_EDGE_SCROLL_TIP },
-	{ WWT_DROPDOWN_BUTTON,	0,	26,		185,	293,	304,	0x9B9,			STR_CHANGE_HOTKEY_TIP },
-	{ WWT_GROUPBOX,			0,	3,		306,	317,	365,	0x9B6,			STR_NONE },
-	{ WWT_CHECKBOX,			2,	10,		299,	331,	342,	0x9B7,			STR_REAL_NAME_TOGGLE_TIP },
-	{ WWT_CHECKBOX,			2,	10,		299,	346,	357,	0x0D05,			STR_SAVE_PLUGIN_DATA_TIP },
+	{ WWT_GROUPBOX,			0,	3,		306,	264,	310,	STR_CONTROLS,	STR_NONE },
+	{ WWT_CHECKBOX,			2,	10,		299,	279,	290,	STR_SCREEN_EDGE_SCROLLING, STR_SCREEN_EDGE_SCROLLING_TIP },
+	{ WWT_DROPDOWN_BUTTON,	0,	26,		185,	293,	304,	STR_HOTKEY,		STR_HOTKEY_TIP },
+	{ WWT_GROUPBOX,			0,	3,		306,	317,	365,	STR_GENERAL,	STR_NONE },
+	{ WWT_CHECKBOX,			2,	10,		299,	331,	342,	STR_REAL_NAME,	STR_REAL_NAME_TIP },
+	{ WWT_CHECKBOX,			2,	10,		299,	346,	357,	STR_SAVE_PLUGIN_DATA, STR_SAVE_PLUGIN_DATA_TIP },
 	{ WIDGETS_END },
 };
 
@@ -79,7 +101,6 @@ static void window_options_emptysub() { }
 static void window_options_mouseup();
 static void window_options_mousedown();
 static void window_options_dropdown();
-static void window_options_textinput();
 static void window_options_update();
 static void window_options_paint();
 
@@ -129,32 +150,32 @@ void window_options_open()
 
 	w = window_create_auto_pos(310, 372, window_options_events, WC_OPTIONS, 0);
 	w->widgets = window_options_widgets;
-	w->enabled_widgets = 
-		(1 << WIDX_CLOSE) | 
-		0x10 | 
+	w->enabled_widgets =
+		(1 << WIDX_CLOSE) |
+		(1 << WIDX_SOUND) |
 		(1 << WIDX_SOUND_DROPDOWN) |
-		0x40 | 
-		0x80 | 
-		0x100 | 
-		0x200 | 
-		0x1000 | 
-		0x2000 | 
-		0x4000 | 
-		0x8000 | 
-		0x200000 | 
-		0x400000 | 
-		0x10000 | 
-		0x20000 | 
-		0x20000000 | 
-		0x10000000 | 
-		0x80000000 | 
-		0x2000000 | 
-		0x4000000 | 
-		0x40000 | 
-		0x80000 | 
-		0x800000 | 
-		0x1000000 | 
-		0x400;
+		(1 << WIDX_MUSIC) |
+		(1 << WIDX_MUSIC_DROPDOWN) |
+		(1 << WIDX_SOUND_QUALITY) |
+		(1 << WIDX_SOUND_QUALITY_DROPDOWN) |
+		(1 << WIDX_CURRENCY) |
+		(1 << WIDX_CURRENCY_DROPDOWN) |
+		(1 << WIDX_DISTANCE) |
+		(1 << WIDX_DISTANCE_DROPDOWN) |
+		(1 << WIDX_RESOLUTION) |
+		(1 << WIDX_RESOLUTION_DROPDOWN) |
+		(1 << WIDX_TEMPERATURE) |
+		(1 << WIDX_TEMPERATURE_DROPDOWN) |
+		(1 << WIDX_HOTKEY_DROPDOWN) |
+		(1 << WIDX_SCREEN_EDGE_SCROLLING) |
+		(1 << WIDX_REAL_NAME_CHECKBOX) |
+		(1 << WIDX_CONSTRUCTION_MARKER) |
+		(1 << WIDX_CONSTRUCTION_MARKER_DROPDOWN) |
+		(1 << WIDX_HEIGHT_LABELS) |
+		(1 << WIDX_HEIGHT_LABELS_DROPDOWN) |
+		(1 << WIDX_TILE_SMOOTHING_CHECKBOX) |
+		(1 << WIDX_GRIDLINES_CHECKBOX) |
+		(1 << WIDX_SOUND_SW_BUFFER_CHECKBOX);
 	// TODO: missing .text:006BAD22                 or      dword ptr [esi+0Ch], 1
 
 	window_init_scroll_widgets(w);
@@ -178,7 +199,70 @@ static void window_options_mouseup()
 */
 static void window_options_mousedown()
 {
-	RCT2_CALLPROC_EBPSAFE(0x006BB01B);
+	//RCT2_CALLPROC_EBPSAFE(0x006BB01B);
+	int numItems, i;
+	sint64 device;
+	short widgetIndex;
+	rct_window *w;
+	rct_widget *widget;
+
+	__asm mov widgetIndex, dx
+	__asm mov w, esi
+	
+	widget = &w->widgets[widgetIndex - 1];
+
+	switch (widgetIndex) {
+	case WIDX_SOUND_DROPDOWN:
+		numItems = RCT2_GLOBAL(RCT2_ADDRESS_NUM_DSOUND_DEVICES, uint32);
+		if (numItems == 0)
+			break;
+
+		window_dropdown_show_text_custom_width(
+			w->x + widget->left,
+			w->y + widget->top,
+			widget->bottom - widget->top + 1,
+			w->colours[1],
+			0x80,
+			numItems,
+			widget->right - widget->left - 3
+			);
+
+		// populate the list with the sound devices
+		device = RCT2_GLOBAL(RCT2_ADDRESS_DSOUND_DEVICES, sint32) + 0x10;
+
+		for (i = 0; i < numItems; i++) {
+			gDropdownItemsFormat[i] = 1142;
+			gDropdownItemsArgs[i] = 1170 | (device << 16);
+			device += 0x210;
+		}
+		gDropdownItemsChecked |= (1 << RCT2_GLOBAL(0x9AF280, uint32));
+
+		break;
+	case WIDX_HEIGHT_LABELS_DROPDOWN:
+		RCT2_CALLPROC_EBPSAFE(0x006BB517);
+		break;
+	case WIDX_MUSIC_DROPDOWN:
+		RCT2_CALLPROC_EBPSAFE(0x006BB5A8);
+		break;
+	case WIDX_SOUND_QUALITY_DROPDOWN:
+		RCT2_CALLPROC_EBPSAFE(0x006BB631);
+		break;
+	case WIDX_CURRENCY_DROPDOWN:
+		RCT2_CALLPROC_EBPSAFE(0x006BB494);
+		break;
+	case WIDX_DISTANCE_DROPDOWN:
+		RCT2_CALLPROC_EBPSAFE(0x006BB3E6);
+		break;
+	case WIDX_RESOLUTION_DROPDOWN:
+		RCT2_CALLPROC_EBPSAFE(0x006BB2AF);
+		break;
+	case WIDX_TEMPERATURE_DROPDOWN:
+		RCT2_CALLPROC_EBPSAFE(0x006BB21F);
+		break;
+	case WIDX_CONSTRUCTION_MARKER_DROPDOWN:
+		RCT2_CALLPROC_EBPSAFE(0x006BB18F);
+		break;
+	}
 }
 
 /**
@@ -245,4 +329,4 @@ static void window_options_paint()
 		w->y + window_options_widgets[WIDX_MUSIC].top + 1);
 	gfx_draw_string_left(dpi, STR_SOUND_QUALITY, w, 0, w->x + 10,
 		w->y + window_options_widgets[WIDX_SOUND_QUALITY].top + 1);
-}
+}
\ No newline at end of file