Style update -- not completely finished