Themization added and refactored lozalization