Making theme more responsive