Further cleaning up of functions and lib, fixing bug with theme activation class

Signed-off-by: Matt Keys <matt@uptrending.com>