More refactoring + fixed blink drive bolt renderer