Scripts/HoR: Further improvements

Signed-off-by: Teddy <admin@assets-incorporated.de>