removing nil theme dependency (I use soda now)
adding update/merge commands