Bipolar I and bipolar II, In the first, manic phases are more severe, and in the second, depressive phases are more severe.
There is also cyclothymia
which is a low grade version of bipolar disorder
in general, where mood swings
are not as severe in either direction, manic or depressive. Ideally, yes, mood swing intensity will decrease.