perf: made thing in sync with theme