diff --git a/art/textures/cursor.9.png b/art/textures/cursor.9.png
index aeed93c0..f2632b4c 100644
Binary files a/art/textures/cursor.9.png and b/art/textures/cursor.9.png differ
diff --git a/art/textures/expand-icon.png b/art/textures/expand-icon.png
new file mode 100644
index 00000000..6fd79bc1
Binary files /dev/null and b/art/textures/expand-icon.png differ
diff --git a/assets/freetypefonts/DejaVuSansMono.ttf b/assets/freetypefonts/DejaVuSansMono.ttf
new file mode 100644
index 00000000..f4b1bf8f
Binary files /dev/null and b/assets/freetypefonts/DejaVuSansMono.ttf differ
diff --git a/assets/style/uiskin.atlas b/assets/style/uiskin.atlas
index add18247..c49d4917 100644
--- a/assets/style/uiskin.atlas
+++ b/assets/style/uiskin.atlas
@@ -27,49 +27,49 @@ align-edge-down
   index: -1
 align-edge-left
   rotate: false
-  xy: 572, 83
+  xy: 590, 83
   size: 18, 18
   orig: 18, 18
   offset: 0, 0
   index: -1
 align-edge-right
   rotate: false
-  xy: 592, 83
+  xy: 610, 83
   size: 18, 18
   orig: 18, 18
   offset: 0, 0
   index: -1
 align-edge-up
   rotate: false
-  xy: 548, 59
+  xy: 630, 84
   size: 18, 18
   orig: 18, 18
   offset: 0, 0
   index: -1
 align-simple-down
   rotate: false
-  xy: 612, 83
+  xy: 650, 84
   size: 18, 18
   orig: 18, 18
   offset: 0, 0
   index: -1
 align-simple-left
   rotate: false
-  xy: 632, 84
+  xy: 670, 84
   size: 18, 18
   orig: 18, 18
   offset: 0, 0
   index: -1
 align-simple-right
   rotate: false
-  xy: 652, 84
+  xy: 690, 84
   size: 18, 18
   orig: 18, 18
   offset: 0, 0
   index: -1
 align-simple-up
   rotate: false
-  xy: 672, 84
+  xy: 710, 84
   size: 18, 18
   orig: 18, 18
   offset: 0, 0
@@ -97,7 +97,7 @@ alpha-bar-25px-shifted
   index: -1
 border
   rotate: false
-  xy: 78, 6
+  xy: 960, 81
   size: 5, 5
   split: 2, 2, 2, 2
   pad: 1, 1, 1, 1
@@ -129,7 +129,7 @@ border-error
   index: -1
 border-textfield
   rotate: false
-  xy: 43, 6
+  xy: 524, 95
   size: 11, 5
   split: 5, 5, 2, 2
   pad: 5, 5, 1, 1
@@ -160,7 +160,7 @@ box-colapse-on
   index: -1
 button
   rotate: false
-  xy: 635, 62
+  xy: 643, 62
   size: 12, 20
   split: 5, 5, 5, 4
   pad: 5, 5, 2, 2
@@ -169,7 +169,7 @@ button
   index: -1
 button-dark
   rotate: false
-  xy: 563, 37
+  xy: 560, 17
   size: 12, 20
   split: 5, 5, 5, 4
   pad: 4, 4, 3, 3
@@ -178,7 +178,7 @@ button-dark
   index: -1
 button-dark-down
   rotate: false
-  xy: 549, 37
+  xy: 994, 82
   size: 12, 20
   split: 5, 5, 5, 4
   pad: 4, 4, 3, 3
@@ -187,7 +187,7 @@ button-dark-down
   index: -1
 button-dark-over
   rotate: false
-  xy: 546, 15
+  xy: 546, 17
   size: 12, 20
   split: 5, 5, 5, 4
   pad: 4, 4, 4, 3
@@ -196,7 +196,7 @@ button-dark-over
   index: -1
 button-down
   rotate: false
-  xy: 560, 15
+  xy: 574, 17
   size: 12, 20
   split: 5, 5, 5, 4
   pad: 5, 5, 2, 2
@@ -205,7 +205,7 @@ button-down
   index: -1
 button-flat-red
   rotate: false
-  xy: 591, 37
+  xy: 615, 61
   size: 12, 20
   split: 3, 3, 3, 4
   orig: 12, 20
@@ -213,7 +213,7 @@ button-flat-red
   index: -1
 button-flat-red-down
   rotate: false
-  xy: 577, 37
+  xy: 587, 57
   size: 12, 20
   split: 3, 3, 3, 4
   orig: 12, 20
@@ -221,7 +221,7 @@ button-flat-red-down
   index: -1
 button-flat-red-over
   rotate: false
-  xy: 574, 15
+  xy: 601, 61
   size: 12, 20
   split: 3, 3, 3, 4
   orig: 12, 20
@@ -229,7 +229,7 @@ button-flat-red-over
   index: -1
 button-over
   rotate: false
-  xy: 588, 15
+  xy: 590, 35
   size: 12, 20
   split: 5, 5, 5, 4
   pad: 5, 5, 2, 2
@@ -238,7 +238,7 @@ button-over
   index: -1
 button-panel-bg
   rotate: false
-  xy: 605, 37
+  xy: 604, 39
   size: 12, 20
   split: 5, 5, 5, 4
   pad: 4, 4, 1, 1
@@ -247,7 +247,7 @@ button-panel-bg
   index: -1
 button-red
   rotate: false
-  xy: 568, 59
+  xy: 588, 15
   size: 12, 18
   split: 5, 5, 4, 3
   pad: 4, 4, 1, 1
@@ -256,7 +256,7 @@ button-red
   index: -1
 button-resource
   rotate: false
-  xy: 621, 61
+  xy: 629, 61
   size: 12, 20
   split: 5, 5, 5, 4
   pad: 4, 4, 1, 1
@@ -265,7 +265,7 @@ button-resource
   index: -1
 button-resource-over
   rotate: false
-  xy: 602, 15
+  xy: 618, 39
   size: 12, 20
   split: 5, 5, 5, 4
   pad: 4, 4, 1, 1
@@ -274,7 +274,7 @@ button-resource-over
   index: -1
 button-window-bg
   rotate: false
-  xy: 649, 64
+  xy: 657, 64
   size: 12, 18
   split: 5, 5, 4, 3
   pad: 4, 4, 1, 1
@@ -297,14 +297,14 @@ check-down-on
   index: -1
 check-off
   rotate: false
-  xy: 908, 88
+  xy: 946, 88
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 textfield
   rotate: false
-  xy: 908, 88
+  xy: 946, 88
   size: 14, 14
   split: 2, 2, 3, 2
   orig: 14, 14
@@ -312,71 +312,70 @@ textfield
   index: -1
 check-on
   rotate: false
-  xy: 924, 88
+  xy: 962, 88
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 check-on-disabled
   rotate: false
-  xy: 940, 88
+  xy: 978, 88
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 check-over-off
   rotate: false
-  xy: 956, 88
+  xy: 1008, 79
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 check-over-on
   rotate: false
-  xy: 972, 88
+  xy: 549, 39
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 color-picker-bar-selector
   rotate: false
-  xy: 684, 51
+  xy: 581, 39
   size: 7, 14
   orig: 7, 14
   offset: 0, 0
   index: -1
 color-picker-cross
   rotate: false
-  xy: 85, 6
+  xy: 967, 81
   size: 5, 5
   orig: 5, 5
   offset: 0, 0
   index: -1
 color-picker-selector-horizontal
   rotate: false
-  xy: 663, 64
+  xy: 537, 95
   size: 3, 1
   orig: 3, 1
   offset: 0, 0
   index: -1
 color-picker-selector-vertical
   rotate: false
-  xy: 126, 8
+  xy: 644, 39
   size: 1, 3
   orig: 1, 3
   offset: 0, 0
   index: -1
 cursor
   rotate: false
-  xy: 275, 3
-  size: 3, 3
-  split: 1, 1, 1, 1
-  orig: 3, 3
+  xy: 228, 2
+  size: 1, 1
+  orig: 1, 1
   offset: 0, 0
   index: -1
 default-pane
   rotate: false
-  xy: 605, 2
+  xy: 105, 2
   size: 5, 3
   split: 1, 1, 1, 1
   orig: 5, 3
@@ -384,7 +383,7 @@ default-pane
   index: -1
 default-pane-noborder
   rotate: false
-  xy: 546, 37
+  xy: 231, 2
   size: 1, 1
   split: 0, 0, 0, 0
   orig: 1, 1
@@ -408,7 +407,7 @@ default-select-over
   index: -1
 default-select-selection
   rotate: false
-  xy: 68, 8
+  xy: 275, 3
   size: 3, 3
   split: 1, 1, 1, 1
   orig: 3, 3
@@ -437,9 +436,16 @@ dropHere
   orig: 249, 101
   offset: 0, 0
   index: -1
+expand-icon
+  rotate: false
+  xy: 524, 77
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
 expandable-properties-active-bg
   rotate: false
-  xy: 632, 42
+  xy: 667, 45
   size: 4, 17
   split: 1, 2, 0, 17
   orig: 4, 17
@@ -447,21 +453,21 @@ expandable-properties-active-bg
   index: -1
 expandable-properties-collapse-off
   rotate: false
-  xy: 587, 6
+  xy: 63, 4
   size: 7, 7
   orig: 7, 7
   offset: 0, 0
   index: -1
 expandable-properties-collapse-on
   rotate: false
-  xy: 596, 6
+  xy: 72, 4
   size: 7, 7
   orig: 7, 7
   offset: 0, 0
   index: -1
 expandable-properties-inactive-bg
   rotate: false
-  xy: 626, 41
+  xy: 661, 44
   size: 4, 18
   split: 1, 2, 0, 18
   orig: 4, 18
@@ -504,7 +510,7 @@ icon-close-panel
   index: -1
 icon-close-small
   rotate: false
-  xy: 535, 40
+  xy: 535, 39
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
@@ -525,7 +531,7 @@ icon-composite
   index: -1
 icon-composite2
   rotate: false
-  xy: 988, 88
+  xy: 565, 39
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
@@ -665,7 +671,7 @@ icon-lock-inactive
   index: -1
 icon-new-layer
   rotate: false
-  xy: 663, 67
+  xy: 671, 67
   size: 13, 15
   orig: 13, 15
   offset: 0, 0
@@ -700,7 +706,7 @@ icon-refresh
   index: -1
 icon-root
   rotate: false
-  xy: 693, 69
+  xy: 686, 68
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
@@ -728,21 +734,21 @@ icon-star-outline
   index: -1
 icon-trash
   rotate: false
-  xy: 678, 67
+  xy: 632, 44
   size: 13, 15
   orig: 13, 15
   offset: 0, 0
   index: -1
 icon-trash-disabled
   rotate: false
-  xy: 638, 45
+  xy: 718, 67
   size: 13, 15
   orig: 13, 15
   offset: 0, 0
   index: -1
 icon-trash-over
   rotate: false
-  xy: 653, 47
+  xy: 733, 68
   size: 13, 15
   orig: 13, 15
   offset: 0, 0
@@ -770,56 +776,56 @@ icon-visible-off
   index: -1
 icon-visible-on
   rotate: false
-  xy: 524, 78
+  xy: 542, 79
   size: 22, 22
   orig: 22, 22
   offset: 0, 0
   index: -1
 icon-zoomin
   rotate: false
-  xy: 692, 85
+  xy: 730, 85
   size: 17, 17
   orig: 17, 17
   offset: 0, 0
   index: -1
 icon-zoomin-disabled
   rotate: false
-  xy: 711, 85
+  xy: 749, 85
   size: 17, 17
   orig: 17, 17
   offset: 0, 0
   index: -1
 icon-zoomin-over
   rotate: false
-  xy: 730, 85
+  xy: 768, 85
   size: 17, 17
   orig: 17, 17
   offset: 0, 0
   index: -1
 icon-zoomout
   rotate: false
-  xy: 749, 85
+  xy: 787, 85
   size: 17, 17
   orig: 17, 17
   offset: 0, 0
   index: -1
 icon-zoomout-disabled
   rotate: false
-  xy: 768, 85
+  xy: 806, 85
   size: 17, 17
   orig: 17, 17
   offset: 0, 0
   index: -1
 icon-zoomout-over
   rotate: false
-  xy: 787, 85
+  xy: 825, 85
   size: 17, 17
   orig: 17, 17
   offset: 0, 0
   index: -1
 layer-bg
   rotate: false
-  xy: 619, 38
+  xy: 654, 41
   size: 5, 19
   split: 2, 2, 0, 19
   orig: 5, 19
@@ -827,7 +833,7 @@ layer-bg
   index: -1
 layer-bg-over
   rotate: false
-  xy: 616, 16
+  xy: 647, 41
   size: 5, 19
   split: 2, 2, 0, 19
   orig: 5, 19
@@ -835,14 +841,14 @@ layer-bg-over
   index: -1
 list-selection
   rotate: false
-  xy: 584, 2
+  xy: 671, 64
   size: 1, 1
   orig: 1, 1
   offset: 0, 0
   index: -1
 list-selection-white
   rotate: false
-  xy: 221, 2
+  xy: 81, 2
   size: 1, 1
   orig: 1, 1
   offset: 0, 0
@@ -895,7 +901,7 @@ origin-anchor
   index: -1
 padded-list-selection
   rotate: false
-  xy: 56, 8
+  xy: 632, 39
   size: 10, 3
   split: 4, 4, 1, 1
   pad: 4, 4, 0, 0
@@ -912,7 +918,7 @@ panel
   index: -1
 popup-menu
   rotate: false
-  xy: 111, 8
+  xy: 122, 2
   size: 3, 3
   split: 1, 1, 1, 1
   orig: 3, 3
@@ -920,7 +926,7 @@ popup-menu
   index: -1
 popup-menu-disabled
   rotate: false
-  xy: 73, 8
+  xy: 537, 98
   size: 3, 3
   split: 1, 1, 1, 1
   orig: 3, 3
@@ -928,7 +934,7 @@ popup-menu-disabled
   index: -1
 popup-menu-down
   rotate: false
-  xy: 612, 2
+  xy: 112, 2
   size: 3, 3
   split: 1, 1, 1, 1
   orig: 3, 3
@@ -936,7 +942,7 @@ popup-menu-down
   index: -1
 popup-menu-over
   rotate: false
-  xy: 106, 8
+  xy: 117, 2
   size: 3, 3
   split: 1, 1, 1, 1
   orig: 3, 3
@@ -965,7 +971,7 @@ progressbar-filled-vertical
   index: -1
 progressbar-vertical
   rotate: false
-  xy: 577, 2
+  xy: 199, 2
   size: 5, 1
   orig: 5, 1
   offset: 0, 0
@@ -979,49 +985,49 @@ radio-down
   index: -1
 radio-down-on
   rotate: false
-  xy: 806, 87
+  xy: 844, 87
   size: 15, 15
   orig: 15, 15
   offset: 0, 0
   index: -1
 radio-off
   rotate: false
-  xy: 823, 87
+  xy: 861, 87
   size: 15, 15
   orig: 15, 15
   offset: 0, 0
   index: -1
 radio-on
   rotate: false
-  xy: 840, 87
+  xy: 878, 87
   size: 15, 15
   orig: 15, 15
   offset: 0, 0
   index: -1
 radio-on-disabled
   rotate: false
-  xy: 857, 87
+  xy: 895, 87
   size: 15, 15
   orig: 15, 15
   offset: 0, 0
   index: -1
 radio-over-off
   rotate: false
-  xy: 874, 87
+  xy: 912, 87
   size: 15, 15
   orig: 15, 15
   offset: 0, 0
   index: -1
 radio-over-on
   rotate: false
-  xy: 891, 87
+  xy: 929, 87
   size: 15, 15
   orig: 15, 15
   offset: 0, 0
   index: -1
 scroll
   rotate: false
-  xy: 92, 5
+  xy: 953, 80
   size: 5, 6
   split: 2, 2, 2, 2
   orig: 5, 6
@@ -1029,7 +1035,7 @@ scroll
   index: -1
 scroll-horizontal
   rotate: false
-  xy: 789, 52
+  xy: 89, 6
   size: 6, 5
   split: 2, 2, 0, 5
   pad: -1, -1, 2, 2
@@ -1038,7 +1044,7 @@ scroll-horizontal
   index: -1
 scroll-knob-horizontal
   rotate: false
-  xy: 383, 47
+  xy: 97, 6
   size: 6, 5
   split: 2, 2, 0, 5
   pad: -1, -1, 2, 2
@@ -1047,7 +1053,7 @@ scroll-knob-horizontal
   index: -1
 scroll-knob-vertical
   rotate: false
-  xy: 391, 46
+  xy: 946, 80
   size: 5, 6
   split: 2, 2, 2, 2
   orig: 5, 6
@@ -1055,14 +1061,14 @@ scroll-knob-vertical
   index: -1
 select-box-list-bg
   rotate: false
-  xy: 224, 2
+  xy: 84, 2
   size: 1, 1
   orig: 1, 1
   offset: 0, 0
   index: -1
 select-box-list-bg-white
   rotate: false
-  xy: 227, 2
+  xy: 87, 2
   size: 1, 1
   orig: 1, 1
   offset: 0, 0
@@ -1076,14 +1082,14 @@ select-down
   index: -1
 select-up
   rotate: false
-  xy: 56, 2
+  xy: 105, 7
   size: 7, 4
   orig: 7, 4
   offset: 0, 0
   index: -1
 selection
   rotate: false
-  xy: 230, 2
+  xy: 413, 3
   size: 1, 1
   orig: 1, 1
   offset: 0, 0
@@ -1097,63 +1103,63 @@ selection-anchor
   index: -1
 separator
   rotate: false
-  xy: 413, 2
+  xy: 601, 57
   size: 1, 2
   orig: 1, 2
   offset: 0, 0
   index: -1
 separator-menu
   rotate: false
-  xy: 413, 2
+  xy: 601, 57
   size: 1, 2
   orig: 1, 2
   offset: 0, 0
   index: -1
 separator-vertical
   rotate: false
-  xy: 217, 2
+  xy: 224, 2
   size: 2, 1
   orig: 2, 1
   offset: 0, 0
   index: -1
 slider
   rotate: false
-  xy: 1004, 98
+  xy: 126, 7
   size: 1, 4
   orig: 1, 4
   offset: 0, 0
   index: -1
 slider-knob
   rotate: false
-  xy: 535, 54
+  xy: 535, 53
   size: 11, 22
   orig: 11, 22
   offset: 0, 0
   index: -1
 slider-knob-disabled
   rotate: false
-  xy: 582, 59
+  xy: 548, 55
   size: 11, 22
   orig: 11, 22
   offset: 0, 0
   index: -1
 slider-knob-down
   rotate: false
-  xy: 595, 59
+  xy: 561, 55
   size: 11, 22
   orig: 11, 22
   offset: 0, 0
   index: -1
 slider-knob-over
   rotate: false
-  xy: 608, 59
+  xy: 574, 55
   size: 11, 22
   orig: 11, 22
   offset: 0, 0
   index: -1
 slider-vertical
   rotate: false
-  xy: 199, 2
+  xy: 206, 2
   size: 4, 1
   orig: 4, 1
   offset: 0, 0
@@ -1167,28 +1173,28 @@ splash_logo
   index: -1
 splitpane
   rotate: false
-  xy: 205, 2
+  xy: 212, 2
   size: 4, 1
   orig: 4, 1
   offset: 0, 0
   index: -1
 splitpane-over
   rotate: false
-  xy: 211, 2
+  xy: 218, 2
   size: 4, 1
   orig: 4, 1
   offset: 0, 0
   index: -1
 splitpane-vertical
   rotate: false
-  xy: 613, 9
+  xy: 940, 72
   size: 1, 4
   orig: 1, 4
   offset: 0, 0
   index: -1
 splitpane-vertical-over
   rotate: false
-  xy: 616, 10
+  xy: 981, 82
   size: 1, 4
   orig: 1, 4
   offset: 0, 0
@@ -1203,7 +1209,7 @@ static-text
   index: -1
 sub-menu
   rotate: false
-  xy: 799, 60
+  xy: 940, 78
   size: 4, 7
   orig: 4, 7
   offset: 0, 0
@@ -1234,7 +1240,7 @@ tab-inactive
   index: -1
 textfield-light
   rotate: false
-  xy: 741, 69
+  xy: 764, 69
   size: 14, 14
   split: 3, 3, 4, 3
   orig: 14, 14
@@ -1242,7 +1248,7 @@ textfield-light
   index: -1
 textfield-light-down
   rotate: false
-  xy: 709, 69
+  xy: 702, 68
   size: 14, 14
   split: 3, 3, 4, 3
   orig: 14, 14
@@ -1250,7 +1256,7 @@ textfield-light-down
   index: -1
 textfield-light-over
   rotate: false
-  xy: 725, 69
+  xy: 748, 69
   size: 14, 14
   split: 3, 3, 4, 3
   orig: 14, 14
@@ -1258,7 +1264,7 @@ textfield-light-over
   index: -1
 textfield-over
   rotate: false
-  xy: 725, 69
+  xy: 748, 69
   size: 14, 14
   split: 2, 2, 3, 2
   orig: 14, 14
@@ -1266,7 +1272,7 @@ textfield-over
   index: -1
 thumbnail
   rotate: false
-  xy: 71, 2
+  xy: 120, 7
   size: 4, 4
   split: 1, 2, 1, 2
   orig: 4, 4
@@ -1274,7 +1280,7 @@ thumbnail
   index: -1
 thumbnail-over
   rotate: false
-  xy: 65, 2
+  xy: 114, 7
   size: 4, 4
   split: 1, 2, 1, 2
   orig: 4, 4
@@ -1282,7 +1288,7 @@ thumbnail-over
   index: -1
 tint-border
   rotate: false
-  xy: 605, 7
+  xy: 81, 5
   size: 6, 6
   split: 2, 2, 2, 2
   orig: 6, 6
@@ -1371,7 +1377,7 @@ toolbar-over
   index: -1
 tooltip-bg
   rotate: false
-  xy: 116, 8
+  xy: 129, 8
   size: 3, 3
   split: 1, 1, 1, 1
   orig: 3, 3
@@ -1379,35 +1385,35 @@ tooltip-bg
   index: -1
 touchpad-knob
   rotate: false
-  xy: 548, 79
+  xy: 566, 79
   size: 22, 22
   orig: 22, 22
   offset: 0, 0
   index: -1
 tree-minus
   rotate: false
-  xy: 577, 5
+  xy: 43, 3
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 tree-over
   rotate: false
-  xy: 233, 2
+  xy: 590, 80
   size: 1, 1
   orig: 1, 1
   offset: 0, 0
   index: -1
 tree-plus
   rotate: false
-  xy: 789, 59
+  xy: 53, 3
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 tree-selection
   rotate: false
-  xy: 99, 6
+  xy: 974, 81
   size: 5, 5
   split: 2, 2, 2, 2
   pad: 1, 1, 1, 1
@@ -1416,91 +1422,91 @@ tree-selection
   index: -1
 vis-blue
   rotate: false
-  xy: 572, 80
+  xy: 604, 36
   size: 1, 1
   orig: 1, 1
   offset: 0, 0
   index: -1
 vis-check
   rotate: false
-  xy: 757, 69
+  xy: 780, 69
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 vis-check-down
   rotate: false
-  xy: 773, 69
+  xy: 796, 69
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 vis-check-over
   rotate: false
-  xy: 789, 69
+  xy: 812, 69
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 vis-check-tick
   rotate: false
-  xy: 668, 51
+  xy: 828, 69
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 vis-check-tick-disabled
   rotate: false
-  xy: 693, 53
+  xy: 844, 71
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 vis-radio
   rotate: false
-  xy: 709, 53
+  xy: 860, 71
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 vis-radio-down
   rotate: false
-  xy: 725, 53
+  xy: 876, 71
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 vis-radio-over
   rotate: false
-  xy: 741, 53
+  xy: 892, 71
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 vis-radio-tick
   rotate: false
-  xy: 757, 53
+  xy: 908, 71
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 vis-radio-tick-disabled
   rotate: false
-  xy: 773, 53
+  xy: 924, 71
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 vis-red
   rotate: false
-  xy: 626, 38
+  xy: 661, 41
   size: 1, 1
   orig: 1, 1
   offset: 0, 0
   index: -1
 white
   rotate: false
-  xy: 121, 8
+  xy: 127, 2
   size: 3, 3
   orig: 3, 3
   offset: 0, 0
@@ -1515,7 +1521,7 @@ window
   index: -1
 window-bg
   rotate: false
-  xy: 638, 42
+  xy: 409, 20
   size: 1, 1
   orig: 1, 1
   offset: 0, 0
diff --git a/assets/style/uiskin.json b/assets/style/uiskin.json
index 7dc33dc0..ad524886 100644
--- a/assets/style/uiskin.json
+++ b/assets/style/uiskin.json
@@ -309,6 +309,15 @@
       font: default-font,
       fontColor: white,
       cursor: cursor
+    },
+    code-editor: {
+      errorBorder: border-error,
+      font: default-mono-font,
+      fontColor: white,
+      disabledFontColor: grey,
+      selection: selection,
+      background: textfield,
+      cursor: cursor
     }
   },
   com.kotcrab.vis.ui.widget.VisImageTextButton$VisImageTextButtonStyle: {
@@ -426,7 +435,7 @@
     close-window: {
       down: button-red,
       up: button-window-bg,
-      imageUp: icon-close-white,
+      imageUp: icon-close-white
     },
     close-panel: {
       down: button-red,
@@ -563,6 +572,9 @@
       imageUp: expandable-properties-collapse-on,
       imageChecked: expandable-properties-collapse-off
     },
+    expand-button : {
+      imageUp: expand-icon
+    },
     layer-lock: {
       imageUp: icon-lock-inactive,
       imageChecked: icon-lock-active
diff --git a/assets/style/uiskin.png b/assets/style/uiskin.png
index 702531c9..4d09f513 100644
Binary files a/assets/style/uiskin.png and b/assets/style/uiskin.png differ
diff --git a/build.gradle b/build.gradle
index d4a45e12..7b8ff0c8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -29,7 +29,7 @@ ext {
     box2dlightsVersion = '1.5'
     ashleyVersion = '1.7.3'
     spineVersion = '3.8.55.1'
-    visuiVersion = '1.4.6'
+    visuiVersion = '1.4.7-SNAPSHOT'
     typingLabelVersion = '1.2.0'
 
     packMain = ["art/textures", "assets/style/", "uiskin"]
diff --git a/hyperlap2d-common-api/src/main/java/games/rednblack/h2d/common/MsgAPI.java b/hyperlap2d-common-api/src/main/java/games/rednblack/h2d/common/MsgAPI.java
index 49c6fba3..4f72a45c 100644
--- a/hyperlap2d-common-api/src/main/java/games/rednblack/h2d/common/MsgAPI.java
+++ b/hyperlap2d-common-api/src/main/java/games/rednblack/h2d/common/MsgAPI.java
@@ -39,6 +39,8 @@ public class MsgAPI {
 
     public static final String SAVE_EDITOR_CONFIG = GLOBAL_PREFIX + ".SAVE_EDITOR_CONFIG";
 
+    public static final String OPEN_CODE_EDITOR = GLOBAL_PREFIX + ".OPEN_CODE_EDITOR";
+
     // tmp events
     public static final String ZOOM_CHANGED = GLOBAL_PREFIX + ".ZOOM_CHANGED";
     public static final String GRID_SIZE_CHANGED = GLOBAL_PREFIX + ".GRID_SIZE_CHANGED";
diff --git a/src/main/java/games/rednblack/editor/HyperLap2D.java b/src/main/java/games/rednblack/editor/HyperLap2D.java
index 675f22e2..07723494 100644
--- a/src/main/java/games/rednblack/editor/HyperLap2D.java
+++ b/src/main/java/games/rednblack/editor/HyperLap2D.java
@@ -68,6 +68,8 @@ public class HyperLap2D implements Proxy, ApplicationListener, Lwjgl3WindowListe
     @Override
     public void create() {
         FreeTypeFontGenerator generator = new FreeTypeFontGenerator(Gdx.files.internal("freetypefonts/DejaVuSans.ttf"));
+        FreeTypeFontGenerator monoGenerator = new FreeTypeFontGenerator(Gdx.files.internal("freetypefonts/DejaVuSansMono.ttf"));
+
         FreeTypeFontGenerator.FreeTypeFontParameter parameter = new FreeTypeFontGenerator.FreeTypeFontParameter();
         parameter.characters += "⌘⇧⌥";
         parameter.kerning = false;
@@ -80,6 +82,9 @@ public class HyperLap2D implements Proxy, ApplicationListener, Lwjgl3WindowListe
         BitmapFont defaultFont = generator.generateFont(parameter);
         parameter.size = 14;
         BitmapFont bigFont = generator.generateFont(parameter);
+        BitmapFont defaultMono = monoGenerator.generateFont(parameter);
+        defaultMono.setFixedWidthGlyphs(parameter.characters);
+
         generator.dispose();
 
         /* Create the ObjectMap and add the fonts to it */
@@ -87,6 +92,7 @@ public class HyperLap2D implements Proxy, ApplicationListener, Lwjgl3WindowListe
         fontMap.put("small-font", smallFont);
         fontMap.put("default-font", defaultFont);
         fontMap.put("big-font", bigFont);
+        fontMap.put("default-mono-font", defaultMono);
 
         SkinLoader.SkinParameter skinParameter = new SkinLoader.SkinParameter(fontMap);
 
diff --git a/src/main/java/games/rednblack/editor/code/GroupRegexHighlightRule.java b/src/main/java/games/rednblack/editor/code/GroupRegexHighlightRule.java
new file mode 100644
index 00000000..9f5fec6f
--- /dev/null
+++ b/src/main/java/games/rednblack/editor/code/GroupRegexHighlightRule.java
@@ -0,0 +1,48 @@
+package games.rednblack.editor.code;
+
+import com.badlogic.gdx.graphics.Color;
+import com.badlogic.gdx.utils.Array;
+import com.kotcrab.vis.ui.util.highlight.Highlight;
+import com.kotcrab.vis.ui.util.highlight.HighlightRule;
+import com.kotcrab.vis.ui.widget.HighlightTextArea;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Highlighter rule using regex to detect text matches and select a single group
+ */
+public class GroupRegexHighlightRule implements HighlightRule {
+
+    private Color[] colors;
+    private Pattern pattern;
+    private int[] groups;
+
+    public GroupRegexHighlightRule (String regex) {
+        pattern = Pattern.compile(regex);
+    }
+
+    public GroupRegexHighlightRule colors(Color... colors) {
+        this.colors = colors;
+        return this;
+    }
+
+    public GroupRegexHighlightRule groups(int... groups) {
+        this.groups = groups;
+        return this;
+    }
+
+    @Override
+    public void process (HighlightTextArea textArea, Array<Highlight> highlights) {
+        Matcher matcher = pattern.matcher(textArea.getText());
+        while (matcher.find()) {
+            for (int i = 0; i < groups.length; i++) {
+                int group = groups[i];
+                Color color = colors[i];
+
+                if (group <= matcher.groupCount() && matcher.start(group) < matcher.end(group))
+                    highlights.add(new Highlight(color, matcher.start(group), matcher.end(group)));
+            }
+        }
+    }
+}
diff --git a/src/main/java/games/rednblack/editor/code/syntax/TypingLabelSyntax.java b/src/main/java/games/rednblack/editor/code/syntax/TypingLabelSyntax.java
new file mode 100644
index 00000000..bf1a6927
--- /dev/null
+++ b/src/main/java/games/rednblack/editor/code/syntax/TypingLabelSyntax.java
@@ -0,0 +1,19 @@
+package games.rednblack.editor.code.syntax;
+
+import com.badlogic.gdx.graphics.Color;
+import com.kotcrab.vis.ui.util.highlight.Highlighter;
+import games.rednblack.editor.code.GroupRegexHighlightRule;
+
+public class TypingLabelSyntax extends Highlighter {
+
+    public TypingLabelSyntax() {
+        String typingLabelToken = "EASE|ENDEASE|HANG|ENDHANG|JUMP|ENDJUMP|SHAKE|ENDSHAKE|SICK|ENDSICK|SLIDE|ENDSLIDE"
+                + "|WAVE|ENDWAVE|WIND|ENDWIND|RAINBOW|ENDRAINBOW|GRADIENT|ENDGRADIENT|FADE|ENDFADE"
+                + "|BLINK|ENDBLINK|WAIT|SPEED|SLOWER|SLOW|NORMAL|FAST|FASTER|COLOR|CLEARCOLOR|ENDCOLOR"
+                + "|VAR|EVENT|RESET|SKIP";
+        GroupRegexHighlightRule tokenRegex = new GroupRegexHighlightRule("\\{(" + typingLabelToken + ")(=(.*?))?\\}")
+                .colors(Color.valueOf("66CCB3"), Color.valueOf("BED6FF"))
+                .groups(1, 3);
+        addRule(tokenRegex);
+    }
+}
diff --git a/src/main/java/games/rednblack/editor/controller/BootstrapViewCommand.java b/src/main/java/games/rednblack/editor/controller/BootstrapViewCommand.java
index 3b3b0758..8153037e 100644
--- a/src/main/java/games/rednblack/editor/controller/BootstrapViewCommand.java
+++ b/src/main/java/games/rednblack/editor/controller/BootstrapViewCommand.java
@@ -66,6 +66,7 @@ public class BootstrapViewCommand extends SimpleCommand {
         facade.registerMediator(new AboutDialogMediator());
         facade.registerMediator(new SettingsDialogMediator());
         facade.registerMediator(new AutoTraceDialogMediator());
+        facade.registerMediator(new CodeEditorDialogMediator());
 
         facade.registerMediator(new RulersUIMediator());
         facade.registerMediator(new FollowersUIMediator());
diff --git a/src/main/java/games/rednblack/editor/view/ui/dialog/CodeEditorDialog.java b/src/main/java/games/rednblack/editor/view/ui/dialog/CodeEditorDialog.java
new file mode 100644
index 00000000..ae329919
--- /dev/null
+++ b/src/main/java/games/rednblack/editor/view/ui/dialog/CodeEditorDialog.java
@@ -0,0 +1,74 @@
+package games.rednblack.editor.view.ui.dialog;
+
+import com.badlogic.gdx.scenes.scene2d.InputEvent;
+import com.badlogic.gdx.scenes.scene2d.utils.ClickListener;
+import com.kotcrab.vis.ui.util.highlight.Highlighter;
+import com.kotcrab.vis.ui.widget.HighlightTextArea;
+import com.kotcrab.vis.ui.widget.VisTextButton;
+import games.rednblack.editor.HyperLap2DFacade;
+import games.rednblack.editor.view.stage.Sandbox;
+import games.rednblack.h2d.common.H2DDialog;
+import games.rednblack.h2d.common.view.ui.StandardWidgetsFactory;
+
+public class CodeEditorDialog extends H2DDialog {
+
+    private HighlightTextArea textArea;
+    private String notificationCallback;
+
+    public CodeEditorDialog() {
+        super("Code Editor");
+
+        addCloseButton();
+        setResizable(true);
+
+        textArea = new HighlightTextArea("", "code-editor");
+
+        getContentTable().add(textArea.createCompatibleScrollPane()).grow().row();
+
+        VisTextButton cancelButton = StandardWidgetsFactory.createTextButton("Cancel");
+        cancelButton.addListener(new ClickListener() {
+            @Override
+            public void clicked(InputEvent event, float x, float y) {
+                super.clicked(event, x, y);
+                close();
+            }
+        });
+        VisTextButton saveButton = StandardWidgetsFactory.createTextButton("Save");
+        saveButton.addListener(new ClickListener() {
+            @Override
+            public void clicked(InputEvent event, float x, float y) {
+                super.clicked(event, x, y);
+                HyperLap2DFacade.getInstance().sendNotification(notificationCallback, textArea.getText());
+                close();
+            }
+        });
+
+        getButtonsTable().add(cancelButton).width(65).pad(2).right();
+        getButtonsTable().add(saveButton).width(65).pad(2).right();
+        getCell(getButtonsTable()).right();
+    }
+
+    public void setSyntax(Highlighter syntax) {
+        if (syntax != null)
+            textArea.setHighlighter(syntax);
+    }
+
+    public void setText(String text) {
+        if (text != null)
+            textArea.setText(text);
+    }
+
+    public void setNotificationCallback(String notificationCallback) {
+        this.notificationCallback = notificationCallback;
+    }
+
+    @Override
+    public float getPrefWidth() {
+        return Sandbox.getInstance().getUIStage().getWidth() * 0.7f;
+    }
+
+    @Override
+    public float getPrefHeight() {
+        return Sandbox.getInstance().getUIStage().getHeight() * 0.8f;
+    }
+}
diff --git a/src/main/java/games/rednblack/editor/view/ui/dialog/CodeEditorDialogMediator.java b/src/main/java/games/rednblack/editor/view/ui/dialog/CodeEditorDialogMediator.java
new file mode 100644
index 00000000..6107c01b
--- /dev/null
+++ b/src/main/java/games/rednblack/editor/view/ui/dialog/CodeEditorDialogMediator.java
@@ -0,0 +1,55 @@
+package games.rednblack.editor.view.ui.dialog;
+
+import com.kotcrab.vis.ui.util.highlight.Highlighter;
+import com.puremvc.patterns.mediator.SimpleMediator;
+import com.puremvc.patterns.observer.Notification;
+import games.rednblack.editor.HyperLap2DFacade;
+import games.rednblack.editor.view.stage.Sandbox;
+import games.rednblack.editor.view.stage.UIStage;
+import games.rednblack.h2d.common.MsgAPI;
+
+public class CodeEditorDialogMediator extends SimpleMediator<CodeEditorDialog> {
+
+    private static final String TAG = CodeEditorDialogMediator.class.getCanonicalName();
+    private static final String NAME = TAG;
+
+    public CodeEditorDialogMediator() {
+        super(NAME, new CodeEditorDialog());
+    }
+
+    @Override
+    public void onRegister() {
+        super.onRegister();
+        facade = HyperLap2DFacade.getInstance();
+    }
+
+    @Override
+    public String[] listNotificationInterests() {
+        return new String[]{
+                MsgAPI.OPEN_CODE_EDITOR
+        };
+    }
+
+    @Override
+    public void handleNotification(Notification notification) {
+        Sandbox sandbox = Sandbox.getInstance();
+        UIStage uiStage = sandbox.getUIStage();
+        switch (notification.getName()) {
+            case MsgAPI.OPEN_CODE_EDITOR:
+                Object[] payload = notification.getBody();
+                viewComponent.setSyntax((Highlighter) payload[0]);
+                viewComponent.setText((String) payload[1]);
+                viewComponent.setNotificationCallback((String) payload[2]);
+                viewComponent.show(uiStage);
+                break;
+        }
+    }
+
+    public static Object[] openCodeEditorPayload(Highlighter syntax, String text, String notificationCallback) {
+        Object[] payload = new Object[3];
+        payload[0] = syntax;
+        payload[1] = text;
+        payload[2] = notificationCallback;
+        return payload;
+    }
+}
diff --git a/src/main/java/games/rednblack/editor/view/ui/properties/panels/UILabelItemProperties.java b/src/main/java/games/rednblack/editor/view/ui/properties/panels/UILabelItemProperties.java
index 7cdd3c07..528b6372 100644
--- a/src/main/java/games/rednblack/editor/view/ui/properties/panels/UILabelItemProperties.java
+++ b/src/main/java/games/rednblack/editor/view/ui/properties/panels/UILabelItemProperties.java
@@ -9,9 +9,11 @@ import com.kotcrab.vis.ui.widget.*;
 import com.kotcrab.vis.ui.widget.spinner.IntSpinnerModel;
 import com.kotcrab.vis.ui.widget.spinner.Spinner;
 import games.rednblack.editor.HyperLap2DFacade;
+import games.rednblack.editor.code.syntax.TypingLabelSyntax;
 import games.rednblack.editor.event.*;
 import games.rednblack.h2d.common.view.ui.StandardWidgetsFactory;
 import games.rednblack.editor.view.ui.properties.UIItemCollapsibleProperties;
+import games.rednblack.editor.view.ui.widget.actors.ExpandableTextArea;
 
 /**
  * Created by azakhary on 4/24/15.
@@ -21,6 +23,7 @@ public class UILabelItemProperties extends UIItemCollapsibleProperties {
     public static final String prefix = "games.rednblack.editor.view.ui.properties.panels.UILabelItemProperties";
 
     public static final String LABEL_TEXT_CHAR_TYPED = prefix + ".LABEL_TEXT_CHANGED";
+    public static final String LABEL_TEXT_EXPAND_SAVED = prefix + ".LABEL_TEXT_EXPAND_SAVED";
 
     private HashMap<Integer, String> alignMap = new HashMap<>();
     private Array<String> alignNames = new Array<>();
@@ -50,7 +53,9 @@ public class UILabelItemProperties extends UIItemCollapsibleProperties {
         alignSelectBox.setMaxListCount(10);
 
         VisTable textEditTable = new VisTable();
-        textArea = StandardWidgetsFactory.createTextArea();
+        ExpandableTextArea textAreaTable = new ExpandableTextArea(facade, LABEL_TEXT_EXPAND_SAVED);
+        textAreaTable.setSyntax(new TypingLabelSyntax());
+        textArea = textAreaTable.getTextArea();
 
         mainTable.add(StandardWidgetsFactory.createLabel("Font Family", Align.right)).padRight(5).width(90).left();
         mainTable.add(fontFamilySelectBox).width(90).padRight(5);
@@ -74,7 +79,7 @@ public class UILabelItemProperties extends UIItemCollapsibleProperties {
         mainTable.add(wrapCheckBox).padRight(5);
         mainTable.row().padTop(5);
 
-        textEditTable.add(textArea).width(200).height(65);
+        textEditTable.add(textAreaTable).width(200);
 
         setListeners();
         setAlignList();
@@ -97,11 +102,11 @@ public class UILabelItemProperties extends UIItemCollapsibleProperties {
     }
 
     public String getText() {
-        return textArea.getText().replace("\\n", "\n");
+        return textArea.getText();
     }
 
     public void setText(String text) {
-        textArea.setText(text.replace("\n", "\\n"));
+        textArea.setText(text);
     }
 
     public void setWrap(boolean wrap) {
@@ -185,15 +190,5 @@ public class UILabelItemProperties extends UIItemCollapsibleProperties {
         wrapCheckBox.addListener(new CheckBoxChangeListener(eventName));
         fontSizeField.addListener(new NumberSelectorOverlapListener(eventName));
         textArea.addListener(new KeyboardListener(eventName));
-//        textArea.addListener(textArea.new TextAreaListener() {
-//            @Override
-//            public boolean keyTyped(InputEvent event, char character) {
-//                facade.sendNotification(LABEL_TEXT_CHAR_TYPED, null);
-//                return true;//super.keyTyped(event, character);
-//            }
-//        });
-
     }
-
-
 }
diff --git a/src/main/java/games/rednblack/editor/view/ui/properties/panels/UILabelItemPropertiesMediator.java b/src/main/java/games/rednblack/editor/view/ui/properties/panels/UILabelItemPropertiesMediator.java
index 5261de1f..a27ac4d0 100644
--- a/src/main/java/games/rednblack/editor/view/ui/properties/panels/UILabelItemPropertiesMediator.java
+++ b/src/main/java/games/rednblack/editor/view/ui/properties/panels/UILabelItemPropertiesMediator.java
@@ -23,25 +23,6 @@ public class UILabelItemPropertiesMediator extends UIItemPropertiesMediator<Enti
         super(NAME, new UILabelItemProperties());
     }
 
-    @Override
-    public String[] listNotificationInterests() {
-        final String[] parentInterests = super.listNotificationInterests();
-        return ArrayUtils.add(parentInterests, UILabelItemProperties.LABEL_TEXT_CHAR_TYPED);
-    }
-
-    @Override
-    public void handleNotification(Notification notification) {
-        super.handleNotification(notification);
-        if(notification.getName().equals(UILabelItemProperties.LABEL_TEXT_CHAR_TYPED)) {
-            onTextChange();
-        }
-    }
-
-    private void onTextChange() {
-        LabelComponent labelComponent = ComponentRetriever.get(observableReference, LabelComponent.class);
-        labelComponent.setText(viewComponent.getText());
-    }
-
     @Override
     public void onRegister() {
         facade = HyperLap2DFacade.getInstance();
@@ -51,6 +32,37 @@ public class UILabelItemPropertiesMediator extends UIItemPropertiesMediator<Enti
         lockUpdates = false;
     }
 
+    @Override
+    public String[] listNotificationInterests() {
+        String[] defaultNotifications = super.listNotificationInterests();
+        String[] notificationInterests = new String[]{
+                UILabelItemProperties.LABEL_TEXT_CHAR_TYPED,
+                UILabelItemProperties.LABEL_TEXT_EXPAND_SAVED
+        };
+
+        return ArrayUtils.addAll(defaultNotifications, notificationInterests);
+    }
+
+    @Override
+    public void handleNotification(Notification notification) {
+        super.handleNotification(notification);
+
+        switch (notification.getName()) {
+            case UILabelItemProperties.LABEL_TEXT_CHAR_TYPED:
+                onTextChange();
+                break;
+            case UILabelItemProperties.LABEL_TEXT_EXPAND_SAVED:
+                viewComponent.setText(notification.getBody());
+                facade.sendNotification(viewComponent.getUpdateEventName());
+                break;
+        }
+    }
+
+    private void onTextChange() {
+        LabelComponent labelComponent = ComponentRetriever.get(observableReference, LabelComponent.class);
+        labelComponent.setText(viewComponent.getText());
+    }
+
     @Override
     protected void translateObservableDataToView(Entity item) {
         LabelComponent labelComponent = ComponentRetriever.get(item, LabelComponent.class);
diff --git a/src/main/java/games/rednblack/editor/view/ui/widget/actors/ExpandableTextArea.java b/src/main/java/games/rednblack/editor/view/ui/widget/actors/ExpandableTextArea.java
new file mode 100644
index 00000000..9479e71c
--- /dev/null
+++ b/src/main/java/games/rednblack/editor/view/ui/widget/actors/ExpandableTextArea.java
@@ -0,0 +1,56 @@
+package games.rednblack.editor.view.ui.widget.actors;
+
+import com.badlogic.gdx.scenes.scene2d.InputEvent;
+import com.badlogic.gdx.scenes.scene2d.utils.ClickListener;
+import com.kotcrab.vis.ui.util.highlight.Highlighter;
+import com.kotcrab.vis.ui.widget.VisImageButton;
+import com.kotcrab.vis.ui.widget.VisTable;
+import com.kotcrab.vis.ui.widget.VisTextArea;
+import com.puremvc.patterns.facade.SimpleFacade;
+import games.rednblack.editor.view.ui.dialog.CodeEditorDialogMediator;
+import games.rednblack.h2d.common.MsgAPI;
+import games.rednblack.h2d.common.view.ui.StandardWidgetsFactory;
+
+public class ExpandableTextArea extends VisTable {
+    public interface OnExpandListener {
+        void onExpand(VisTextArea textArea);
+    }
+
+    private SimpleFacade facade;
+
+    private OnExpandListener listener;
+    private VisTextArea textArea;
+    private VisImageButton expandButton;
+
+    private Highlighter syntax;
+
+    public ExpandableTextArea(SimpleFacade facade, String notificationCallback) {
+        this.facade = facade;
+
+        textArea = StandardWidgetsFactory.createTextArea();
+        add(textArea).growX().fillX().height(65);
+        row();
+        expandButton = StandardWidgetsFactory.createImageButton("expand-button");
+        expandButton.addListener(new ClickListener() {
+            @Override
+            public void clicked(InputEvent event, float x, float y) {
+                facade.sendNotification(MsgAPI.OPEN_CODE_EDITOR, CodeEditorDialogMediator.openCodeEditorPayload(syntax, textArea.getText(), notificationCallback));
+                if (listener != null)
+                    listener.onExpand(textArea);
+            }
+        });
+        add(expandButton).right().pad(5);
+    }
+
+    public void setExpandListener(OnExpandListener listener) {
+        this.listener = listener;
+    }
+
+    public void setSyntax(Highlighter syntax) {
+        this.syntax = syntax;
+    }
+
+    public VisTextArea getTextArea() {
+        return textArea;
+    }
+}