changed file structure, sep dark/light themes