diff --git a/avr/modules/lcd2/win/defs.asm b/avr/modules/lcd2/win/defs.asm
index 5ced1b3..c3c28e8 100644
--- a/avr/modules/lcd2/win/defs.asm
+++ b/avr/modules/lcd2/win/defs.asm
@@ -29,39 +29,55 @@
 .equ WID_OFFS_WIDGET       = OBJ_OFFS_SIZE
 .equ WID_OFFS_OPTIONS1     = WID_OFFS_WIDGET+0
 .equ WID_OFFS_OPTIONS2     = WID_OFFS_WIDGET+1
-.equ WID_OFFS_ABS_X        = WID_OFFS_WIDGET+2
-.equ WID_OFFS_ABS_Y        = WID_OFFS_WIDGET+3
-.equ WID_OFFS_REL_X        = WID_OFFS_WIDGET+4
-.equ WID_OFFS_REL_Y        = WID_OFFS_WIDGET+5
-.equ WID_OFFS_WIDTH        = WID_OFFS_WIDGET+6
-.equ WID_OFFS_HEIGHT       = WID_OFFS_WIDGET+7
-.equ WID_OFFS_BG_COL_LO    = WID_OFFS_WIDGET+8
-.equ WID_OFFS_BG_COL_HI    = WID_OFFS_WIDGET+9
-.equ WID_OFFS_FG_COL_LO    = WID_OFFS_WIDGET+10
-.equ WID_OFFS_FG_COL_HI    = WID_OFFS_WIDGET+11
-.equ WID_OFFS_FONT_LO      = WID_OFFS_WIDGET+12
-.equ WID_OFFS_FONT_HI      = WID_OFFS_WIDGET+13
-.equ WID_OFFS_BORDER_TOP   = WID_OFFS_WIDGET+14
-.equ WID_OFFS_BORDER_BOT   = WID_OFFS_WIDGET+15
-.equ WID_OFFS_BORDER_LEFT  = WID_OFFS_WIDGET+16
-.equ WID_OFFS_BORDER_RIGHT = WID_OFFS_WIDGET+17
+.equ WID_OFFS_ABS_X_LO     = WID_OFFS_WIDGET+2
+.equ WID_OFFS_ABS_X_HI     = WID_OFFS_WIDGET+3
+.equ WID_OFFS_ABS_Y_LO     = WID_OFFS_WIDGET+4
+.equ WID_OFFS_ABS_Y_HI     = WID_OFFS_WIDGET+5
+.equ WID_OFFS_REL_X_LO     = WID_OFFS_WIDGET+6
+.equ WID_OFFS_REL_X_HI     = WID_OFFS_WIDGET+7
+.equ WID_OFFS_REL_Y_LO     = WID_OFFS_WIDGET+8
+.equ WID_OFFS_REL_Y_HI     = WID_OFFS_WIDGET+9
+.equ WID_OFFS_WIDTH_LO     = WID_OFFS_WIDGET+10
+.equ WID_OFFS_WIDTH_HI     = WID_OFFS_WIDGET+11
+.equ WID_OFFS_HEIGHT_LO    = WID_OFFS_WIDGET+12
+.equ WID_OFFS_HEIGHT_HI    = WID_OFFS_WIDGET+13
+.equ WID_OFFS_BG_COL_LO    = WID_OFFS_WIDGET+14
+.equ WID_OFFS_BG_COL_HI    = WID_OFFS_WIDGET+15
+.equ WID_OFFS_FG_COL_LO    = WID_OFFS_WIDGET+16
+.equ WID_OFFS_FG_COL_HI    = WID_OFFS_WIDGET+17
+.equ WID_OFFS_FONT_LO      = WID_OFFS_WIDGET+18
+.equ WID_OFFS_FONT_HI      = WID_OFFS_WIDGET+19
+.equ WID_OFFS_BORDER_TOP   = WID_OFFS_WIDGET+20
+.equ WID_OFFS_BORDER_BOT   = WID_OFFS_WIDGET+21
+.equ WID_OFFS_BORDER_LEFT  = WID_OFFS_WIDGET+22
+.equ WID_OFFS_BORDER_RIGHT = WID_OFFS_WIDGET+23
 
-.equ WID_SIZE              = WID_OFFS_WIDGET+18
+.equ WID_SIZE              = WID_OFFS_WIDGET+24
 
 
 
-.equ WID_OPTIONS0_BIT_VISIBLE      = 0  ; OBJ_OFFS_OPTIONS
-.equ WID_OPTIONS0_BIT_DIRTY        = 1
-.equ WID_OPTIONS0_BIT_LAYOUT       = 2
+.equ WID_OPTIONS0_BIT_VISIBLE       = 0  ; OBJ_OFFS_OPTIONS
+.equ WID_OPTIONS0_BIT_DIRTY         = 1
+.equ WID_OPTIONS0_BIT_LAYOUT        = 2
 
-.equ WID_OPTIONS1_BIT_STRETCH_X    = 0  ; WID_OFFS_OPTIONS1
-.equ WID_OPTIONS1_BIT_STRETCH_Y    = 1
+.equ WID_OPTIONS1_BIT_STRETCH_X     = 0  ; WID_OFFS_OPTIONS1
+.equ WID_OPTIONS1_BIT_STRETCH_Y     = 1
 
-.equ WID_OPTIONS1_BIT_ALIGN_RIGHT  = 2
-.equ WID_OPTIONS1_BIT_ALIGN_BOTTOM = 3
+.equ WID_OPTIONS1_BIT_HALIGN0       = 2  ; 00: left, 01: right, 11: center
+.equ WID_OPTIONS1_BIT_HALIGN1       = 3
 
-.equ WID_OPTIONS1_BIT_EQUAL_WIDTH  = 4
-.equ WID_OPTIONS1_BIT_EQUAL_HEIGHT = 5
+.equ WID_OPTIONS1_BIT_VALIGN0       = 4  ; 00: top, 01: bottom, 11: center
+.equ WID_OPTIONS1_BIT_VALIGN1       = 5
+
+.equ WID_OPTIONS1_BIT_ALIGN_HCENTER = 4
+.equ WID_OPTIONS1_BIT_ALIGN_VCENTER = 5
+
+.equ WID_OPTIONS1_BIT_FIXED_WIDTH   = 6
+.equ WID_OPTIONS1_BIT_FIXED_HEIGHT  = 7
+
+
+.equ WID_OPTIONS2_BIT_EQUAL_WIDTH   = 0
+.equ WID_OPTIONS2_BIT_EQUAL_HEIGHT  = 1
 
 
 ; Signals