diff --git a/LaunchServer/src/main/java/ru/gravit/launchserver/binary/tasks/RadonBuildTask.java b/LaunchServer/src/main/java/ru/gravit/launchserver/binary/tasks/RadonBuildTask.java
index 505ed17f..5c1265de 100644
--- a/LaunchServer/src/main/java/ru/gravit/launchserver/binary/tasks/RadonBuildTask.java
+++ b/LaunchServer/src/main/java/ru/gravit/launchserver/binary/tasks/RadonBuildTask.java
@@ -19,6 +19,7 @@ public class RadonBuildTask implements LauncherBuildTask {
     public RadonBuildTask(LaunchServer srv) {
         this.srv = srv;
         config = this.srv.dir.resolve("radon.yml");
+        System.setProperty("radon.useJVMCP", "true");
     }
 
     @Override
diff --git a/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/radon.cfg b/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/radon.cfg
index a72a1ac6..58af0e3b 100644
--- a/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/radon.cfg
+++ b/LaunchServer/src/main/resources/ru/gravit/launchserver/defaults/radon.cfg
@@ -5,20 +5,8 @@ StringEncryption:
 InvokeDynamic: Heavy
 NumberObfuscation: Heavy
 FlowObfuscation: Heavy
-LocalVariables:
-    Enabled: false
-    Remove: true
-LineNumbers:
-    Enabled: false
-    Remove: true
-SourceName:
-    Enabled: false
-    Remove: true
-SourceDebug:
-    Enabled: false
-    Remove: true
 HideCode: true
-Shuffler: false
+Shuffler: true
 Crasher: false
 Optimizer:
     Enabled: true
@@ -27,12 +15,7 @@ Optimizer:
     RemoveNopInstructions: true
 Watermarker:
     Enabled: false
-    Message: "This copy belongs to ItzSomebody"
+    Message: "This copy belongs to GravitLauncher"
     Key: "SuperSecureKey"
-Expiration:
-    Enabled: false
-    InjectJOptionPane: true
-    Message: "Sorry, but your software trial has passed the expiration date. Please pay the ItzSomebody Corporation 1 USD to the paypal address non-existant@troll.email to receive the full version."
-    Expires: "12/31/2018"
 Dictionary: Spaces
 TrashClasses: 200
\ No newline at end of file
diff --git a/Radon b/Radon
index d8ec3cca..161d3940 160000
--- a/Radon
+++ b/Radon
@@ -1 +1 @@
-Subproject commit d8ec3cca611b3daf69e209f05fd97c703ffb530c
+Subproject commit 161d394074f7e51e994215def64b25a8fe46edef