diff --git a/main/component.mk b/main/component.mk
index 24356f2..61f8990 100644
--- a/main/component.mk
+++ b/main/component.mk
@@ -1,10 +1,8 @@
 #
-# Main Makefile. This is basically the same as a component makefile.
+# Main component makefile.
 #
-# This Makefile should, at the very least, just include $(SDK_PATH)/make/component_common.mk. By default, 
-# this will take the sources in the src/ directory, compile them and link them into 
-# lib(subdirectory_name).a in the build directory. This behaviour is entirely configurable,
+# This Makefile can be left empty. By default, it will take the sources in the 
+# src/ directory, compile them and link them into lib(subdirectory_name).a 
+# in the build directory. This behaviour is entirely configurable,
 # please read the ESP-IDF documents if you need to do this.
 #
-
-include $(IDF_PATH)/make/component_common.mk
diff --git a/main/main.c b/main/main.c
index 63b28b4..6425a90 100644
--- a/main/main.c
+++ b/main/main.c
@@ -14,7 +14,6 @@ esp_err_t event_handler(void *ctx, system_event_t *event)
 void app_main(void)
 {
     nvs_flash_init();
-    system_init();
     tcpip_adapter_init();
     ESP_ERROR_CHECK( esp_event_loop_init(event_handler, NULL) );
     wifi_init_config_t cfg = WIFI_INIT_CONFIG_DEFAULT();
diff --git a/sdkconfig b/sdkconfig
index 3643984..5cc493d 100644
--- a/sdkconfig
+++ b/sdkconfig
@@ -20,6 +20,14 @@ CONFIG_LOG_BOOTLOADER_LEVEL_WARN=y
 # CONFIG_LOG_BOOTLOADER_LEVEL_VERBOSE is not set
 CONFIG_LOG_BOOTLOADER_LEVEL=2
 
+#
+# Secure boot configuration
+#
+CONFIG_SECURE_BOOTLOADER_DISABLED=y
+# CONFIG_SECURE_BOOTLOADER_ONE_TIME_FLASH is not set
+# CONFIG_SECURE_BOOTLOADER_REFLASHABLE is not set
+# CONFIG_SECURE_BOOTLOADER_ENABLED is not set
+
 #
 # Serial flasher config
 #
@@ -42,6 +50,12 @@ CONFIG_ESPTOOLPY_FLASHFREQ_40M=y
 # CONFIG_ESPTOOLPY_FLASHFREQ_26M is not set
 # CONFIG_ESPTOOLPY_FLASHFREQ_20M is not set
 CONFIG_ESPTOOLPY_FLASHFREQ="40m"
+# CONFIG_ESPTOOLPY_FLASHSIZE_1MB is not set
+CONFIG_ESPTOOLPY_FLASHSIZE_2MB=y
+# CONFIG_ESPTOOLPY_FLASHSIZE_4MB is not set
+# CONFIG_ESPTOOLPY_FLASHSIZE_8MB is not set
+# CONFIG_ESPTOOLPY_FLASHSIZE_16MB is not set
+CONFIG_ESPTOOLPY_FLASHSIZE="2MB"
 
 #
 # Partition Table
@@ -53,10 +67,14 @@ CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
 CONFIG_PARTITION_TABLE_CUSTOM_APP_BIN_OFFSET=0x10000
 CONFIG_PARTITION_TABLE_FILENAME="partitions_singleapp.csv"
 CONFIG_APP_OFFSET=0x10000
+CONFIG_PHY_DATA_OFFSET=0xf000
+CONFIG_OPTIMIZATION_LEVEL_DEBUG=y
+# CONFIG_OPTIMIZATION_LEVEL_RELEASE is not set
 
 #
 # Component config
 #
+CONFIG_BT_RESERVE_DRAM=0
 
 #
 # ESP32-specific config
@@ -70,12 +88,33 @@ CONFIG_ESP32_ENABLE_STACK_WIFI=y
 # CONFIG_ESP32_ENABLE_STACK_NONE is not set
 CONFIG_MEMMAP_SMP=y
 # CONFIG_MEMMAP_TRACEMEM is not set
-# CONFIG_MEMMAP_SPISRAM is not set
+CONFIG_TRACEMEM_RESERVE_DRAM=0x0
 CONFIG_WIFI_ENABLED=y
 CONFIG_SYSTEM_EVENT_QUEUE_SIZE=32
 CONFIG_SYSTEM_EVENT_TASK_STACK_SIZE=2048
 CONFIG_MAIN_TASK_STACK_SIZE=4096
 CONFIG_NEWLIB_STDOUT_ADDCR=y
+# CONFIG_ULP_COPROC_ENABLED is not set
+CONFIG_ULP_COPROC_RESERVE_MEM=0
+# CONFIG_ESP32_PANIC_PRINT_HALT is not set
+CONFIG_ESP32_PANIC_PRINT_REBOOT=y
+# CONFIG_ESP32_PANIC_SILENT_REBOOT is not set
+# CONFIG_ESP32_PANIC_GDBSTUB is not set
+CONFIG_ESP32_DEBUG_OCDAWARE=y
+CONFIG_INT_WDT=y
+CONFIG_INT_WDT_TIMEOUT_MS=300
+CONFIG_TASK_WDT=y
+# CONFIG_TASK_WDT_PANIC is not set
+CONFIG_TASK_WDT_TIMEOUT_S=5
+CONFIG_TASK_WDT_CHECK_IDLE_TASK=y
+# CONFIG_ESP32_TIME_SYSCALL_USE_RTC is not set
+CONFIG_ESP32_TIME_SYSCALL_USE_RTC_FRC1=y
+# CONFIG_ESP32_TIME_SYSCALL_USE_FRC1 is not set
+# CONFIG_ESP32_TIME_SYSCALL_USE_NONE is not set
+CONFIG_ESP32_RTC_CLOCK_SOURCE_INTERNAL_RC=y
+CONFIG_ESP32_PHY_AUTO_INIT=y
+# CONFIG_ESP32_PHY_INIT_DATA_IN_PARTITION is not set
+CONFIG_ESP32_PHY_MAX_TX_POWER=20
 
 #
 # FreeRTOS
@@ -85,20 +124,18 @@ CONFIG_FREERTOS_CORETIMER_0=y
 # CONFIG_FREERTOS_CORETIMER_1 is not set
 # CONFIG_FREERTOS_CORETIMER_2 is not set
 CONFIG_FREERTOS_HZ=1000
+CONFIG_FREERTOS_ASSERT_ON_UNTESTED_FUNCTION=y
 # CONFIG_FREERTOS_CHECK_STACKOVERFLOW_NONE is not set
 CONFIG_FREERTOS_CHECK_STACKOVERFLOW_PTRVAL=y
 # CONFIG_FREERTOS_CHECK_STACKOVERFLOW_CANARY is not set
 CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS=3
-# CONFIG_FREERTOS_PANIC_PRINT_HALT is not set
-CONFIG_FREERTOS_PANIC_PRINT_REBOOT=y
-# CONFIG_FREERTOS_PANIC_SILENT_REBOOT is not set
-# CONFIG_FREERTOS_PANIC_GDBSTUB is not set
-CONFIG_FREERTOS_DEBUG_OCDAWARE=y
 CONFIG_FREERTOS_ASSERT_FAIL_ABORT=y
 # CONFIG_FREERTOS_ASSERT_FAIL_PRINT_CONTINUE is not set
 # CONFIG_FREERTOS_ASSERT_DISABLE is not set
 CONFIG_FREERTOS_BREAK_ON_SCHEDULER_START_JTAG=y
 # CONFIG_ENABLE_MEMORY_DEBUG is not set
+CONFIG_FREERTOS_ISR_STACKSIZE=1536
+# CONFIG_FREERTOS_LEGACY_HOOKS is not set
 # CONFIG_FREERTOS_DEBUG_INTERNALS is not set
 
 #
@@ -116,15 +153,21 @@ CONFIG_LOG_COLORS=y
 #
 # LWIP
 #
+# CONFIG_L2_TO_L3_COPY is not set
 CONFIG_LWIP_MAX_SOCKETS=4
 CONFIG_LWIP_THREAD_LOCAL_STORAGE_INDEX=0
 # CONFIG_LWIP_SO_REUSE is not set
+CONFIG_LWIP_DHCP_MAX_NTP_SERVERS=1
 
 #
 # mbedTLS
 #
 CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN=16384
 # CONFIG_MBEDTLS_DEBUG is not set
+CONFIG_MBEDTLS_HARDWARE_AES=y
+CONFIG_MBEDTLS_HARDWARE_MPI=y
+CONFIG_MBEDTLS_MPI_USE_INTERRUPT=y
+CONFIG_MBEDTLS_MPI_INTERRUPT_NUM=18
 
 #
 # SPI Flash driver