NOJIRA remove old code
NOJIRA split Mattress Factory (mf) theme off from default