changed a few things from nil to null, reverted back to classic theme for now