diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..e69de29
diff --git a/README.md b/README.md
index 1050fb2..fc6432c 100644
--- a/README.md
+++ b/README.md
@@ -135,7 +135,7 @@ Recordings can be easily browsed and are filterable and searchable with custom t
 
 ### -- Units in Mission --
 
-- OCAP2 tracks players, AI, and vehicles in a mission.
+- OCAP tracks players, AI, and vehicles in a mission.
 - Group names and roles a player was slotted as are displayed during playback.
 - Players will remain in the list only while they're connected.
 - Vehicles will show who is crewing them, if anyone.
diff --git a/addon b/addon
index 9d41a9c..436f0cc 160000
--- a/addon
+++ b/addon
@@ -1 +1 @@
-Subproject commit 9d41a9cbe7cf54ea5c5c0c76cf8ae95b34c1c570
+Subproject commit 436f0ccaf9417149f129c72e4a5f612c54ac15f9
diff --git a/extension b/extension
index 2de600c..7bdc05d 160000
--- a/extension
+++ b/extension
@@ -1 +1 @@
-Subproject commit 2de600cc05a40fbe103516b30f617b0cfb51b4d4
+Subproject commit 7bdc05d3a2e2d38c20548acc3eaafaa98cff3d34
diff --git a/tiles_tut/getMapConfig.sqf b/tiles_tut/getMapConfig.sqf
index e5665d0..64a8945 100644
--- a/tiles_tut/getMapConfig.sqf
+++ b/tiles_tut/getMapConfig.sqf
@@ -11,16 +11,16 @@ _newMap = {
 	params ["_configName", "_displayName"];
 	_str = format ['
 		{
-			"name": %3,
+			"name": %1,
 			"worldName": %2,
-			"worldSize": -1,
+			"worldSize": %3,
 			"imageSize": 16384,
 			"multiplier": -1
 		}
 		',
-		endl,
+		str _displayName,
 		str _configName,
-		str _displayName
+		_displayName call BIS_fnc_mapSize
 	];
 	_str
 };
diff --git a/tools/naturaldocs/Data/ClassHierarchy.nd b/tools/naturaldocs/Data/ClassHierarchy.nd
new file mode 100644
index 0000000..bc063b0
Binary files /dev/null and b/tools/naturaldocs/Data/ClassHierarchy.nd differ
diff --git a/tools/naturaldocs/Data/ConfigFileInfo.nd b/tools/naturaldocs/Data/ConfigFileInfo.nd
new file mode 100644
index 0000000..5bd3282
Binary files /dev/null and b/tools/naturaldocs/Data/ConfigFileInfo.nd differ
diff --git a/tools/naturaldocs/Data/FileInfo.nd b/tools/naturaldocs/Data/FileInfo.nd
new file mode 100644
index 0000000..b1c7634
--- /dev/null
+++ b/tools/naturaldocs/Data/FileInfo.nd
@@ -0,0 +1,46 @@
+1.52
+SQF
+C:\Users\indif\Git\OCAP\addon\x\ocap\addons\main\XEH_prep.sqf	1648322205	0	C:\Users\indif\Git\OCAP\addon\x\ocap\addons\main\XEH_prep.sqf
+C:\Users\indif\Git\OCAP\addon\x\ocap\addons\extension\script_component.hpp	1666136035	1	script_component.hpp
+C:\Users\indif\Git\OCAP\addon\x\ocap\addons\recorder\fnc_getEventWeaponText.sqf	1666208175	1	fnc_getEventWeaponText.sqf
+C:\Users\indif\Git\OCAP\addon\x\ocap\addons\recorder\fnc_handleCustomEvent.sqf	1666204940	1	fnc_handleCustomEvent.sqf
+C:\Users\indif\Git\OCAP\addon\x\ocap\addons\recorder\script_component.hpp	1666208236	1	script_component.hpp
+C:\Users\indif\Git\OCAP\addon\x\ocap\addons\main\script_component.hpp	1666136039	1	script_component.hpp
+C:\Users\indif\Git\OCAP\addon\x\ocap\addons\recorder\fnc_eh_firedMan.sqf	1666207666	1	fnc_eh_firedMan.sqf
+C:\Users\indif\Git\OCAP\addon\x\ocap\addons\recorder\XEH_postInit.sqf	1649798207	0	C:\Users\indif\Git\OCAP\addon\x\ocap\addons\recorder\XEH_postInit.sqf
+C:\Users\indif\Git\OCAP\addon\x\ocap\addons\recorder\fnc_addUnitEventHandlers.sqf	1666205034	1	fnc_addUnitEventHandlers.sqf
+C:\Users\indif\Git\OCAP\addon\x\ocap\addons\recorder\fnc_updateTime.sqf	1666208097	1	fnc_updateTime.sqf
+C:\Users\indif\Git\OCAP\addon\x\ocap\addons\recorder\fnc_aceExplosives.sqf	1666201579	1	fnc_aceExplosives.sqf
+C:\Users\indif\Git\OCAP\addon\x\ocap\addons\recorder\fnc_getUnitType.sqf	1666208179	1	fnc_getUnitType.sqf
+C:\Users\indif\Git\OCAP\addon\x\ocap\addons\recorder\fnc_eh_projectileHit.sqf	1666205244	1	fnc_eh_projectileHit.sqf
+C:\Users\indif\Git\OCAP\addon\x\ocap\addons\recorder\config.cpp	1664473474	0	C:\Users\indif\Git\OCAP\addon\x\ocap\addons\recorder\config.cpp
+C:\Users\indif\Git\OCAP\addon\x\ocap\addons\main\config.cpp	1666132720	0	C:\Users\indif\Git\OCAP\addon\x\ocap\addons\main\config.cpp
+C:\Users\indif\Git\OCAP\addon\x\ocap\addons\main\XEH_preInit.sqf	1666210022	1	CBA Settings
+C:\Users\indif\Git\OCAP\addon\x\ocap\addons\recorder\fnc_handleMarkers.sqf	1666208376	1	fnc_handleMarkers.sqf
+C:\Users\indif\Git\OCAP\addon\x\ocap\addons\recorder\XEH_preInit.sqf	1666210089	1	CBA Settings
+C:\Users\indif\Git\OCAP\addon\x\ocap\addons\recorder\fnc_eh_killed.sqf	1666205034	1	fnc_eh_killed.sqf
+C:\Users\indif\Git\OCAP\addon\x\ocap\addons\recorder\fnc_init.sqf	1666205034	1	fnc_init.sqf
+C:\Users\indif\Git\OCAP\addon\x\ocap\addons\extension\XEH_postInit.sqf	1648282095	0	C:\Users\indif\Git\OCAP\addon\x\ocap\addons\extension\XEH_postInit.sqf
+C:\Users\indif\Git\OCAP\addon\x\ocap\addons\main\XEH_postInit.sqf	1649797751	0	C:\Users\indif\Git\OCAP\addon\x\ocap\addons\main\XEH_postInit.sqf
+C:\Users\indif\Git\OCAP\addon\x\ocap\addons\recorder\fnc_exportData.sqf	1666193188	1	fnc_exportData.sqf
+C:\Users\indif\Git\OCAP\addon\x\ocap\addons\recorder\fnc_entityMonitors.sqf	1666205489	1	fnc_entityMonitors.sqf
+C:\Users\indif\Git\OCAP\addon\x\ocap\addons\recorder\fnc_eh_connected.sqf	1666203337	1	fnc_eh_connected.sqf
+C:\Users\indif\Git\OCAP\addon\x\ocap\addons\recorder\fnc_startRecording.sqf	1666208196	1	fnc_startRecording.sqf
+C:\Users\indif\Git\OCAP\addon\x\ocap\addons\recorder\fnc_isKindOfApc.sqf	1666208190	1	fnc_isKindOfApc.sqf
+C:\Users\indif\Git\OCAP\addon\x\ocap\addons\extension\XEH_prep.sqf	1648322066	0	C:\Users\indif\Git\OCAP\addon\x\ocap\addons\extension\XEH_prep.sqf
+C:\Users\indif\Git\OCAP\addon\x\ocap\addons\recorder\fnc_eh_onUserAdminStateChanged.sqf	1666204940	1	fnc_eh_onUserAdminStateChanged.sqf
+C:\Users\indif\Git\OCAP\addon\x\ocap\addons\recorder\fnc_addEventMission.sqf	1666205069	1	fnc_addEventMission.sqf
+C:\Users\indif\Git\OCAP\addon\x\ocap\addons\recorder\fnc_adminUIcontrol.sqf	1666204940	1	fnc_adminUIControl.sqf
+C:\Users\indif\Git\OCAP\addon\x\ocap\addons\extension\config.cpp	1666208424	0	config.cpp
+C:\Users\indif\Git\OCAP\addon\x\ocap\addons\recorder\fnc_getWeaponDisplayData.sqf	1666208182	1	fnc_getWeaponDisplayData.sqf
+C:\Users\indif\Git\OCAP\addon\x\ocap\addons\recorder\fnc_stopRecording.sqf	1666208198	1	fnc_stopRecording.sqf
+C:\Users\indif\Git\OCAP\addon\x\ocap\addons\main\script_macros.hpp	1666208585	1	script_macros.hpp
+C:\Users\indif\Git\OCAP\addon\x\ocap\addons\recorder\fnc_captureLoop.sqf	1666202683	1	fnc_captureLoop.sqf
+C:\Users\indif\Git\OCAP\addon\x\ocap\addons\recorder\fnc_getClass.sqf	1666205814	1	fnc_getClass.sqf
+C:\Users\indif\Git\OCAP\addon\x\ocap\addons\extension\fnc_sendData.sqf	1666208155	1	fnc_sendData.sqf
+C:\Users\indif\Git\OCAP\addon\x\ocap\addons\recorder\fnc_projectileMonitors.sqf	1666207794	1	fnc_projectileMonitors.sqf
+C:\Users\indif\Git\OCAP\addon\x\ocap\addons\recorder\XEH_prep.sqf	1665332872	0	C:\Users\indif\Git\OCAP\addon\x\ocap\addons\recorder\XEH_prep.sqf
+C:\Users\indif\Git\OCAP\addon\x\ocap\addons\recorder\fnc_getInstigator.sqf	1666206037	1	fnc_getInstigator.sqf
+C:\Users\indif\Git\OCAP\addon\x\ocap\addons\recorder\fnc_eh_disconnected.sqf	1666205034	1	fnc_eh_disconnected.sqf
+C:\Users\indif\Git\OCAP\addon\x\ocap\addons\extension\XEH_preInit.sqf	1648282077	0	C:\Users\indif\Git\OCAP\addon\x\ocap\addons\extension\XEH_preInit.sqf
+C:\Users\indif\Git\OCAP\addon\x\ocap\addons\recorder\fnc_getAmmoMarkerData.sqf	1666205660	1	fnc_getAmmoMarkerData.sqf
diff --git a/tools/naturaldocs/Data/ImageFileInfo.nd b/tools/naturaldocs/Data/ImageFileInfo.nd
new file mode 100644
index 0000000..278e2bf
Binary files /dev/null and b/tools/naturaldocs/Data/ImageFileInfo.nd differ
diff --git a/tools/naturaldocs/Data/ImageReferenceTable.nd b/tools/naturaldocs/Data/ImageReferenceTable.nd
new file mode 100644
index 0000000..278e2bf
Binary files /dev/null and b/tools/naturaldocs/Data/ImageReferenceTable.nd differ
diff --git a/tools/naturaldocs/Data/IndexInfo.nd b/tools/naturaldocs/Data/IndexInfo.nd
new file mode 100644
index 0000000..d6eea23
Binary files /dev/null and b/tools/naturaldocs/Data/IndexInfo.nd differ
diff --git a/tools/naturaldocs/Data/PreviousMenuState.nd b/tools/naturaldocs/Data/PreviousMenuState.nd
new file mode 100644
index 0000000..3bad719
Binary files /dev/null and b/tools/naturaldocs/Data/PreviousMenuState.nd differ
diff --git a/tools/naturaldocs/Data/PreviousSettings.nd b/tools/naturaldocs/Data/PreviousSettings.nd
new file mode 100644
index 0000000..918156b
Binary files /dev/null and b/tools/naturaldocs/Data/PreviousSettings.nd differ
diff --git a/tools/naturaldocs/Data/SymbolTable.nd b/tools/naturaldocs/Data/SymbolTable.nd
new file mode 100644
index 0000000..7e9e99d
Binary files /dev/null and b/tools/naturaldocs/Data/SymbolTable.nd differ
diff --git a/tools/naturaldocs/Languages.txt b/tools/naturaldocs/Languages.txt
new file mode 100644
index 0000000..51a690b
--- /dev/null
+++ b/tools/naturaldocs/Languages.txt
@@ -0,0 +1,131 @@
+Format: 1.52
+
+# This is the Natural Docs languages file for this project.  If you change
+# anything here, it will apply to THIS PROJECT ONLY.  If you'd like to change
+# something for all your projects, edit the Languages.txt in Natural Docs'
+# Config directory instead.
+
+
+# You can prevent certain file extensions from being scanned like this:
+# Ignore Extensions: [extension] [extension] ...
+
+
+#-------------------------------------------------------------------------------
+# SYNTAX:
+#
+# Unlike other Natural Docs configuration files, in this file all comments
+# MUST be alone on a line.  Some languages deal with the # character, so you
+# cannot put comments on the same line as content.
+#
+# Also, all lists are separated with spaces, not commas, again because some
+# languages may need to use them.
+#
+# Language: [name]
+# Alter Language: [name]
+#    Defines a new language or alters an existing one.  Its name can use any
+#    characters.  If any of the properties below have an add/replace form, you
+#    must use that when using Alter Language.
+#
+#    The language Shebang Script is special.  It's entry is only used for
+#    extensions, and files with those extensions have their shebang (#!) lines
+#    read to determine the real language of the file.  Extensionless files are
+#    always treated this way.
+#
+#    The language Text File is also special.  It's treated as one big comment
+#    so you can put Natural Docs content in them without special symbols.  Also,
+#    if you don't specify a package separator, ignored prefixes, or enum value
+#    behavior, it will copy those settings from the language that is used most
+#    in the source tree.
+#
+# Extensions: [extension] [extension] ...
+# [Add/Replace] Extensions: [extension] [extension] ...
+#    Defines the file extensions of the language's source files.  You can
+#    redefine extensions found in the main languages file.  You can use * to
+#    mean any undefined extension.
+#
+# Shebang Strings: [string] [string] ...
+# [Add/Replace] Shebang Strings: [string] [string] ...
+#    Defines a list of strings that can appear in the shebang (#!) line to
+#    designate that it's part of the language.  You can redefine strings found
+#    in the main languages file.
+#
+# Ignore Prefixes in Index: [prefix] [prefix] ...
+# [Add/Replace] Ignored Prefixes in Index: [prefix] [prefix] ...
+#
+# Ignore [Topic Type] Prefixes in Index: [prefix] [prefix] ...
+# [Add/Replace] Ignored [Topic Type] Prefixes in Index: [prefix] [prefix] ...
+#    Specifies prefixes that should be ignored when sorting symbols in an
+#    index.  Can be specified in general or for a specific topic type.
+#
+#------------------------------------------------------------------------------
+# For basic language support only:
+#
+# Line Comments: [symbol] [symbol] ...
+#    Defines a space-separated list of symbols that are used for line comments,
+#    if any.
+#
+# Block Comments: [opening sym] [closing sym] [opening sym] [closing sym] ...
+#    Defines a space-separated list of symbol pairs that are used for block
+#    comments, if any.
+#
+# Package Separator: [symbol]
+#    Defines the default package separator symbol.  The default is a dot.
+#
+# [Topic Type] Prototype Enders: [symbol] [symbol] ...
+#    When defined, Natural Docs will attempt to get a prototype from the code
+#    immediately following the topic type.  It stops when it reaches one of
+#    these symbols.  Use \n for line breaks.
+#
+# Line Extender: [symbol]
+#    Defines the symbol that allows a prototype to span multiple lines if
+#    normally a line break would end it.
+#
+# Enum Values: [global|under type|under parent]
+#    Defines how enum values are referenced.  The default is global.
+#    global       - Values are always global, referenced as 'value'.
+#    under type   - Values are under the enum type, referenced as
+#               'package.enum.value'.
+#    under parent - Values are under the enum's parent, referenced as
+#               'package.value'.
+#
+# Perl Package: [perl package]
+#    Specifies the Perl package used to fine-tune the language behavior in ways
+#    too complex to do in this file.
+#
+#------------------------------------------------------------------------------
+# For full language support only:
+#
+# Full Language Support: [perl package]
+#    Specifies the Perl package that has the parsing routines necessary for full
+#    language support.
+#
+#-------------------------------------------------------------------------------
+
+# The following languages are defined in the main file, if you'd like to alter
+# them:
+#
+#    Text File, Shebang Script, C/C++, C#, Java, JavaScript, Perl, Python,
+#    PHP, SQL, Visual Basic, Pascal, Assembly, Ada, Tcl, Ruby, Makefile,
+#    ActionScript, ColdFusion, R, Fortran
+
+# If you add a language that you think would be useful to other developers
+# and should be included in Natural Docs by default, please e-mail it to
+# languages [at] naturaldocs [dot] org.
+
+
+Language: SQF
+
+   Extensions: sqf sqs hpp cpp
+   Ignore Function Prefixes in Index: OCAP_main_fnc_ OCAP_extension_fnc_ OCAP_recorder_fnc_
+   Ignore Variable Prefixes in Index: OCAP_ OCAP_main_ OCAP_extension_ OCAP_recorder_
+   Ignore CBA Event Prefixes in Index: OCAP_ OCAP_recorder_
+   Ignore Event Handler Prefix in Index: OCAP_EH_
+   Ignore CBA Setting Prefixes in Index: OCAP_ OCAP_settings_
+   Line Comment: //
+   Block Comment: /* */
+   Function Prototype Ender: };
+   Variable Prototype Ender: =
+   Macro Prototype Ender: \n
+   CBA Event Prototype Enders: ; \n
+   Event Handler Prototype Ender: \n
+   Line Extender: `
diff --git a/tools/naturaldocs/Menu.txt b/tools/naturaldocs/Menu.txt
new file mode 100644
index 0000000..7d8c1fa
--- /dev/null
+++ b/tools/naturaldocs/Menu.txt
@@ -0,0 +1,99 @@
+Format: 1.52
+
+
+Title: OCAP2
+SubTitle: Operations Capture and Playback
+
+Footer: Maintained by the OCAP2 team
+Timestamp: yyyy-mm-dd
+#   m     - One or two digit month.  January is "1"
+#   mm    - Always two digit month.  January is "01"
+#   mon   - Short month word.  January is "Jan"
+#   month - Long month word.  January is "January"
+#   d     - One or two digit day.  1 is "1"
+#   dd    - Always two digit day.  1 is "01"
+#   day   - Day with letter extension.  1 is "1st"
+#   yy    - Two digit year.  2006 is "06"
+#   yyyy  - Four digit year.  2006 is "2006"
+#   year  - Four digit year.  2006 is "2006"
+
+
+# --------------------------------------------------------------------------
+# 
+# Cut and paste the lines below to change the order in which your files
+# appear on the menu.  Don't worry about adding or removing files, Natural
+# Docs will take care of that.
+# 
+# You can further organize the menu by grouping the entries.  Add a
+# "Group: [name] {" line to start a group, and add a "}" to end it.
+# 
+# You can add text and web links to the menu by adding "Text: [text]" and
+# "Link: [name] ([URL])" lines, respectively.
+# 
+# The formatting and comments are auto-generated, so don't worry about
+# neatness when editing the file.  Natural Docs will clean it up the next
+# time it is run.  When working with groups, just deal with the braces and
+# forget about the indentation and comments.
+# 
+# --------------------------------------------------------------------------
+
+
+Link: Wiki  (https://ocap2.notion.site/Operations-Capture-and-Playback-2-9b868db4414f4ea4830f0f4b1cbacb54)
+Link: Github  (https://github.com/OCAP2/OCAP)
+Link: Issues  (https://github.com/OCAP2/OCAP/issues)
+Link: Download  (https://github.com/OCAP2/OCAP/releases)
+Index: Index (Everything)
+Function Index: Index (Functions)
+Variable Index: Index (Variables)
+Macro Index: Index (Macros)
+File Index: Index (Files)
+Event Handler Index: A3 Event Handlers
+CBA Setting Index: CBA Settings
+CBA Event Index: CBA Events
+
+Group: main  {
+
+   File: CBA Settings  (main\XEH_preInit.sqf)
+   File: script_component.hpp  (main\script_component.hpp)
+   File: script_macros.hpp  (main\script_macros.hpp)
+   }  # Group: main
+
+Group: extension  {
+
+   File: fnc_sendData.sqf  (extension\fnc_sendData.sqf)
+   File: script_component.hpp  (extension\script_component.hpp)
+   }  # Group: extension
+
+Group: recorder  {
+
+   File: CBA Settings  (recorder\XEH_preInit.sqf)
+   File: fnc_aceExplosives.sqf  (recorder\fnc_aceExplosives.sqf)
+   File: fnc_addEventMission.sqf  (recorder\fnc_addEventMission.sqf)
+   File: fnc_addUnitEventHandlers.sqf  (recorder\fnc_addUnitEventHandlers.sqf)
+   File: fnc_adminUIControl.sqf  (recorder\fnc_adminUIcontrol.sqf)
+   File: fnc_captureLoop.sqf  (recorder\fnc_captureLoop.sqf)
+   File: fnc_eh_connected.sqf  (recorder\fnc_eh_connected.sqf)
+   File: fnc_eh_disconnected.sqf  (recorder\fnc_eh_disconnected.sqf)
+   File: fnc_eh_firedMan.sqf  (recorder\fnc_eh_firedMan.sqf)
+   File: fnc_eh_killed.sqf  (recorder\fnc_eh_killed.sqf)
+   File: fnc_eh_onUserAdminStateChanged.sqf  (recorder\fnc_eh_onUserAdminStateChanged.sqf)
+   File: fnc_eh_projectileHit.sqf  (recorder\fnc_eh_projectileHit.sqf)
+   File: fnc_entityMonitors.sqf  (recorder\fnc_entityMonitors.sqf)
+   File: fnc_exportData.sqf  (recorder\fnc_exportData.sqf)
+   File: fnc_getAmmoMarkerData.sqf  (recorder\fnc_getAmmoMarkerData.sqf)
+   File: fnc_getClass.sqf  (recorder\fnc_getClass.sqf)
+   File: fnc_getEventWeaponText.sqf  (recorder\fnc_getEventWeaponText.sqf)
+   File: fnc_getInstigator.sqf  (recorder\fnc_getInstigator.sqf)
+   File: fnc_getUnitType.sqf  (recorder\fnc_getUnitType.sqf)
+   File: fnc_getWeaponDisplayData.sqf  (recorder\fnc_getWeaponDisplayData.sqf)
+   File: fnc_handleCustomEvent.sqf  (recorder\fnc_handleCustomEvent.sqf)
+   File: fnc_handleMarkers.sqf  (recorder\fnc_handleMarkers.sqf)
+   File: fnc_init.sqf  (recorder\fnc_init.sqf)
+   File: fnc_isKindOfApc.sqf  (recorder\fnc_isKindOfApc.sqf)
+   File: fnc_projectileMonitors.sqf  (recorder\fnc_projectileMonitors.sqf)
+   File: fnc_startRecording.sqf  (recorder\fnc_startRecording.sqf)
+   File: fnc_stopRecording.sqf  (recorder\fnc_stopRecording.sqf)
+   File: fnc_updateTime.sqf  (recorder\fnc_updateTime.sqf)
+   File: script_component.hpp  (recorder\script_component.hpp)
+   }  # Group: recorder
+
diff --git a/tools/naturaldocs/Topics.txt b/tools/naturaldocs/Topics.txt
new file mode 100644
index 0000000..a036b68
--- /dev/null
+++ b/tools/naturaldocs/Topics.txt
@@ -0,0 +1,118 @@
+Format: 1.52
+
+# This is the Natural Docs topics file for this project.  If you change anything
+# here, it will apply to THIS PROJECT ONLY.  If you'd like to change something
+# for all your projects, edit the Topics.txt in Natural Docs' Config directory
+# instead.
+
+
+# If you'd like to prevent keywords from being recognized by Natural Docs, you
+# can do it like this:
+# Ignore Keywords: [keyword], [keyword], ...
+#
+# Or you can use the list syntax like how they are defined:
+# Ignore Keywords:
+#    [keyword]
+#    [keyword], [plural keyword]
+#    ...
+
+
+#-------------------------------------------------------------------------------
+# SYNTAX:
+#
+# Topic Type: [name]
+# Alter Topic Type: [name]
+#    Creates a new topic type or alters one from the main file.  Each type gets
+#    its own index and behavior settings.  Its name can have letters, numbers,
+#    spaces, and these charaters: - / . '
+#
+# Plural: [name]
+#    Sets the plural name of the topic type, if different.
+#
+# Keywords:
+#    [keyword]
+#    [keyword], [plural keyword]
+#    ...
+#    Defines or adds to the list of keywords for the topic type.  They may only
+#    contain letters, numbers, and spaces and are not case sensitive.  Plural
+#    keywords are used for list topics.  You can redefine keywords found in the
+#    main topics file.
+#
+# Index: [yes|no]
+#    Whether the topics get their own index.  Defaults to yes.  Everything is
+#    included in the general index regardless of this setting.
+#
+# Scope: [normal|start|end|always global]
+#    How the topics affects scope.  Defaults to normal.
+#    normal        - Topics stay within the current scope.
+#    start         - Topics start a new scope for all the topics beneath it,
+#                    like class topics.
+#    end           - Topics reset the scope back to global for all the topics
+#                    beneath it.
+#    always global - Topics are defined as global, but do not change the scope
+#                    for any other topics.
+#
+# Class Hierarchy: [yes|no]
+#    Whether the topics are part of the class hierarchy.  Defaults to no.
+#
+# Page Title If First: [yes|no]
+#    Whether the topic's title becomes the page title if it's the first one in
+#    a file.  Defaults to no.
+#
+# Break Lists: [yes|no]
+#    Whether list topics should be broken into individual topics in the output.
+#    Defaults to no.
+#
+# Can Group With: [type], [type], ...
+#    Defines a list of topic types that this one can possibly be grouped with.
+#    Defaults to none.
+#-------------------------------------------------------------------------------
+
+# The following topics are defined in the main file, if you'd like to alter
+# their behavior or add keywords:
+#
+#    Generic, Class, Interface, Section, File, Group, Function, Variable,
+#    Property, Type, Constant, Enumeration, Event, Delegate, Macro,
+#    Database, Database Table, Database View, Database Index, Database
+#    Cursor, Database Trigger, Cookie, Build Target
+
+# If you add something that you think would be useful to other developers
+# and should be included in Natural Docs by default, please e-mail it to
+# topics [at] naturaldocs [dot] org.
+
+
+Topic Type: CBA Setting
+
+   Plural: CBA Settings
+   Index: Yes
+   Scope: Always global
+
+   Keywords:
+      cba setting, cba settings
+
+
+Topic Type: CBA Event
+
+   Plural: CBA Events
+   Index: Yes
+   Scope: Always global
+
+   Keywords:
+      cba event, cba events
+
+
+Topic Type: Event Handler
+
+   Plural: Event Handlers
+   Index: Yes
+   Scope: Always global
+
+   Keywords:
+      event handler, event handlers
+
+
+Topic Type: Number
+
+   Index: No
+   Keywords:
+      number, numbers
diff --git a/tools/naturaldocs/Working Data/CodeDB.nd b/tools/naturaldocs/Working Data/CodeDB.nd
new file mode 100644
index 0000000..8e15aa8
Binary files /dev/null and b/tools/naturaldocs/Working Data/CodeDB.nd differ
diff --git a/tools/naturaldocs/Working Data/Comments.nd b/tools/naturaldocs/Working Data/Comments.nd
new file mode 100644
index 0000000..70e8a74
Binary files /dev/null and b/tools/naturaldocs/Working Data/Comments.nd differ
diff --git a/tools/naturaldocs/Working Data/Files.nd b/tools/naturaldocs/Working Data/Files.nd
new file mode 100644
index 0000000..f0e985e
Binary files /dev/null and b/tools/naturaldocs/Working Data/Files.nd differ
diff --git a/tools/naturaldocs/Working Data/Languages.nd b/tools/naturaldocs/Working Data/Languages.nd
new file mode 100644
index 0000000..b11ebac
Binary files /dev/null and b/tools/naturaldocs/Working Data/Languages.nd differ
diff --git a/tools/naturaldocs/Working Data/Output/BuildState.nd b/tools/naturaldocs/Working Data/Output/BuildState.nd
new file mode 100644
index 0000000..5c239c3
Binary files /dev/null and b/tools/naturaldocs/Working Data/Output/BuildState.nd differ
diff --git a/tools/naturaldocs/Working Data/Output/Config.nd b/tools/naturaldocs/Working Data/Output/Config.nd
new file mode 100644
index 0000000..65c482d
Binary files /dev/null and b/tools/naturaldocs/Working Data/Output/Config.nd differ
diff --git a/tools/naturaldocs/Working Data/Output/SearchIndex.nd b/tools/naturaldocs/Working Data/Output/SearchIndex.nd
new file mode 100644
index 0000000..bca4792
Binary files /dev/null and b/tools/naturaldocs/Working Data/Output/SearchIndex.nd differ
diff --git a/tools/naturaldocs/Working Data/Parser.nd b/tools/naturaldocs/Working Data/Parser.nd
new file mode 100644
index 0000000..a25401c
Binary files /dev/null and b/tools/naturaldocs/Working Data/Parser.nd differ
diff --git a/tools/naturaldocs/Working Data/Project.nd b/tools/naturaldocs/Working Data/Project.nd
new file mode 100644
index 0000000..e78cd32
Binary files /dev/null and b/tools/naturaldocs/Working Data/Project.nd differ
diff --git a/tools/naturaldocs/cba.css b/tools/naturaldocs/cba.css
new file mode 100644
index 0000000..547bfa1
--- /dev/null
+++ b/tools/naturaldocs/cba.css
@@ -0,0 +1,11 @@
+pre {
+	margin: 0;
+	background: #EEEEEE;
+	border: 1px solid #888888;
+	padding: 0.5em 1em 0.5em 1em;
+}
+
+p {
+	text-indent: 0;
+	margin-bottom: 1em;
+}
\ No newline at end of file
diff --git a/tools/naturaldocs/compile.ps1 b/tools/naturaldocs/compile.ps1
new file mode 100644
index 0000000..ae4a698
--- /dev/null
+++ b/tools/naturaldocs/compile.ps1
@@ -0,0 +1,29 @@
+exit
+
+# Download NaturalDocs 1.5.2 from here https://sourceforge.net/projects/naturaldocs/files/Stable%20Releases/1.52/NaturalDocs-1.52.zip/download
+# Set path to the extracted folder
+$NaturalDocsPath = "C:\Users\indif\Downloads\NaturalDocs"
+$PathToOcapRoot = "C:\Users\indif\Git\OCAP"
+
+
+# For the addon
+$PathToOcapAddons = $PathToOcapRoot + "\addon\x\ocap\addons"
+$PathToProjectFolder = $PathToOcapRoot + "\tools\naturaldocs"
+$PathToOcapDocs = $PathToOcapRoot + "\addon\docs"
+
+$Modules = @("main", "extension", "recorder")
+$OutText = ""
+ForEach ($Module in $Modules) {
+  $GroupText = "Group: $Module {`n"
+  $Files = Get-ChildItem -LiteralPath ("{0}\{1}" -f $PathToOcapAddons, $Module)
+  ForEach ($File in $Files) {
+    $GroupText += ("  File: OCAP_{0}_{1} ({2}\{3})`n" -f @($module, $File.Name.Replace('.sqf',''), $File.Directory.Name, $File.Name))
+  }
+  $GroupText += "} # Group: $Module`n"
+  $OutText += $GroupText
+}
+
+$OutText | clip
+
+Set-Location $NaturalDocsPath
+. .\NaturalDocs.bat -p $PathToProjectFolder -i $PathToOcapAddons -o "HTML" $PathToOcapDocs -ro -hl All
\ No newline at end of file
diff --git a/web b/web
index b273a4d..70e64e6 160000
--- a/web
+++ b/web
@@ -1 +1 @@
-Subproject commit b273a4d6e587862e0a2fb4c2b2c8ba79240ebc42
+Subproject commit 70e64e62b0c4cbd0117ec2de8737baee7d69f480