diff --git a/oneshot.conf b/oneshot.conf
index d38cc35..c0d8950 100644
--- a/oneshot.conf
+++ b/oneshot.conf
@@ -137,7 +137,7 @@ Modloader.use_default_save_path=false
 pancakes=false
 
 # SecurityManager - component that uses OS security mechanisms to sandbox,
-# recommended use when you play with mods.
+# automaticaly start when modloader is active.
 SecurityEngine=true
 
 # Controls the change of wallpaper
diff --git a/toolchain/arch/alpha.cmake b/toolchain/arch/alpha.cmake
new file mode 100644
index 0000000..89e5c14
--- /dev/null
+++ b/toolchain/arch/alpha.cmake
@@ -0,0 +1,3 @@
+set(ARCH_COMMON "")
+set(ARCH_RELEASE -mcode-density-frame)
+set(ARCH_DEBUG "")
diff --git a/toolchain/arch/arm.cmake b/toolchain/arch/arm.cmake
new file mode 100644
index 0000000..3249041
--- /dev/null
+++ b/toolchain/arch/arm.cmake
@@ -0,0 +1,6 @@
+set(ARCH_COMMON "")
+set(ARCH_RELEASE -momit-leaf-frame-pointer
+-mlow-precision-recip-sqrt
+-mlow-precision-sqrt
+-mlow-precision-div)
+set(ARCH_DEBUG -menable-sysreg-checking)
diff --git a/toolchain/arch/arm64.cmake b/toolchain/arch/arm64.cmake
deleted file mode 100644
index 2310734..0000000
--- a/toolchain/arch/arm64.cmake
+++ /dev/null
@@ -1,9 +0,0 @@
-set(CUSTOM_FLAGS
-  -mlow-precision-recip-sqrt
-  -mlow-precision-sqrt
-  -mlow-precision-div
-)
-
-string(JOIN " " CUSTOM_FLAGS_STR ${CUSTOM_FLAGS})
-set(CMAKE_C_FLAGS_INIT   "${CMAKE_C_FLAGS} ${CUSTOM_FLAGS_STR}")
-set(CMAKE_CXX_FLAGS_INIT "${CMAKE_CXX_FLAGS} ${CUSTOM_FLAGS_STR}")
diff --git a/toolchain/arch/ia-64.cmake b/toolchain/arch/ia-64.cmake
index db2b492..1ca370d 100644
--- a/toolchain/arch/ia-64.cmake
+++ b/toolchain/arch/ia-64.cmake
@@ -1,12 +1,5 @@
-set(CUSTOM_FLAGS
-  -minline-float-divide-min-latency
-  -minline-float-divide-max-throughput
-  -minline-int-divide-min-latency
-  -minline-int-divide-max-throughput
-  -minline-sqrt-min-latency
-  -minline-sqrt-max-throughput
-)
-
-string(JOIN " " CUSTOM_FLAGS_STR ${CUSTOM_FLAGS})
-set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} ${CUSTOM_FLAGS_STR}")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CUSTOM_FLAGS_STR}")
+set(ARCH_COMMON "")
+set(ARCH_RELEASE -minline-sqrt-min-latency
+-minline-int-divide-min-latency
+-minline-float-divide-min-latency)
+set(ARCH_DEBUG "")
diff --git a/toolchain/arch/mips.cmake b/toolchain/arch/mips.cmake
new file mode 100644
index 0000000..64c2b9b
--- /dev/null
+++ b/toolchain/arch/mips.cmake
@@ -0,0 +1,3 @@
+set(ARCH_COMMON "")
+set(ARCH_RELEASE -mno-check-zero-division)
+set(ARCH_DEBUG "")
diff --git a/toolchain/arch/riscv.cmake b/toolchain/arch/riscv.cmake
new file mode 100644
index 0000000..e538769
--- /dev/null
+++ b/toolchain/arch/riscv.cmake
@@ -0,0 +1,4 @@
+set(ARCH_COMMON "")
+set(ARCH_RELEASE -momit-leaf-frame-pointer
+-mno-csr-check)
+set(ARCH_DEBUG -mcsr-check)