ArchiDroid Scripts Improvements