adding filters and some theme support