diff --git a/config.json b/config.json
index 59c4404..60dc8b5 100644
--- a/config.json
+++ b/config.json
@@ -13,15 +13,6 @@
   "api_local_base_url": "http://dev-fastapi.oneskyit.local:5005",
   "access_control_allow_origin": "*",
 
-  "api_auth_loop_interval": 100,
-  "api_token_update_loop_interval": 120000,
-
-  "open_tables_loop_interval": 10,
-  "update_idb_loop_interval": 10,
-  "idb_to_launcher_loop_interval": 250,
-  "update_render_loop_interval": 1000,
-  "check_file_cache_loop_interval": 250,
-
   "use_local_api": true,
   "use_local_db": false,
 
@@ -37,6 +28,26 @@
   "host_file_cache_check_period": 30000,
   "host_file_temp_path": "temp",
 
+  "main_loop_interval": 2000,
+  "api_token_loop_interval": 1000,
+  "api_update_period": 90000,
+  "api_auth_loop_interval": 100,
+  "api_token_update_loop_interval": 120000,
+
+  "open_tables_loop_interval": 10,
+  "update_idb_loop_interval": 10,
+  "idb_to_launcher_loop_interval": 250,
+  "update_render_loop_interval": 1000,
+  "check_file_cache_loop_interval": 250,
+
+  "display_menu_session_times": true,
+  "display_session_codes": true,
+  "display_session_badges": true,
+  "display_presentation_codes": true,
+  "display_presentation_badges": true,
+  "display_presenter_codes": true,
+  "display_presenter_badges": true,
+
   "display_arrangement": "mirror_and_extend",
   "display_builtin_resolution": "",
   "display_builtin_refresh": "",
@@ -44,8 +55,10 @@
   "display_external_resolution": "",
   "display_external_refresh": "",
   "display_external_rotation": "",
+
   "audio_out_volume": null,
   "audio_in_volume": null,
+
   "recording_fps": 30,
   "recording_show_cursor": true,
   "recording_highlight_clicks": false,
diff --git a/config.json.default b/config.json.default
index f2027db..da72708 100644
--- a/config.json.default
+++ b/config.json.default
@@ -1,39 +1,45 @@
 {
-  "account_id": "_XY7DXtc9MY",
-  "event_id": "pjrcghqwert",
-  "event_location_id": "LUNt2zdMKCUNb9VReMZu8A",
-  "main_loop_interval": 2000,
-  "api_token_loop_interval": 1000,
-  "api_update_period": 90000,
-  "api_secret_key": "dFP6J9DVj9hUgIMn-fNIqg",
-  "use_local_api": true,
-  "use_local_db": false,
+  "account_id": null,
+  "event_id": null,
+  "event_device_id": null
+  "event_location_id": null,
+  "event_session_id": null,
+  "event_presentation_id": null,
+  "event_presenter_id": null,
+  "event_file_id": null,
+
+  "api_secret_key": "XXXXXX",
   "api_remote_base_url": "https://dev-fastapi.oneskyit.com",
   "api_local_base_url": "http://dev-fastapi.oneskyit.local:5005",
   "access_control_allow_origin": "*",
-  "remote_db_server": "linode.oneskyit.com",
-  "remote_db_port": "3306",
-  "remote_db_name": "onesky_ams_test",
-  "remote_db_username": "username_here",
-  "remote_db_password": "password_here",
-  "local_db_server": "db.oneskyit.local",
-  "local_db_port": "3306",
-  "local_db_name": "onesky_ams_test",
-  "local_db_username": "username_here",
-  "local_db_password": "password_here",
-  "update_idb_loop_interval": 1000,
+
+  "use_local_api": true,
+  "use_local_db": false,
+
   "idb_name": "osit",
-  "idb_check_period": 30000,
   "idb_event_check_period": 120000,
   "idb_event_location_check_period": 90000,
-  "idb_event_session_check_period": 60000,
-  "idb_event_presentation_check_period": 60000,
+  "idb_event_session_check_period": 90000,
+  "idb_event_presentation_check_period": 90000,
   "idb_event_presenter_check_period": 60000,
-  "idb_event_file_check_period": 60000,
-  "check_file_cache_loop_interval": 250,
-  "host_file_cache_path": "file_cache",
+  "idb_event_file_check_period": 30000,
+
+  "host_file_cache_path": "[home]/OSIT/file_cache",
   "host_file_cache_check_period": 30000,
+  "host_file_temp_path": "[home]/OSIT/temp",
+
+  "main_loop_interval": 2000,
+  "api_token_loop_interval": 1000,
+  "api_update_period": 90000,
+  "api_auth_loop_interval": 100,
+  "api_token_update_loop_interval": 120000,
+
+  "open_tables_loop_interval": 10,
+  "update_idb_loop_interval": 10,
+  "idb_to_launcher_loop_interval": 250,
   "update_render_loop_interval": 1000,
+  "check_file_cache_loop_interval": 250,
+
   "display_menu_session_times": true,
   "display_session_codes": true,
   "display_session_badges": true,
@@ -41,6 +47,7 @@
   "display_presentation_badges": true,
   "display_presenter_codes": true,
   "display_presenter_badges": true,
+
   "display_arrangement": "mirror_and_extend",
   "display_builtin_resolution": "",
   "display_builtin_refresh": "",
@@ -48,18 +55,20 @@
   "display_external_resolution": "",
   "display_external_refresh": "",
   "display_external_rotation": "",
+
   "audio_out_volume": null,
   "audio_in_volume": null,
-  "fps": 30,
-  "show_cursor": true,
-  "highlight_clicks": false,
-  "screen_id": null,
-  "audio_device_id": null,
+
+  "recording_fps": 30,
+  "recording_show_cursor": true,
+  "recording_highlight_clicks": false,
+  "recording_screen_id": null,
+  "recording_audio_device_id": null,
   "known_builtin_screen_ids": [69732032, 69733952, 69733248],
   "known_builtin_audio_device_ids": [ "AppleHDAEngineInput:1B,0,1,0:1", "BuiltInMicrophoneDevice" ],
-  "video_codec": "h264",
-  "recordings_path": "[home]/recordings",
-  "base_filename": "recording",
+  "recording_video_codec": "h264",
+  "recording_path": "[home]/recordings",
+  "recording_base_filename": "recording",
   "aperture_bin_path": null,
   "recording_start_datetime": "2019-10-12 01:01:01Z",
   "recording_stop_datetime": "2019-10-31 23:59:59Z",