diff --git a/source/Ox.UI/js/Bar/Progressbar.js b/source/Ox.UI/js/Bar/Progressbar.js
index 4ebdcf17..7cd4a99f 100644
--- a/source/Ox.UI/js/Bar/Progressbar.js
+++ b/source/Ox.UI/js/Bar/Progressbar.js
@@ -3,6 +3,11 @@
 /*@
 Ox.Progressbar <f> Progress Bar
     ([options[, self]]) -> <o:Ox.Element> Progress Bar
+        cancel <!> cancelled
+        complete <!> completed
+        pause <!> paused
+        restart <!> restart
+        resume <!> resumed
     options <o|{}> Options object
         cancelled <b|false> If true, progress bar is cancelled
         paused <b|false> If true, progress bar is paused
@@ -15,10 +20,6 @@ Ox.Progressbar <f> Progress Bar
         showTooltips <b|false> If true, buttons have tooltips
         width <n|256> Width in px
     self <o|{}> Shared private variable
-    cancel <!> cancelled
-    complete <!> completed
-    pause <!> paused
-    resume <!> resumed
 @*/
 
 Ox.Progressbar = function(options, self) {
diff --git a/source/Ox.UI/js/Calendar/Calendar.js b/source/Ox.UI/js/Calendar/Calendar.js
index cdf91a63..8be40977 100644
--- a/source/Ox.UI/js/Calendar/Calendar.js
+++ b/source/Ox.UI/js/Calendar/Calendar.js
@@ -3,6 +3,7 @@
 /*@
 Ox.Calendar <f> Basic calendar object
     ([options[, self]]) -> <o:Ox.Element> Calendar object
+        select <!> select
     options <o> Options object
         date    <d|new Date()> UTC Date on which the calendar is centered
         events  <[o]|[]> Event objects to be displayed
diff --git a/source/Ox.UI/js/Calendar/CalendarEditor.js b/source/Ox.UI/js/Calendar/CalendarEditor.js
index 31b35e25..c2b11bd0 100644
--- a/source/Ox.UI/js/Calendar/CalendarEditor.js
+++ b/source/Ox.UI/js/Calendar/CalendarEditor.js
@@ -5,6 +5,7 @@ Ox.CalendarEditor <f> Calendar Editor
     ([options[, self]]) -> <o:Ox.SplitPanel> Calendar Editor
     options <o> Options
     self <o> Shared private variable
+    loadlist <!> loadlist
 @*/
 
 Ox.CalendarEditor = function(options, self) {
diff --git a/source/Ox.UI/js/Code/DocPage.js b/source/Ox.UI/js/Code/DocPage.js
index 743bf1ed..0fcfa94e 100644
--- a/source/Ox.UI/js/Code/DocPage.js
+++ b/source/Ox.UI/js/Code/DocPage.js
@@ -3,6 +3,7 @@
 /*@
 Ox.DocPage <f> DocPage
     ([options[, self]]) -> <o:Ox.SplitPanel> DocPage object
+        example <!> example
     options <o> Options object
         item <o> doc item
         replace <[[]]|[]> See Ox.SyntaxHighlighter
diff --git a/source/Ox.UI/js/Code/DocPanel.js b/source/Ox.UI/js/Code/DocPanel.js
index f1060577..1cb43b6a 100644
--- a/source/Ox.UI/js/Code/DocPanel.js
+++ b/source/Ox.UI/js/Code/DocPanel.js
@@ -3,6 +3,11 @@
 /*@
 Ox.DocPanel <f> Documentation Panel
     ([options[, self]]) -> <o:Ox.SplitPanel> Documentation Panel
+        load <!> Fires once all docs are loaded
+            items [o] Array of doc items
+        tests <!> Fires once all tests finished
+            results [o] Array of results
+        select <!> select
     options <o> Options object
             collapsible <b|false> If true, the list can be collabsed
             element <e> Default content
@@ -21,8 +26,6 @@ Ox.DocPanel <f> Documentation Panel
             showTooltips <b|false> If true, show test result tooltips in list
             size <s|256> Default list size
     self <o> Shared private variable
-    load <!> Fires once all docs are loaded
-        items [o] Array of doc items
 @*/
 
 Ox.DocPanel = function(options, self) {
diff --git a/source/Ox.UI/js/Code/ExamplePanel.js b/source/Ox.UI/js/Code/ExamplePanel.js
index 28d25213..9d3b0e4d 100644
--- a/source/Ox.UI/js/Code/ExamplePanel.js
+++ b/source/Ox.UI/js/Code/ExamplePanel.js
@@ -3,6 +3,9 @@
 /*@
 Ox.ExamplePanel <f> Example Panel
     ([options[, self]]) -> <o:Ox.SplitPanel> Example Panel
+        load <!> load
+        select <!> select
+            id <s> selected example
     options <o> Options
     self <o> Shared private variable
 @*/
diff --git a/source/Ox.UI/js/Core/App.js b/source/Ox.UI/js/Core/App.js
index 1300c4d3..7452b882 100644
--- a/source/Ox.UI/js/Core/App.js
+++ b/source/Ox.UI/js/Core/App.js
@@ -3,12 +3,12 @@
 /*@
 Ox.App <f> Basic application instance that communicates with a JSON API
     ([options]) -> <o> App object
+        load <!>    app loaded
     options <o> Options object
         timeout <n> request timeout
         type    <s> HTTP Request type, i.e. 'GET' or 'POST'
         url     <s> JSON API url
     self <o>    Shared private variable
-    load <!>    app loaded
 @*/
 
 Ox.App = function(options) {
@@ -24,6 +24,7 @@ Ox.App = function(options) {
         },
         that = Ox.Element({}, Ox.extend({}, self));
 
+    //@ api <o> api endpoint
     that.api = Ox.API({
         type: self.options.type,
         timeout: self.options.timeout,
@@ -37,6 +38,7 @@ Ox.App = function(options) {
         });
     });
 
+    //@ localStorage <f> Ox.localStorage instance
     that.localStorage = Ox.localStorage(self.options.name);
 
     function getUserData() {
diff --git a/source/Ox.UI/js/Form/ArrayEditable.js b/source/Ox.UI/js/Form/ArrayEditable.js
index cfe70e49..0682e31e 100644
--- a/source/Ox.UI/js/Form/ArrayEditable.js
+++ b/source/Ox.UI/js/Form/ArrayEditable.js
@@ -3,6 +3,18 @@
 /*@
 Ox.ArrayEditable <f> Array Editable
     ([options[, self]]) -> <o:Ox.Element> Array Editable
+        add <!> add
+        blur <!> blur
+        change <!> change
+        delete <!> delete
+        edit <!> edit
+        insert <!> insert
+        open <!> open
+        selectafter <!> selectafter
+        selectbefore <!> selectbefore
+        selectnone <!> selectnone
+        select <!> select
+        submit <!> submit
     options <o> Options object
     self <o>    Shared private variable
 @*/
diff --git a/source/Ox.UI/js/Form/ArrayInput.js b/source/Ox.UI/js/Form/ArrayInput.js
index b5b9dd09..04f8c4cb 100644
--- a/source/Ox.UI/js/Form/ArrayInput.js
+++ b/source/Ox.UI/js/Form/ArrayInput.js
@@ -10,6 +10,7 @@ Ox.ArrayInput <f> Array input
         value       <[]>    value
         width       <n|256> width
     self <o>    Shared private variable
+    change <!> change
 @*/
 
 Ox.ArrayInput = function(options, self) {
diff --git a/source/Ox.UI/js/Form/ButtonGroup.js b/source/Ox.UI/js/Form/ButtonGroup.js
index d4fcb58b..1c426d50 100644
--- a/source/Ox.UI/js/Form/ButtonGroup.js
+++ b/source/Ox.UI/js/Form/ButtonGroup.js
@@ -122,10 +122,16 @@ Ox.ButtonGroup = function(options, self) {
         }
     }
 
+    /*@
+    disableButton <f> disableButton
+    @*/
     that.disableButton = function(id) {
         getButtonById(id).options({disabled: true});
     };
 
+    /*@
+    enableButton <f> enableButton
+    @*/
     that.enableButton = function(id) {
         getButtonById(id).options({disabled: false});
     };
diff --git a/source/Ox.UI/js/Form/Checkbox.js b/source/Ox.UI/js/Form/Checkbox.js
index 5277095f..f8e20b01 100644
--- a/source/Ox.UI/js/Form/Checkbox.js
+++ b/source/Ox.UI/js/Form/Checkbox.js
@@ -3,6 +3,7 @@
 /*@
 Ox.Checkbox <f> Checkbox Element
     ([options[, self]]) -> <o:Ox.Element> Checkbox Element
+        change <!> triggered when value changes
     options <o> Options object
         disabled <b> if true, checkbox is disabled
         group <b> if true, checkbox is part of a group
@@ -12,7 +13,6 @@ Ox.Checkbox <f> Checkbox Element
         value <b> if true, checkbox is checked
         width <n> width in px
     self <o>    Shared private variable
-    change <!> triggered when value changes
 @*/
 
 Ox.Checkbox = function(options, self) {
diff --git a/source/Ox.UI/js/Form/CheckboxGroup.js b/source/Ox.UI/js/Form/CheckboxGroup.js
index ba48427f..01abeb2c 100644
--- a/source/Ox.UI/js/Form/CheckboxGroup.js
+++ b/source/Ox.UI/js/Form/CheckboxGroup.js
@@ -3,6 +3,8 @@
 /*@
 Ox.CheckboxGroup <f> CheckboxGroup Object
     ([options[, self]]) -> <o:Ox.Element> CheckboxGroup Object
+        change <!> triggered when checked property changes
+                   passes {id, title, value}
     options <o> Options object
         checkboxes      <a|[]>      array of checkboxes
         max             <n|1>       max selected
@@ -10,8 +12,6 @@ Ox.CheckboxGroup <f> CheckboxGroup Object
         type            <s|"group"> type ("group" or "list")    
         width           <n>         width in px
     self    <o> shared private variable
-    change <!> triggered when checked property changes
-               passes {id, title, value}
 @*/
 
 Ox.CheckboxGroup = function(options, self) {
diff --git a/source/Ox.UI/js/Form/ColorInput.js b/source/Ox.UI/js/Form/ColorInput.js
index 0750bb8c..78028802 100644
--- a/source/Ox.UI/js/Form/ColorInput.js
+++ b/source/Ox.UI/js/Form/ColorInput.js
@@ -3,6 +3,7 @@
 /*@
 Ox.ColorInput <f> ColorInput Element
     ([options[, self]]) -> <o:Ox.InputGroup> ColorInput Element
+        change <!> change
     options <o> Options object
         mode <s|'rgb'> Mode ('rgb' or 'hsl')
         value <[n]|[0, 0, 0]> Value
diff --git a/source/Ox.UI/js/Form/ColorPicker.js b/source/Ox.UI/js/Form/ColorPicker.js
index 8ebdd1f8..a08fd948 100644
--- a/source/Ox.UI/js/Form/ColorPicker.js
+++ b/source/Ox.UI/js/Form/ColorPicker.js
@@ -3,11 +3,11 @@
 /*@
 Ox.ColorPicker <f> ColorPicker Element
     ([options[, self]]) -> <o:Ox.Picker> ColorPicker Element
+        change <!> triggered on change of value
     options <o> Options object
         mode <s|'rgb'> Mode ('rgb' or 'hsl')
         value <[n]|[0, 0, 0]> Value
     self <o>    Shared private variable
-    change <!> triggered on change of value
 @*/
 
 Ox.ColorPicker = function(options, self) {
diff --git a/source/Ox.UI/js/Form/DateInput.js b/source/Ox.UI/js/Form/DateInput.js
index ca95edf1..531b2690 100644
--- a/source/Ox.UI/js/Form/DateInput.js
+++ b/source/Ox.UI/js/Form/DateInput.js
@@ -3,6 +3,7 @@
 /*@
 Ox.DateInput <f> DateInput Element
     ([options[, self]]) -> <o:Ox.InputGroup> DateInput Element
+        change <!> triggered on change of value
     options <o> Options object
         format <s|short> format can be short, medium, long
         value <d> date value, defaults to current date
@@ -13,7 +14,6 @@ Ox.DateInput <f> DateInput Element
             weekday <n> width of weekday input element
             year <n> width of year input element
     self <o>    Shared private variable
-    change <!> triggered on change of value
 @*/
 Ox.DateInput = function(options, self) {
 
diff --git a/source/Ox.UI/js/Form/DateTimeInput.js b/source/Ox.UI/js/Form/DateTimeInput.js
index 9069e1e1..2f9e6eff 100644
--- a/source/Ox.UI/js/Form/DateTimeInput.js
+++ b/source/Ox.UI/js/Form/DateTimeInput.js
@@ -3,6 +3,7 @@
 /*@
 Ox.DateTimeInput <f> DateTimeInput Element
     ([options[, self]]) -> <o:Ox.InputGroup> DateTimeInput Element
+        change <!> triggered on change of value
     options <o> Options object
         ampm <b|false> false is 24h true is am/pm
         format <s|short> options are short, medium, long
@@ -10,7 +11,6 @@ Ox.DateTimeInput <f> DateTimeInput Element
         value <d> defautls to now
         weekday <b|false> weekday
     self <o>    Shared private variable
-    change <!> triggered on change of value
 @*/
 
 Ox.DateTimeInput = function(options, self) {
diff --git a/source/Ox.UI/js/Form/Editable.js b/source/Ox.UI/js/Form/Editable.js
index 12f6a69f..9e2348d9 100644
--- a/source/Ox.UI/js/Form/Editable.js
+++ b/source/Ox.UI/js/Form/Editable.js
@@ -3,6 +3,11 @@
 /*@
 Ox.Editable <f> Editable element
     ([options[, self]]) -> <o:Ox.Element> Input Element
+        blur <!> blur
+        cancel <!> cancel
+        edit <!> edit
+        open <!> open
+        submit <!> submit
     options <o> Options object
         editing <b|false> If true, loads in editing state
         format <f|null> Format function
@@ -257,6 +262,9 @@ Ox.Editable = function(options, self) {
         that.triggerEvent('submit', {value: self.options.value});
     }
 
+    /*@
+    css <f> css
+    @*/
     that.css = function(css) {
         self.css = css;
         that.$element.css(css);
diff --git a/source/Ox.UI/js/Form/FileButton.js b/source/Ox.UI/js/Form/FileButton.js
index 7136a2f3..0a1815df 100644
--- a/source/Ox.UI/js/Form/FileButton.js
+++ b/source/Ox.UI/js/Form/FileButton.js
@@ -3,6 +3,7 @@
 /*@
 Ox.FileButton <f> File Button
     ([options[, self]]) -> <o:Ox.Element> File Button
+        click <!> click
     options <o> Options
     self <o> Shared private variable
 @*/
diff --git a/source/Ox.UI/js/Form/FileInput.js b/source/Ox.UI/js/Form/FileInput.js
index 222b98ec..0194acc3 100644
--- a/source/Ox.UI/js/Form/FileInput.js
+++ b/source/Ox.UI/js/Form/FileInput.js
@@ -3,6 +3,7 @@
 /*@
 Ox.FileInput <f> File Input
     ([options[, self]]) -> <o:Ox.Element> File Input
+        change <!> change
     options <o> Options
     self <o> Shared private variable
 @*/
diff --git a/source/Ox.UI/js/Form/Filter.js b/source/Ox.UI/js/Form/Filter.js
index c364eeed..8f7d68cd 100644
--- a/source/Ox.UI/js/Form/Filter.js
+++ b/source/Ox.UI/js/Form/Filter.js
@@ -3,6 +3,7 @@
 /*@
 Ox.Filter <f> Filter Object
     ([options[, self]]) -> <o:Ox.Element> Filter Object
+        change <!> change
     options <o> Options object
         findKeys <[]|[]> keys
         list <o> list object
diff --git a/source/Ox.UI/js/Form/Form.js b/source/Ox.UI/js/Form/Form.js
index 8e6bdbc0..65a0018d 100644
--- a/source/Ox.UI/js/Form/Form.js
+++ b/source/Ox.UI/js/Form/Form.js
@@ -3,6 +3,9 @@
 /*@
 Ox.Form <f> Form Object
     ([options[, self]]) -> <o:Ox.Element> Form Object
+        change <!> change
+        validate <!> validate
+        submit <!> submit
     options <o> Options object
         error  <s> error
         id     <s> id
diff --git a/source/Ox.UI/js/Form/FormElementGroup.js b/source/Ox.UI/js/Form/FormElementGroup.js
index a87af1ae..988fd11c 100644
--- a/source/Ox.UI/js/Form/FormElementGroup.js
+++ b/source/Ox.UI/js/Form/FormElementGroup.js
@@ -3,6 +3,9 @@
 /*@
 Ox.FormElementGroup <f> FormElementGroup Element
     ([options[, self]]) -> <o:Ox.Element> FormElementGroup Element
+        autovalidate <!> autovalidate
+        change <!> change
+        validate <!> validate
     options <o> Options object
         id <s> element id
         elements <[o:Ox.Element]|[]> elements in group
diff --git a/source/Ox.UI/js/Form/FormPanel.js b/source/Ox.UI/js/Form/FormPanel.js
index 93f4cb39..187de87f 100644
--- a/source/Ox.UI/js/Form/FormPanel.js
+++ b/source/Ox.UI/js/Form/FormPanel.js
@@ -3,6 +3,8 @@
 /*@
 Ox.FormPanel <f> Form Panel
     ([options[, self]]) -> <o:Ox.Element> Form Panel
+        change <!> change
+        validate <!> validate
     options <o> Options
     self <o> Shared private variable
 @*/
diff --git a/source/Ox.UI/js/Form/Input.js b/source/Ox.UI/js/Form/Input.js
index 827c08ae..c4729d5a 100644
--- a/source/Ox.UI/js/Form/Input.js
+++ b/source/Ox.UI/js/Form/Input.js
@@ -3,6 +3,16 @@
 /*@
 Ox.Input <f> Input Element
     ([options[, self]]) -> <o:Ox.Element> Input Element
+        autocomplete <!> autocomplete
+        autovalidate <!> autovalidate
+        blur <!> blur
+        cancel <!> cancel
+        change <!> input changed event
+        clear <!> clear
+        focus <!> focus
+        insert <!> insert
+        submit <!> input submit event
+        validate <!> validate
     options <o> Options object
         arrows                      <b> if true, and type is 'float' or 'int', display arrows
         arrowStep                   <n> step when clicking arrows
@@ -56,8 +66,6 @@ Ox.Input <f> Input Element
         validate                    <f> remote validation
         width                       <n> px
 
-    change <!> input changed event
-    submit <!> input submit event
 @*/
 
 Ox.Input = function(options, self) {
diff --git a/source/Ox.UI/js/Form/InputGroup.js b/source/Ox.UI/js/Form/InputGroup.js
index a0b51353..c17b5ea5 100644
--- a/source/Ox.UI/js/Form/InputGroup.js
+++ b/source/Ox.UI/js/Form/InputGroup.js
@@ -3,6 +3,8 @@
 /*@
 Ox.InputGroup <f> InputGroup Object
     ([options[, self]]) -> <o:Ox.Element> InputGroup Object
+        change <!> change
+        validate <!> validate
     options <o> Options object
         id     <s|''> id
         inputs <a|[]> inputs
diff --git a/source/Ox.UI/js/Form/ObjectArrayInput.js b/source/Ox.UI/js/Form/ObjectArrayInput.js
index ce5009ce..e0890e10 100644
--- a/source/Ox.UI/js/Form/ObjectArrayInput.js
+++ b/source/Ox.UI/js/Form/ObjectArrayInput.js
@@ -3,6 +3,7 @@
 /*@
 Ox.ObjectArrayInput <f> Object Array Input
     ([options[, self]]) -> <o:Ox.Element> Object Array Input
+        change <!> change
     options <o> Options
         buttonTitles
         inputs
diff --git a/source/Ox.UI/js/Form/ObjectInput.js b/source/Ox.UI/js/Form/ObjectInput.js
index 68b401a9..004e041e 100644
--- a/source/Ox.UI/js/Form/ObjectInput.js
+++ b/source/Ox.UI/js/Form/ObjectInput.js
@@ -3,6 +3,7 @@
 /*@
 Ox.ObjectInput <f> Object Input
     ([options[, self]]) -> <o:Ox.Element> Object Input
+        change <!> change
     options <o> Options
     self <o> Shared private variable
 @*/
diff --git a/source/Ox.UI/js/Form/Picker.js b/source/Ox.UI/js/Form/Picker.js
index 82e192f8..4af82bd0 100644
--- a/source/Ox.UI/js/Form/Picker.js
+++ b/source/Ox.UI/js/Form/Picker.js
@@ -3,14 +3,14 @@
 /*@
 Ox.Picker <f> Picker Object
     ([options[, self]]) -> <o:Ox.Element> Picker Object
+        show <!> picker is shown
+        hide <!> picker is hidden
     options <o> Options object
         element <o|null> picker element
         elementHeight <n|128> height
         elemementWidth <n|256> width
         id <s> picker id
         overlap <s|none> select button overlap value
-    show <!> picker is shown
-    hide <!> picker is hidden
 @*/
 
 Ox.Picker = function(options, self) {
diff --git a/source/Ox.UI/js/Form/Range.js b/source/Ox.UI/js/Form/Range.js
index e8ab77d7..6d69ed5d 100644
--- a/source/Ox.UI/js/Form/Range.js
+++ b/source/Ox.UI/js/Form/Range.js
@@ -3,6 +3,7 @@
 /*@
 Ox.Range <f> Range Object
     ([options[, self]]) -> <o:Ox.Element> Range Object
+        change <!> triggered on change of the range
     options <o> Options object
         arrows        <b>          if true, show arrows
         arrowStep     <n>          step when clicking arrows
@@ -22,7 +23,6 @@ Ox.Range <f> Range Object
         value         <n>          initial value
         values        <[s]>        values to display on thumb
     self    <o> shared private variable
-    change <!> triggered on change of the range
 @*/
 
 Ox.Range = function(options, self) {
diff --git a/source/Ox.UI/js/Form/Select.js b/source/Ox.UI/js/Form/Select.js
index 24f43289..cbf456e0 100644
--- a/source/Ox.UI/js/Form/Select.js
+++ b/source/Ox.UI/js/Form/Select.js
@@ -3,6 +3,8 @@
 /*@
 Ox.Select <f> Select Object
     ([options[, self]) -> <o:Ox.Element> Select Object
+        click <!> Click event
+        change <!> Change event
     options <o> Options object
         disabled <b|false> If true, select is disabled
         id <s> Element id
@@ -24,8 +26,6 @@ Ox.Select <f> Select Object
         value <a|s> Selected id, or array of selected ids
         width <s|n|'auto'> Width in px, or 'auto'
     self <o> Shared private variable
-    click <!> Click event
-    change <!> Change event
 @*/
 
 Ox.Select = function(options, self) {
diff --git a/source/Ox.UI/js/Form/Spreadsheet.js b/source/Ox.UI/js/Form/Spreadsheet.js
index 2947f61b..018a363f 100644
--- a/source/Ox.UI/js/Form/Spreadsheet.js
+++ b/source/Ox.UI/js/Form/Spreadsheet.js
@@ -3,6 +3,7 @@
 /*@
 Ox.Spreadsheet <f> Spreadsheet
     ([options[, self]]) -> <o:Ox.Element> Spreadsheet
+        change <!> change
     options <o> Options
     self <o> Shared private variable
 @*/
diff --git a/source/Ox.UI/js/List/List.js b/source/Ox.UI/js/List/List.js
index 56c96149..f204e502 100644
--- a/source/Ox.UI/js/List/List.js
+++ b/source/Ox.UI/js/List/List.js
@@ -23,6 +23,7 @@ Ox.List <f> List constructor
         unique <s|''> name of the key that acts as unique id
     self <o> shared private variable
     ([options[, self]]) -> <o:Ox.Container> List object
+        init <!> init
         add <!> item added
         delete <!> item removed
         draganddrop <!> Fires during drag
@@ -38,6 +39,9 @@ Ox.List <f> List constructor
         openpreview <!> preview of selected item opened
         closepreview <!> preview closed
         select <!> select item
+        selectafter <!> selectafter
+        selectbefore <!> selectbefore
+        toggle <!> toggle
 @*/
 
 // fixme: rename the add event to new, or the delete event to remove
diff --git a/source/Ox.UI/js/List/ListItem.js b/source/Ox.UI/js/List/ListItem.js
index 128988c2..53891f99 100644
--- a/source/Ox.UI/js/List/ListItem.js
+++ b/source/Ox.UI/js/List/ListItem.js
@@ -3,6 +3,8 @@
 /*@
 Ox.ListItem <f> ListItem Object
     ([options[, self]]) -> <o:Ox.Element> ListItem Object
+        cancel <!> triggered if cancel button is pressed
+        save <!> triggered if save button is pressed
     options <o> Options object
         construct <f> construct function
         data <o|{}> item data
@@ -10,8 +12,6 @@ Ox.ListItem <f> ListItem Object
         position <n|0> item position
         unique <s|''> unique key
     self    <o> shared private variable
-    cancel <!> triggered if cancel button is pressed
-    save <!> triggered if save button is pressed
 @*/
 
 Ox.ListItem = function(options, self) {
diff --git a/source/Ox.UI/js/List/TextList.js b/source/Ox.UI/js/List/TextList.js
index dd835473..6d86afde 100644
--- a/source/Ox.UI/js/List/TextList.js
+++ b/source/Ox.UI/js/List/TextList.js
@@ -36,6 +36,8 @@ Ox.TextList <f> TextList Object
         sort <[o]|[s]|[]> ['+foo', ...] or [{key: 'foo', operator: '+'}, ...]
         sortable <b|false> If true, elements can be re-ordered
         sums <[s]|[]> Sums to be included in totals
+        columnresize <!> columnresize
+        columnchange <!> columnchange
     self    <o> shared private variable
 @*/
 
diff --git a/source/Ox.UI/js/Map/Map.js b/source/Ox.UI/js/Map/Map.js
index 978109d2..160a150a 100644
--- a/source/Ox.UI/js/Map/Map.js
+++ b/source/Ox.UI/js/Map/Map.js
@@ -73,8 +73,12 @@ Ox.Map <f> Basic map object
                             lat <n> Latitude
                             lng <n> Longitude
                 types <[s]> Types (like "country" or "political")
+        load <!> load
+        select <!> select
         selectplace <!> Fires when a place has been selected or deselected
             place <o> Place object
+        togglecontrols <!> togglecontrols
+        togglelabels <!> togglelabels
 @*/
 
 Ox.Map = function(options, self) {
diff --git a/source/Ox.UI/js/Map/MapEditor.js b/source/Ox.UI/js/Map/MapEditor.js
index 89135980..71a67694 100644
--- a/source/Ox.UI/js/Map/MapEditor.js
+++ b/source/Ox.UI/js/Map/MapEditor.js
@@ -3,6 +3,10 @@
 /*@
 Ox.MapEditor <f> Map Editor
     ([options[, self]]) -> <o:Ox.SplitPanel> Map Editor
+        addplace <!> addplace
+        removeplace <!> removeplace
+        geocode <!> geocode
+        loadlist <!> loadlist
     options <o> Options object
         height <n|256> Height in px
         labels <b|false> If true, show labels
diff --git a/source/Ox.UI/js/Menu/Menu.js b/source/Ox.UI/js/Menu/Menu.js
index 9967becb..05da67ee 100644
--- a/source/Ox.UI/js/Menu/Menu.js
+++ b/source/Ox.UI/js/Menu/Menu.js
@@ -3,6 +3,16 @@
 /*@
 Ox.Menu <f> Menu Object
     ([options[, self]]) -> <o:Ox.Element> Menu Object
+        change_groupId  <!>  {id, value}     checked item of a group has changed
+        click_itemId    <!>                    item not belonging to a group was clicked
+        click_menuId    <!>    {id, value}     item not belonging to a group was clicked
+        deselect_menuId <!> {id, value}     item was deselected                             not needed, not implemented
+        hide_menuId     <!>                     menu was hidden
+        select_menuId   <!>   {id, value}     item was selected
+        click <!> click
+        change <!> change
+        select <!> select
+        deselect <!> deselect
     options <o> Options object
         element  <o>         the element the menu is attached to
         id       <s>        the menu id
@@ -16,12 +26,6 @@ Ox.Menu <f> Menu Object
         side     <s>       open to 'bottom' or 'right'
         size     <s>       'large', 'medium' or 'small'
     self    <o> shared private variable
-    change_groupId  <!>  {id, value}     checked item of a group has changed
-    click_itemId    <!>                    item not belonging to a group was clicked
-    click_menuId    <!>    {id, value}     item not belonging to a group was clicked
-    deselect_menuId <!> {id, value}     item was deselected                             not needed, not implemented
-    hide_menuId     <!>                     menu was hidden
-    select_menuId   <!>   {id, value}     item was selected
 @*/
 
 Ox.Menu = function(options, self) {
diff --git a/source/Ox.UI/js/Menu/MenuButton.js b/source/Ox.UI/js/Menu/MenuButton.js
index 9377dab5..90b80571 100644
--- a/source/Ox.UI/js/Menu/MenuButton.js
+++ b/source/Ox.UI/js/Menu/MenuButton.js
@@ -15,6 +15,10 @@ Ox.MenuButton <f> Menu Button
             e <object> Mouse event
         type <s|'text'> Type ('text' or 'image')
         width <s|n|'auto'> Width in px, or 'auto'
+        click <!> click
+        change <!> change
+        hide <!> hide
+        show <!> show
 @*/
 
 Ox.MenuButton = function(options, self) {
diff --git a/source/Ox.UI/js/Panel/CollapsePanel.js b/source/Ox.UI/js/Panel/CollapsePanel.js
index 2643717f..df6493a8 100644
--- a/source/Ox.UI/js/Panel/CollapsePanel.js
+++ b/source/Ox.UI/js/Panel/CollapsePanel.js
@@ -3,6 +3,7 @@
 /*@
 Ox.CollapsePanel <f> CollapsePanel Object
     ([options[, self]]) -> <o:Ox.Element> CollapsePanel Object
+        toggle <!> toggle
     options <o> Options object
         collapsed <b|false> collapsed state
         extras <a|[]> panel extras
diff --git a/source/Ox.UI/js/Panel/SplitPanel.js b/source/Ox.UI/js/Panel/SplitPanel.js
index 57503a40..4306e0d8 100644
--- a/source/Ox.UI/js/Panel/SplitPanel.js
+++ b/source/Ox.UI/js/Panel/SplitPanel.js
@@ -3,6 +3,10 @@
 /*@
 Ox.SplitPanel <f> SpliPanel Object
     ([options[, self]]) -> <o:Ox.Element> SpliPanel Object
+        resize <!> resize
+            Fires on resize, on both elements being resized
+        toggle <!> toggle
+            Fires on collapse or expand, on the element being toggled
     options <o> Options object
         elements <[o]|[]> Array of two or three element objects
             collapsible <b|false> If true, can be collapsed (if outer element)
@@ -16,10 +20,6 @@ Ox.SplitPanel <f> SpliPanel Object
             tooltip <b|s|false> If true, show tooltip, if string, append it
         orientation <s|"horizontal"> orientation ("horizontal" or "vertical")
     self    <o> shared private variable
-    resize <!> resize
-        Fires on resize, on both elements being resized
-    toggle <!> toggle
-        Fires on collapse or expand, on the element being toggled
 @*/
 
 Ox.SplitPanel = function(options, self) {
diff --git a/source/Ox.UI/js/Panel/TabPanel.js b/source/Ox.UI/js/Panel/TabPanel.js
index 7b9a1723..8fd79fe7 100644
--- a/source/Ox.UI/js/Panel/TabPanel.js
+++ b/source/Ox.UI/js/Panel/TabPanel.js
@@ -3,6 +3,7 @@
 /*@
 Ox.TabPanel <f> Tabbed panel
     ([options[, self]]) -> <o:Ox.SplitPanel> Panel
+        change <!> change
     options <o> Options
         content <o|f> Content per tab
             Either `({id1: $element1, id2: $element2}}` or `function(id) {
diff --git a/source/Ox.UI/js/Video/AnnotationFolder.js b/source/Ox.UI/js/Video/AnnotationFolder.js
index def56d93..27316175 100644
--- a/source/Ox.UI/js/Video/AnnotationFolder.js
+++ b/source/Ox.UI/js/Video/AnnotationFolder.js
@@ -3,6 +3,22 @@
 /*@
 Ox.AnnotationFolder <f> AnnotationFolder Object
     ([options[, self]]) -> <o:Ox.CollapsePanel> AnnotationFolder Object
+        add <!> add
+        blur <!> blur
+        change <!> change
+        edit <!> edit
+        info <!> info
+        insert <!> insert
+        key_* <!> key_*
+        open <!> open
+        remove <!> remove
+        selectafter <!> selectafter
+        selectbefore <!> selectbefore
+        selectnone <!> selectnone
+        select <!> select
+        submit <!> submit
+        togglelayer <!> togglelayer
+        togglewidget <!> togglewidget
     options <o> Options object
         editable <b|false> If true, annotations can be added
         id <s> id
diff --git a/source/Ox.UI/js/Video/AnnotationPanel.js b/source/Ox.UI/js/Video/AnnotationPanel.js
index f5695c4f..c137520f 100644
--- a/source/Ox.UI/js/Video/AnnotationPanel.js
+++ b/source/Ox.UI/js/Video/AnnotationPanel.js
@@ -3,6 +3,22 @@
 /*@
 Ox.AnnotationPanel <f> Video Annotation Panel
     ([options[, self]]) -> <o:Ox.SplitPanel> AnnotationPanel Object
+        add <!> add
+        annotationsID <!> annotationsID
+        blur <!> blur
+        change <!> change
+        define <!> define
+        edit <!> edit
+        findannotations <!> findannotations
+        find <!> find
+        focus <!> focus
+        info <!> info
+        open <!> open
+        remove <!> remove
+        resize <!> resize
+        submit <!> submit
+        togglelayer <!> togglelayer
+        toggle* <!> toggle*
     options <o> Options object
         calendarSize <n|256>     calendar size
         clickLink    <f|null>    click link callback
diff --git a/source/Ox.UI/js/Video/BlockVideoTimeline.js b/source/Ox.UI/js/Video/BlockVideoTimeline.js
index 3b90676e..6511eefa 100644
--- a/source/Ox.UI/js/Video/BlockVideoTimeline.js
+++ b/source/Ox.UI/js/Video/BlockVideoTimeline.js
@@ -3,6 +3,9 @@
 /*@
 Ox.BlockVideoTimeline <f> Block Video Timeline
     ([options[, self]]) -> <o:Ox.Element> Block Video Timeline
+        edit <!> edit
+        select <!> select
+        position <!> position
     options <o> Options
     self <o> Shared private variable
 @*/
diff --git a/source/Ox.UI/js/Video/LargeVideoTimeline.js b/source/Ox.UI/js/Video/LargeVideoTimeline.js
index 131cc27e..486ff631 100644
--- a/source/Ox.UI/js/Video/LargeVideoTimeline.js
+++ b/source/Ox.UI/js/Video/LargeVideoTimeline.js
@@ -5,6 +5,7 @@ Ox.LargeVideoTimeline <f> LargeTimeline Object
     ([options[, self]]) -> <o:Ox.Element> LargeTimeline Object
     options <o> Options object
     self    <o> shared private variable
+    position <!> position
 @*/
 
 Ox.LargeVideoTimeline = function(options, self) {
diff --git a/source/Ox.UI/js/Video/SmallVideoTimeline.js b/source/Ox.UI/js/Video/SmallVideoTimeline.js
index cfd099fa..63baccf7 100644
--- a/source/Ox.UI/js/Video/SmallVideoTimeline.js
+++ b/source/Ox.UI/js/Video/SmallVideoTimeline.js
@@ -3,6 +3,7 @@
 /*@
 Ox.SmallVideoTimeline <f> Small video timeline
     ([options[, self]]) -> <o:Ox.Element> Small video timeline
+        position <!> position
 @*/
 Ox.SmallVideoTimeline = function(options, self) {
 
diff --git a/source/Ox.UI/js/Video/VideoEditor.js b/source/Ox.UI/js/Video/VideoEditor.js
index 78809ff5..e280396f 100644
--- a/source/Ox.UI/js/Video/VideoEditor.js
+++ b/source/Ox.UI/js/Video/VideoEditor.js
@@ -3,6 +3,40 @@
 /*@
 Ox.VideoEditor <f> VideoEditor Object
     ([options[, self]]) -> <o:Ox.SplitPanel> VideoEditor Object
+        addannotation <!> addannotation
+        annotationsfont <!> annotationsfont
+        annotationsrange <!> annotationsrange
+        annotationssize <!> annotationssize
+        annotationssort <!> annotationssort
+        censored <!> censored
+        define <!> define
+        downloadselection <!> downloadselection
+        downloadvideo <!> downloadvideo
+        editannotation <!> editannotation
+        editannotation <!> editannotation
+        embedselection <!> embedselection
+        findannotations <!> findannotations
+        find <!> find
+        importannotations <!> importannotations
+        info <!> info
+        key_* <!> key_*
+        muted <!> muted
+        paused <!> paused
+        points <!> points
+        position <!> position
+        posterframe <!> posterframe
+        removeannotation <!> removeannotation
+        resizecalendar <!> resizecalendar
+        resizemap <!> resizemap
+        resolution <!> resolution
+        select <!> select
+        subtitles <!> subtitles
+        timeline <!> timeline
+        toggleannotations <!> toggleannotations
+        togglecalendar <!> togglecalendar
+        togglelayer <!> togglelayer
+        togglemap <!> togglemap
+        volume <!> volume
     options <o> Options object
         annotationsCalendarSize <n|256>
     self    <o> shared private variable
diff --git a/source/Ox.UI/js/Video/VideoEditorPlayer.js b/source/Ox.UI/js/Video/VideoEditorPlayer.js
index 0439f1e8..0d369602 100644
--- a/source/Ox.UI/js/Video/VideoEditorPlayer.js
+++ b/source/Ox.UI/js/Video/VideoEditorPlayer.js
@@ -3,6 +3,10 @@
 /*@
 Ox.VideoEditorPlayer <f> VideoEditorPlayer Object
     ([options[, self]]) -> <o:Ox.Element> VideoEditorPlayer Object
+        change <!> change
+        playing <!> playing
+        set <!> set
+        togglesize <!> togglesize
     options <o> Options object
     self    <o> shared private variable
 @*/
diff --git a/source/Ox.UI/js/Video/VideoElement.js b/source/Ox.UI/js/Video/VideoElement.js
index 86be9017..52894708 100644
--- a/source/Ox.UI/js/Video/VideoElement.js
+++ b/source/Ox.UI/js/Video/VideoElement.js
@@ -3,6 +3,12 @@
 /*@
 Ox.VideoElement <f> VideoElement Object
     ([options[, self]]) -> <o:Ox.Element> VideoElement Object
+        loadedmetadata <!> loadedmetadata
+        pointschange <!> pointschange
+        seeked <!> seeked
+        seeking <!> seeking
+        sizechange <!> sizechange
+        ended <!> ended
     options <o> Options object
     self    <o> shared private variable
 @*/
diff --git a/source/Ox.UI/js/Video/VideoPanel.js b/source/Ox.UI/js/Video/VideoPanel.js
index 11aff373..304c6149 100644
--- a/source/Ox.UI/js/Video/VideoPanel.js
+++ b/source/Ox.UI/js/Video/VideoPanel.js
@@ -3,8 +3,31 @@
 /*@
 Ox.VideoPanel <f> VideoPanel Object
     ([options[, self]]) -> <o:Ox.SplitPanel> VideoPanel Object
+        find <!> find
+        info <!> info
+        key_* <!> key_*
+        muted <!> muted
+        paused <!> paused
+        position <!> position
+        resizecalendar <!> resizecalendar
+        resolution <!> resolution
+        scale <!> scale
+        select <!> select
+        subtitles <!> subtitles
+        toggleannotations <!> toggleannotations
+        togglecalendar <!> togglecalendar
+        togglelayer <!> togglelayer
+        togglemap <!> togglemap
+        toggletimeline <!> toggletimeline
+        volume <!> volume
     options <o> Options object
     self    <o> shared private variable
+    annotationsfont <!> annotationsfont
+    annotationsrange <!> annotationsrange
+    annotationssize <!> annotationssize
+    annotationssort <!> annotationssort
+    censored <!> censored
+    downloadvideo <!> downloadvideo
 @*/
 
 Ox.VideoPanel = function(options, self) {
diff --git a/source/Ox.UI/js/Video/VideoPlayer.js b/source/Ox.UI/js/Video/VideoPlayer.js
index 67b8c086..0da8ad08 100644
--- a/source/Ox.UI/js/Video/VideoPlayer.js
+++ b/source/Ox.UI/js/Video/VideoPlayer.js
@@ -3,6 +3,27 @@
 /*@
 Ox.VideoPlayer <f> Generic Video Player
     ([options[, self]]) -> <o:Ox.Element> Video Player
+        censored <!> censored
+        close <!> close
+        download <!> download
+        ended <!> ended
+        find <!> find
+        fullscreen <!> fullscreen
+        gotopoint <!> gotopoint
+        loadedmetadata <!> loadedmetadata
+        muted <!> muted
+        open <!> open
+        paused <!> paused
+        playing <!> playing
+        position <!> position
+        resolution <!> resolution
+        scale <!> scale
+        select <!> select
+        setpoint <!> setpoint
+        size <!> size
+        subtitles <!> subtitles
+        volume <!> volume
+        zap <!> zap
     options <o> Options
         annotations <[]> Array of annotations
             id <s> Optional id
diff --git a/source/Ox.UI/js/Video/VideoPreview.js b/source/Ox.UI/js/Video/VideoPreview.js
index b6bb3d18..1c11abd9 100644
--- a/source/Ox.UI/js/Video/VideoPreview.js
+++ b/source/Ox.UI/js/Video/VideoPreview.js
@@ -3,6 +3,7 @@
 /*@
 Ox.VideoPreview <f> Video Preview
     ([options[, self]]) -> <o:Ox.Element> Video Preview
+        click <!> click
     options <o> Options
     self <o> Shared private variable
 @*/
diff --git a/source/Ox.UI/js/Video/VideoTimelinePanel.js b/source/Ox.UI/js/Video/VideoTimelinePanel.js
index 96d23042..094b9c82 100644
--- a/source/Ox.UI/js/Video/VideoTimelinePanel.js
+++ b/source/Ox.UI/js/Video/VideoTimelinePanel.js
@@ -3,6 +3,25 @@
 /*@
 Ox.VideoTimelinePanel <f> Video timeline panel
     ([options[, self]]) -> <o:Ox.SplitPanel> Video timeline panel
+        annoationssize <!> annoationssize
+        annotationsfont <!> annotationsfont
+        annotationsrange <!> annotationsrange
+        annotationssort <!> annotationssort
+        censored <!> censored
+        follow <!> follow
+        info <!> info
+        muted <!> muted
+        paused <!> paused
+        position <!> position
+        resizecalendar <!> resizecalendar
+        resizemap <!> resizemap
+        select <!> select
+        timeline <!> timeline
+        toggleannotations <!> toggleannotations
+        togglecalendar <!> togglecalendar
+        togglelayer <!> togglelayer
+        togglemap <!> togglemap
+        volume <!> volume
 @*/
 
 Ox.VideoTimelinePanel = function(options, self) {
diff --git a/source/Ox.UI/js/Video/VideoTimelinePlayer.js b/source/Ox.UI/js/Video/VideoTimelinePlayer.js
index 380780a9..157e93ea 100644
--- a/source/Ox.UI/js/Video/VideoTimelinePlayer.js
+++ b/source/Ox.UI/js/Video/VideoTimelinePlayer.js
@@ -3,6 +3,13 @@
 /*@
 Ox.VideoTimelinePlayer <f> Video Timeline Player
     ([options[, self]]) -> <o:Ox.SplitPanel> Video Timeline Player
+        censored <!> censored
+        follow <!> follow
+        muted <!> muted
+        playing <!> playing
+        position <!> position
+        timeline <!> timeline
+        volume <!> volume
     options <o> Options
     self <o> Shared private variable
 @*/
diff --git a/source/Ox.UI/js/Window/Dialog.js b/source/Ox.UI/js/Window/Dialog.js
index c133255f..b51cb922 100644
--- a/source/Ox.UI/js/Window/Dialog.js
+++ b/source/Ox.UI/js/Window/Dialog.js
@@ -3,6 +3,10 @@
 /*@
 Ox.Dialog <f> Dialog object
     ([options[, self]]) -> <o:Ox.Element> Dialog object
+        close <!> close
+        open <!> open
+        resizeend <!> resizeend
+        resize <!> resize
     options <o> Options object
     self <o>    Shared private variable
 @*/
diff --git a/source/Ox.UI/js/Window/Layer.js b/source/Ox.UI/js/Window/Layer.js
index 2ab9ac7e..2dc322ee 100644
--- a/source/Ox.UI/js/Window/Layer.js
+++ b/source/Ox.UI/js/Window/Layer.js
@@ -3,6 +3,7 @@
 /*@
 Ox.Layer <f> Background layer for dialogs and menus
     ([options[, self]]) -> <o:Ox.Element> Layer
+        click <!> click
     options <o> Options
         type <s|'dialog'> Layer type ('dialog' or 'menu')
     self <o> Shared private variable