Clean up + add some css completions, closes #61