Proper implemetatin of the theme part 1