Added support for themes (Donation Package)
Fixed little bugs