Including capital gains in regular income taxes _would_ be a tax on wealth, though, wouldn't it? Certainly more so than it is now.
To avoid discouraging savings, the wealth tax could be progressive. The tax on the average citizen's savings is negligible but rentiers pay a substantial portion.
I think an inheritance tax is especially important to prevent the formation of generational wealth.