I've looked at a lot, but I've now ended up with three new editors/IDEs installed: 1) KDevelop (pretty powerful but also feels complicated), 2) Brackets (in principle for only HTML, CSS and JavaScript, but plugins add a lot of support for PHP), 3) Aptana Studio (based on Eclipse, so not a lightweight, but it has excellent support for PHP, but apparently much less for CSS and JavaScript). I expect I'll mostly use the last two, in combination - both have Git support (Brackets through a plugin). # # # # #