Removed custom theme and added default theme
Changed if statements to inline if statements