Adjust generator:app theme paths and some clean up