Command Updated. Theme support added.