Move own bundles into new file
Use solarized colors