Index: data/defaultNexuiz.cfg
===================================================================
--- data/defaultNexuiz.cfg	(revision 7483)
+++ data/defaultNexuiz.cfg	(working copy)
@@ -808,7 +808,7 @@
 seta r_ambient 4
 cl_decals_fadetime 1
 cl_decals_time 2
-set  cl_gunalign 3 "Gun alignment; 1 = right, 2 = left, 3 = center or right, 4 = center or left"
+seta cl_gunalign 3 "Gun alignment; 1 = right, 2 = left, 3 = center or right, 4 = center or left"
 seta cl_nogibs 0 "reduce number of violence effects, or remove them totally"
 seta cl_particlegibs 0 "simpler gibs"
 seta cl_gibs_damageforcescale 3.5 "force to push around gibs"
Index: data/qcsrc/menu/nexuiz/dialog_multiplayer_playersetup_weapons.c
===================================================================
--- data/qcsrc/menu/nexuiz/dialog_multiplayer_playersetup_weapons.c	(revision 7483)
+++ data/qcsrc/menu/nexuiz/dialog_multiplayer_playersetup_weapons.c	(working copy)
@@ -46,9 +46,14 @@
 	me.TR(me);
 		me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "cl_autoswitch", "Auto switch weapons on pickup"));
 	me.TR(me);
-	me.TR(me);
 		me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "r_drawviewmodel", "Draw 1st person weapon model"));
 	me.TR(me);
+		me.TDempty(me, 0.5);
+		me.TD(me, 1, 2, e = makeNexuizRadioButton(1, "cl_gunalign", "3", "Right align"));
+			setDependent(e, "r_drawviewmodel", 1, 1);
+		me.TD(me, 1, 2, e = makeNexuizRadioButton(1, "cl_gunalign", "4", "Left align"));
+			setDependent(e, "r_drawviewmodel", 1, 1);
+	me.TR(me);
 		me.TD(me, 1, me.columns, e = makeNexuizButton("OK", '0 0 0'));
 			e.onClick = Dialog_Close;
 			e.onClickEntity = me;
Index: data/qcsrc/menu/nexuiz/dialog_settings_video.c
===================================================================
--- data/qcsrc/menu/nexuiz/dialog_settings_video.c	(revision 7483)
+++ data/qcsrc/menu/nexuiz/dialog_settings_video.c	(working copy)
@@ -93,7 +93,7 @@
 		me.TD(me, 1, 2, e = makeNexuizSlider(0.5, 2.0, 0.05, "r_hdr_scenebrightness"));
 	me.TR(me);
 	me.TR(me);
-		me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "v_flipped", "Left handed mode"));
+		me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "v_flipped", "Flip screen horizontally"));
 	me.TR(me);
 
 	me.gotoRC(me, me.rows - 1, 0);
Index: data/tooltips.db
===================================================================
--- data/tooltips.db	(revision 7483)
+++ data/tooltips.db	(working copy)
@@ -61,6 +61,7 @@
 \cl_weaponpriority_useforcycling\Make use of the list above when cycling through weapons with the mouse wheel
 \cl_autoswitch\Automatically switch to newly picked up weapons if they are better than what you are carrying
 \r_drawviewmodel\Draw the weapon model
+\cl_gunalign\Position of the weapon model; requires reconnect
 
 \crosshair_per_weapon\Set a different crosshair for each weapon, good if you play without weapon models
 \crosshair_color_override\Also set the color of the crosshair depending on the weapon you are currently holding