Index: gui/themes/modern.ini
===================================================================
--- gui/themes/modern.ini	(revision 27657)
+++ gui/themes/modern.ini	(working copy)
@@ -345,26 +345,26 @@
 # graphics tab
 opYoffset=vBorder
 opXoffset=gox
-gameoptions_graphicsCheckbox=gox opYoffset (kFontHeight + 10 + 192) buttonHeight
+gameoptions_graphicsCheckbox=gox opYoffset (parent.w - gox - 5) buttonHeight
 opYoffset=(opYoffset + buttonHeight + 6)
 useWithPrefix=graphicsControls gameoptions_
 
 # audio tab
 opYoffset=vBorder
-gameoptions_audioCheckbox=gox opYoffset (kFontHeight + 10 + 180) buttonHeight
+gameoptions_audioCheckbox=gox opYoffset (parent.w - gox - 5) buttonHeight
 opYoffset=(opYoffset + buttonHeight + 6)
 useWithPrefix=audioControls gameoptions_
 useWithPrefix=subtitleControls gameoptions_
 
 # volume tab
 opYoffset=vBorder
-gameoptions_volumeCheckbox=gox opYoffset (kFontHeight + 10 + 180) buttonHeight
+gameoptions_volumeCheckbox=gox opYoffset (parent.w - gox - 5) buttonHeight
 opYoffset=(opYoffset + buttonHeight + 6)
 useWithPrefix=volumeControls gameoptions_
 
 # midi tab
 opYoffset=vBorder
-gameoptions_midiCheckbox=gox opYoffset (kFontHeight + 10 + 174) buttonHeight
+gameoptions_midiCheckbox=gox opYoffset (parent.w - gox - 5) buttonHeight
 opYoffset=(opYoffset + buttonHeight + 6)
 useWithPrefix=midiControls gameoptions_
 
@@ -478,9 +478,9 @@
 opYoffset=(opYoffset + kLineHeight + 12)
 grRenderPopup=prev.x (opYoffset - 1) prev.w prev.h
 opYoffset=(opYoffset + kLineHeight + 16)
-grFullscreenCheckbox=gcx opYoffset (kFontHeight + 10 + 96) buttonHeight
+grFullscreenCheckbox=gcx opYoffset (parent.w - gcx - 5) buttonHeight
 opYoffset=(opYoffset + buttonHeight + 4)
-grAspectCheckbox=prev.x opYoffset (kFontHeight + 10 + 136) prev.h
+grAspectCheckbox=prev.x opYoffset prev.w prev.h
 opYoffset=(opYoffset + buttonHeight + 4)
 
 [audioControls]
@@ -518,11 +518,11 @@
 mcFontPath=(prev.x2 + 20) (opYoffset + mcOff) (parent.w - (buttonWidth + 20) - mcx - kLineHeight - 20) kLineHeight
 mcFontClearButton=(prev.x2 + 10) (opYoffset + mcOff) kLineHeight kLineHeight
 opYoffset=(opYoffset + buttonHeight + 6 * midiControlsSpacing)
-mcMixedCheckbox=mcx opYoffset (kFontHeight + 10 + 135) buttonHeight
+mcMixedCheckbox=mcx opYoffset (parent.w - mcx - 5) buttonHeight
 opYoffset=(opYoffset + buttonHeight + midiControlsSpacing)
-mcMt32Checkbox=mcx opYoffset (kFontHeight + 10 + 256) buttonHeight
+mcMt32Checkbox=mcx opYoffset prev.w buttonHeight
 opYoffset=(opYoffset + buttonHeight + midiControlsSpacing)
-mcGSCheckbox=mcx opYoffset (kFontHeight + 10 + 142) buttonHeight
+mcGSCheckbox=mcx opYoffset prev.w buttonHeight
 opYoffset=(opYoffset + buttonHeight + midiControlsSpacing)
 mcMidiGainText=mcx (opYoffset + 2) 80 kLineHeight
 mcMidiGainText.align=kTextAlignRight
Index: gui/themes/classic080.ini
===================================================================
--- gui/themes/classic080.ini	(revision 27657)
+++ gui/themes/classic080.ini	(working copy)
@@ -187,26 +187,26 @@
 # graphics tab
 opYoffset=vBorder
 opXoffset=gox
-gameoptions_graphicsCheckbox=gox opYoffset (kFontHeight + 10 + 192) buttonHeight
+gameoptions_graphicsCheckbox=gox opYoffset (parent.w - gox - 5) buttonHeight
 opYoffset=(opYoffset + buttonHeight)
 useWithPrefix=graphicsControls gameoptions_
 
 # audio tab
 opYoffset=vBorder
-gameoptions_audioCheckbox=gox opYoffset (kFontHeight + 10 + 180) buttonHeight
+gameoptions_audioCheckbox=gox opYoffset (parent.w - gox - 5) buttonHeight
 opYoffset=(opYoffset + buttonHeight)
 useWithPrefix=audioControls gameoptions_
 useWithPrefix=subtitleControls gameoptions_
 
 # volume tab
 opYoffset=vBorder
-gameoptions_volumeCheckbox=gox opYoffset (kFontHeight + 10 + 190) buttonHeight
+gameoptions_volumeCheckbox=gox opYoffset (parent.w - gox - 5) buttonHeight
 opYoffset=(opYoffset + buttonHeight)
 useWithPrefix=volumeControls gameoptions_
 
 # midi tab
 opYoffset=vBorder
-gameoptions_midiCheckbox=gox opYoffset (kFontHeight + 10 + 174) buttonHeight
+gameoptions_midiCheckbox=gox opYoffset (parent.w - gox - 5) buttonHeight
 opYoffset=(opYoffset + buttonHeight)
 useWithPrefix=midiControls gameoptions_
 
@@ -305,9 +305,9 @@
 opYoffset=(opYoffset + kLineHeight + 4)
 grRenderPopup=prev.x (opYoffset - 1) prev.w prev.h
 opYoffset=(opYoffset + kLineHeight + 4)
-grFullscreenCheckbox=gcx opYoffset (kFontHeight + 10 + 96) buttonHeight
+grFullscreenCheckbox=gcx opYoffset (parent.w - gcx - 5) buttonHeight
 opYoffset=(opYoffset + buttonHeight)
-grAspectCheckbox=prev.x opYoffset (kFontHeight + 10 + 180) prev.h
+grAspectCheckbox=prev.x opYoffset prev.w prev.h
 opYoffset=(opYoffset + buttonHeight)
 
 [audioControls]
@@ -344,11 +344,11 @@
 mcFontPath=(prev.x2 + 20) (opYoffset + 3) (parent.w - (buttonWidth + 20) - mcx - kLineHeight - 20) kLineHeight
 mcFontClearButton=(prev.x2 + 10) (opYoffset + 3) kLineHeight kLineHeight
 opYoffset=(opYoffset + buttonHeight + 2 * midiControlsSpacing)
-mcMixedCheckbox=mcx opYoffset (kFontHeight + 10 + 135) buttonHeight
+mcMixedCheckbox=mcx opYoffset (parent.w - mcx - 5) buttonHeight
 opYoffset=(opYoffset + buttonHeight + midiControlsSpacing)
-mcMt32Checkbox=mcx opYoffset (kFontHeight + 10 + 256) buttonHeight
+mcMt32Checkbox=mcx opYoffset prev.w buttonHeight
 opYoffset=(opYoffset + buttonHeight + midiControlsSpacing)
-mcGSCheckbox=mcx opYoffset (kFontHeight + 10 + 142) buttonHeight
+mcGSCheckbox=mcx opYoffset prev.w buttonHeight
 opYoffset=(opYoffset + buttonHeight + midiControlsSpacing)
 mcMidiGainText=mcx (opYoffset + 2) 95 kLineHeight
 mcMidiGainText.align=kTextAlignRight