From 23c2e5364a56d2a8e292f38c2d42e97da85ff1c9 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 7 Nov 2016 14:24:19 +0300
Subject: [PATCH] Removed anim::cvalue and ColorAnimation, all done by fvalue
 now.

Also moved style::interpolate to anim::color/anim::pen/anim::brush.
---
 Telegram/Resources/basic.style                |  12 +-
 Telegram/Resources/basic_types.style          |   8 -
 Telegram/Resources/colors.palette             |  17 +-
 Telegram/Resources/sample.tdesktop-theme      |  17 +-
 Telegram/SourceFiles/boxes/contactsbox.cpp    |  12 +-
 Telegram/SourceFiles/boxes/sharebox.cpp       |  16 +-
 Telegram/SourceFiles/boxes/sharebox.h         |   2 +-
 .../SourceFiles/codegen/style/generator.cpp   |   4 -
 .../SourceFiles/codegen/style/parsed_file.cpp |  27 --
 .../SourceFiles/codegen/style/parsed_file.h   |   2 -
 .../codegen/style/structure_types.cpp         |   2 -
 .../codegen/style/structure_types.h           |   1 -
 Telegram/SourceFiles/core/lambda_wrap.h       |  15 +-
 Telegram/SourceFiles/dialogs/dialogs.style    |   8 -
 .../SourceFiles/dialogs/dialogs_layout.cpp    |  11 +-
 Telegram/SourceFiles/dialogs/dialogs_layout.h |   1 +
 Telegram/SourceFiles/dialogswidget.cpp        |   6 +-
 Telegram/SourceFiles/history/history.style    |   3 -
 .../SourceFiles/history/history_drag_area.cpp |  20 +-
 .../SourceFiles/history/history_drag_area.h   |   2 +-
 .../history/history_media_types.cpp           |  10 +-
 Telegram/SourceFiles/historywidget.cpp        |  24 +-
 Telegram/SourceFiles/historywidget.h          |   2 +-
 .../inline_bot_layout_internal.cpp            |   8 +-
 Telegram/SourceFiles/intro/intro.style        |   4 -
 Telegram/SourceFiles/intro/introwidget.cpp    |  15 +-
 Telegram/SourceFiles/mainwidget.cpp           |   6 +-
 Telegram/SourceFiles/mediaview.cpp            |  12 +-
 .../SourceFiles/overview/overview_layout.cpp  |  16 +-
 Telegram/SourceFiles/overviewwidget.cpp       |   6 +-
 Telegram/SourceFiles/passcodewidget.cpp       |   7 +-
 .../platform/win/main_window_win.cpp          |   2 +-
 Telegram/SourceFiles/stdafx.h                 |   2 +-
 Telegram/SourceFiles/stickers/emoji_pan.cpp   |   8 +-
 Telegram/SourceFiles/ui/animation.cpp         |  42 +-
 Telegram/SourceFiles/ui/animation.h           | 367 ++++++++----------
 .../SourceFiles/ui/buttons/icon_button.cpp    |  10 +-
 Telegram/SourceFiles/ui/buttons/icon_button.h |   2 +-
 .../ui/effects/round_image_checkbox.cpp       |   2 +-
 Telegram/SourceFiles/ui/flatbutton.cpp        |  33 +-
 Telegram/SourceFiles/ui/flatbutton.h          |   2 +-
 Telegram/SourceFiles/ui/flatinput.cpp         | 141 ++++---
 Telegram/SourceFiles/ui/flatinput.h           |  20 +-
 Telegram/SourceFiles/ui/flattextarea.cpp      |  18 +-
 Telegram/SourceFiles/ui/flattextarea.h        |   2 +-
 Telegram/SourceFiles/ui/scrollarea.cpp        |  72 ++--
 Telegram/SourceFiles/ui/scrollarea.h          |   2 +-
 .../SourceFiles/ui/style/style_core_color.h   |  23 --
 .../SourceFiles/ui/style/style_core_types.h   |   2 -
 .../SourceFiles/ui/widgets/media_slider.cpp   |  24 +-
 .../SourceFiles/ui/widgets/multi_select.cpp   |   2 +-
 .../window/notifications_manager_default.cpp  |   2 +-
 .../SourceFiles/window/slide_animation.cpp    |   6 +-
 Telegram/SourceFiles/window/slide_animation.h |   4 +
 Telegram/SourceFiles/window/window.style      |   1 -
 55 files changed, 483 insertions(+), 602 deletions(-)

diff --git a/Telegram/Resources/basic.style b/Telegram/Resources/basic.style
index 152e9870a..8992a0b5a 100644
--- a/Telegram/Resources/basic.style
+++ b/Telegram/Resources/basic.style
@@ -63,7 +63,7 @@ defaultBoxButton: RoundButton {
 	secondaryTextFg: #2f9fea;
 	secondaryTextFgOver: #2f9fea;
 	textBg: boxBg;
-	textBgOver: #edf7ff;
+	textBgOver: lightButtonBgOver;
 
 	width: -24px;
 	height: 36px;
@@ -280,7 +280,6 @@ slideDuration: 240;
 slideShift: 100px;
 slideFadeOutBg: #0000003c;
 slideShadow: icon {{ "slide_shadow", #000000 }};
-slideFunction: transition(easeOutCirc);
 
 btnYesColor: #0080c0;
 btnYesHover: #0073ad;
@@ -321,9 +320,6 @@ inpDefFlat: flatInput {
 	phPos: point(2px, 0px);
 	phShift: 50px;
 	phDuration: 100;
-	phLeftFunc: transition(linear);
-	phAlphaFunc: transition(linear);
-	phColorFunc: transition(linear);
 }
 
 inpDefGray: flatInput(inpDefFlat) {
@@ -691,11 +687,9 @@ btnSend: flatButton {
 
 	color: btnYesColor;
 	overColor: btnYesHover;
-	downColor: btnYesHover;
 
 	bgColor: historySendBg;
 	overBgColor: historySendBgOver;
-	downBgColor: historySendBgOver;
 
 	width: -32px;
 	height: 46px;
@@ -710,7 +704,6 @@ btnSend: flatButton {
 btnUnblock: flatButton(btnSend) {
 	color: #d15948;
 	overColor: #d15948;
-	downColor: #db6352;
 }
 
 historyScroll: flatScroll(scrollDef) {
@@ -737,11 +730,9 @@ reportSpamHide: flatButton {
 
 	color: btnYesColor;
 	overColor: btnYesHover;
-	downColor: btnYesHover;
 
 	bgColor: transparent;
 	overBgColor: transparent;
-	downBgColor: transparent;
 
 	width: -40px;
 	height: 46px;
@@ -763,7 +754,6 @@ reportSpamButton: flatButton(reportSpamHide) {
 
 	bgColor: #888888;
 	overBgColor: #7b7b7b;
-	downBgColor: #7b7b7b;
 }
 reportSpamSeparator: 30px;
 reportSpamBg: #fffffff0;
diff --git a/Telegram/Resources/basic_types.style b/Telegram/Resources/basic_types.style
index 3e343c13b..fdf78866f 100644
--- a/Telegram/Resources/basic_types.style
+++ b/Telegram/Resources/basic_types.style
@@ -41,11 +41,9 @@ linkButton {
 flatButton {
 	color: color;
 	overColor: color;
-	downColor: color;
 
 	bgColor: color;
 	overBgColor: color;
-	downBgColor: color;
 
 	width: pixels;
 	height: pixels;
@@ -84,9 +82,6 @@ flatInput {
 	phAlign: align;
 	phShift: pixels;
 	phDuration: int;
-	phLeftFunc: transition;
-	phAlphaFunc: transition;
-	phColorFunc: transition;
 }
 
 flatTextarea {
@@ -104,9 +99,6 @@ flatTextarea {
 	phAlign: align;
 	phShift: pixels;
 	phDuration: int;
-	phLeftFunc: transition;
-	phAlphaFunc: transition;
-	phColorFunc: transition;
 }
 
 flatScroll {
diff --git a/Telegram/Resources/colors.palette b/Telegram/Resources/colors.palette
index dc3c4a898..d7fc7245a 100644
--- a/Telegram/Resources/colors.palette
+++ b/Telegram/Resources/colors.palette
@@ -34,14 +34,14 @@ imageBgTransparent: #ffffff;
 
 // widgets
 activeButtonBg: windowActiveFill;
-activeButtonBgOver: #46b4eb | activeButtonBg;
+activeButtonBgOver: #46b4eb;
 activeButtonFg: #ffffff;
 activeButtonFgOver: activeButtonFg;
 activeButtonSecondaryFg: #cceeff;
 activeButtonSecondaryFgOver: activeButtonSecondaryFg;
 
 lightButtonBg: windowBg;
-lightButtonBgOver: #f2f7fa | lightButtonBg;
+lightButtonBgOver: #edf7ff;
 lightButtonFg: #2b99d5;
 lightButtonFgOver: lightButtonFg;
 
@@ -74,7 +74,7 @@ boxBg: windowBg;
 boxTextFg: windowTextFg;
 boxTextFgGood: #4ab44a;
 boxTextFgError: #d84d4d;
-boxTitleFg: #404040 | windowTextFg;
+boxTitleFg: #404040;
 boxSearchBg: boxBg;
 boxSearchCancelIconFg: cancelIconFg;
 boxSearchCancelIconFgOver: cancelIconFgOver;
@@ -108,7 +108,7 @@ introErrorFg: windowTextFg;
 dialogsMenuIconFg: menuIconFg;
 
 dialogsBg: windowBg;
-dialogsNameFg: #373737 | windowTextFg;
+dialogsNameFg: #373737;
 dialogsChatIconFg: dialogsNameFg;
 dialogsDateFg: windowSubTextFg;
 dialogsTextFg: windowSubTextFg;
@@ -118,6 +118,9 @@ dialogsVerifiedIconBg: #4abcf1;
 dialogsVerifiedIconFg: #ffffff;
 dialogsSendingIconFg: #c1c1c1;
 dialogsSentIconFg: #5dc452;
+dialogsUnreadBg: windowActiveFill;
+dialogsUnreadBgMuted: #bbbbbb;
+dialogsUnreadFg: #ffffff;
 
 dialogsBgOver: windowOverBg;
 dialogsNameFgOver: windowTextFg;
@@ -130,6 +133,9 @@ dialogsVerifiedIconBgOver: dialogsVerifiedIconBg;
 dialogsVerifiedIconFgOver: dialogsVerifiedIconFg;
 dialogsSendingIconFgOver: dialogsSendingIconFg;
 dialogsSentIconFgOver: dialogsSentIconFg;
+dialogsUnreadBgOver: dialogsUnreadBg;
+dialogsUnreadBgMutedOver: dialogsUnreadBgMuted;
+dialogsUnreadFgOver: dialogsUnreadFg;
 
 dialogsBgActive: dialogsBgOver;
 dialogsNameFgActive: dialogsNameFgOver;
@@ -142,6 +148,9 @@ dialogsVerifiedIconBgActive: dialogsVerifiedIconBgOver;
 dialogsVerifiedIconFgActive: dialogsVerifiedIconFgOver;
 dialogsSendingIconFgActive: dialogsSendingIconFgOver;
 dialogsSentIconFgActive: dialogsSentIconFgOver;
+dialogsUnreadBgActive: dialogsUnreadBgOver;
+dialogsUnreadBgMutedActive: dialogsUnreadBgMutedOver;
+dialogsUnreadFgActive: dialogsUnreadFgOver;
 
 dialogsForwardFg: #ffffff;
 
diff --git a/Telegram/Resources/sample.tdesktop-theme b/Telegram/Resources/sample.tdesktop-theme
index abd4bb402..6a55e0c44 100644
--- a/Telegram/Resources/sample.tdesktop-theme
+++ b/Telegram/Resources/sample.tdesktop-theme
@@ -32,13 +32,13 @@ windowShadowFg: #000000;
 imageBg: #000000;
 imageBgTransparent: #ffffff;
 activeButtonBg: windowActiveFill;
-activeButtonBgOver: #46b4eb; // activeButtonBg;
+activeButtonBgOver: #46b4eb;
 activeButtonFg: #ffffff;
 activeButtonFgOver: activeButtonFg;
 activeButtonSecondaryFg: #cceeff;
 activeButtonSecondaryFgOver: activeButtonSecondaryFg;
 lightButtonBg: windowBg;
-lightButtonBgOver: #f2f7fa; // lightButtonBg;
+lightButtonBgOver: #edf7ff;
 lightButtonFg: #2b99d5;
 lightButtonFgOver: lightButtonFg;
 menuIconFg: windowSubTextFg;
@@ -61,7 +61,7 @@ boxBg: windowBg;
 boxTextFg: windowTextFg;
 boxTextFgGood: #4ab44a;
 boxTextFgError: #d84d4d;
-boxTitleFg: #404040; // windowTextFg;
+boxTitleFg: #404040;
 boxSearchBg: boxBg;
 boxSearchCancelIconFg: cancelIconFg;
 boxSearchCancelIconFgOver: cancelIconFgOver;
@@ -83,7 +83,7 @@ introHeaderFg: windowTextFg;
 introErrorFg: windowTextFg;
 dialogsMenuIconFg: menuIconFg;
 dialogsBg: windowBg;
-dialogsNameFg: #373737; // windowTextFg;
+dialogsNameFg: #373737;
 dialogsChatIconFg: dialogsNameFg;
 dialogsDateFg: windowSubTextFg;
 dialogsTextFg: windowSubTextFg;
@@ -93,6 +93,9 @@ dialogsVerifiedIconBg: #4abcf1;
 dialogsVerifiedIconFg: #ffffff;
 dialogsSendingIconFg: #c1c1c1;
 dialogsSentIconFg: #5dc452;
+dialogsUnreadBg: windowActiveFill;
+dialogsUnreadBgMuted: #bbbbbb;
+dialogsUnreadFg: #ffffff;
 dialogsBgOver: windowOverBg;
 dialogsNameFgOver: windowTextFg;
 dialogsChatIconFgOver: dialogsNameFgOver;
@@ -104,6 +107,9 @@ dialogsVerifiedIconBgOver: dialogsVerifiedIconBg;
 dialogsVerifiedIconFgOver: dialogsVerifiedIconFg;
 dialogsSendingIconFgOver: dialogsSendingIconFg;
 dialogsSentIconFgOver: dialogsSentIconFg;
+dialogsUnreadBgOver: dialogsUnreadBg;
+dialogsUnreadBgMutedOver: dialogsUnreadBgMuted;
+dialogsUnreadFgOver: dialogsUnreadFg;
 dialogsBgActive: dialogsBgOver;
 dialogsNameFgActive: dialogsNameFgOver;
 dialogsChatIconFgActive: dialogsNameFgActive;
@@ -115,6 +121,9 @@ dialogsVerifiedIconBgActive: dialogsVerifiedIconBgOver;
 dialogsVerifiedIconFgActive: dialogsVerifiedIconFgOver;
 dialogsSendingIconFgActive: dialogsSendingIconFgOver;
 dialogsSentIconFgActive: dialogsSentIconFgOver;
+dialogsUnreadBgActive: dialogsUnreadBgOver;
+dialogsUnreadBgMutedActive: dialogsUnreadBgMutedOver;
+dialogsUnreadFgActive: dialogsUnreadFgOver;
 dialogsForwardFg: #ffffff;
 topBarBg: windowBg;
 emojiPanBg: windowBg;
diff --git a/Telegram/SourceFiles/boxes/contactsbox.cpp b/Telegram/SourceFiles/boxes/contactsbox.cpp
index 4504d8a2f..3f056af98 100644
--- a/Telegram/SourceFiles/boxes/contactsbox.cpp
+++ b/Telegram/SourceFiles/boxes/contactsbox.cpp
@@ -969,19 +969,11 @@ void ContactsBox::Inner::paintDialog(Painter &p, uint64 ms, PeerData *peer, Cont
 		namew -= icon->width();
 		icon->paint(p, namex + qMin(data->name.maxWidth(), namew), st::contactsPadding.top() + st::contactsNameTop, width());
 	}
-	if (checkedRatio > 0) {
-		if (checkedRatio < 1) {
-			p.setPen(style::interpolate(st::contactsNameFg, st::contactsNameCheckedFg, checkedRatio));
-		} else {
-			p.setPen(st::contactsNameCheckedFg);
-		}
-	} else {
-		p.setPen(st::contactsNameFg);
-	}
+	p.setPen(anim::pen(st::contactsNameFg, st::contactsNameCheckedFg, checkedRatio));
 	data->name.drawLeftElided(p, namex, st::contactsPadding.top() + st::contactsNameTop, namew, width());
 
 	bool uname = (user || peer->isChannel()) && (data->statusText.at(0) == '@');
-	p.setFont(st::contactsStatusFont->f);
+	p.setFont(st::contactsStatusFont);
 	if (uname && !_lastQuery.isEmpty() && peer->userName().startsWith(_lastQuery, Qt::CaseInsensitive)) {
 		int availw = width() - namex - st::contactsPadding.right();
 		QString first = '@' + peer->userName().mid(0, _lastQuery.size()), second = peer->userName().mid(_lastQuery.size());
diff --git a/Telegram/SourceFiles/boxes/sharebox.cpp b/Telegram/SourceFiles/boxes/sharebox.cpp
index 7ce9e5405..16a20cca7 100644
--- a/Telegram/SourceFiles/boxes/sharebox.cpp
+++ b/Telegram/SourceFiles/boxes/sharebox.cpp
@@ -485,16 +485,16 @@ ShareBox::Inner::Chat *ShareBox::Inner::getChat(Dialogs::Row *row) {
 
 void ShareBox::Inner::setActive(int active) {
 	if (active != _active) {
-		auto changeNameFg = [this](int index, const style::color &from, const style::color &to) {
+		auto changeNameFg = [this](int index, float64 from, float64 to) {
 			if (auto chat = getChatAtIndex(index)) {
-				chat->nameFg.start([this, peer = chat->peer] {
+				chat->nameActive.start([this, peer = chat->peer] {
 					repaintChat(peer);
-				}, from->c, to->c, st::shareActivateDuration);
+				}, from, to, st::shareActivateDuration);
 			}
 		};
-		changeNameFg(_active, st::shareNameActiveFg, st::shareNameFg);
+		changeNameFg(_active, 1., 0.);
 		_active = active;
-		changeNameFg(_active, st::shareNameFg, st::shareNameActiveFg);
+		changeNameFg(_active, 0., 1.);
 	}
 	auto y = (_active < _columnCount) ? 0 : (_rowsTop + ((_active / _columnCount) * _rowHeight));
 	emit mustScrollTo(y, y + _rowHeight);
@@ -509,11 +509,7 @@ void ShareBox::Inner::paintChat(Painter &p, uint64 ms, Chat *chat, int index) {
 	auto photoTop = st::sharePhotoTop;
 	chat->checkbox.paint(p, ms, x + photoLeft, y + photoTop, outerWidth);
 
-	if (chat->nameFg.animating()) {
-		p.setPen(chat->nameFg.current());
-	} else {
-		p.setPen((index == _active) ? st::shareNameActiveFg : st::shareNameFg);
-	}
+	p.setPen(anim::pen(st::shareNameFg, st::shareNameActiveFg, chat->nameActive.current((index == _active) ? 1. : 0.)));
 
 	auto nameWidth = (_rowWidth - st::shareColumnSkip);
 	auto nameLeft = st::shareColumnSkip / 2;
diff --git a/Telegram/SourceFiles/boxes/sharebox.h b/Telegram/SourceFiles/boxes/sharebox.h
index 413344ca5..196a6912b 100644
--- a/Telegram/SourceFiles/boxes/sharebox.h
+++ b/Telegram/SourceFiles/boxes/sharebox.h
@@ -162,7 +162,7 @@ private:
 		PeerData *peer;
 		Ui::RoundImageCheckbox checkbox;
 		Text name;
-		ColorAnimation nameFg;
+		FloatAnimation nameActive;
 	};
 	void paintChat(Painter &p, uint64 ms, Chat *chat, int index);
 	void updateChat(PeerData *peer);
diff --git a/Telegram/SourceFiles/codegen/style/generator.cpp b/Telegram/SourceFiles/codegen/style/generator.cpp
index 0b1db3d34..379022939 100644
--- a/Telegram/SourceFiles/codegen/style/generator.cpp
+++ b/Telegram/SourceFiles/codegen/style/generator.cpp
@@ -284,7 +284,6 @@ QString Generator::typeToString(structure::Type type) const {
 	case Tag::Color: return "style::color";
 	case Tag::Point: return "style::point";
 	case Tag::Size: return "style::size";
-	case Tag::Transition: return "style::transition";
 	case Tag::Cursor: return "style::cursor";
 	case Tag::Align: return "style::align";
 	case Tag::Margins: return "style::margins";
@@ -306,7 +305,6 @@ QString Generator::typeToDefaultValue(structure::Type type) const {
 	case Tag::Color: return "{ Qt::Uninitialized }";
 	case Tag::Point: return "{ 0, 0 }";
 	case Tag::Size: return "{ 0, 0 }";
-	case Tag::Transition: return "anim::linear";
 	case Tag::Cursor: return "style::cur_default";
 	case Tag::Align: return "style::al_topleft";
 	case Tag::Margins: return "{ 0, 0, 0, 0 }";
@@ -357,7 +355,6 @@ QString Generator::valueAssignmentCode(structure::Value value) const {
 		auto v(value.Size());
 		return QString("{ %1, %2 }").arg(pxValueName(v.width)).arg(pxValueName(v.height));
 	} break;
-	case Tag::Transition: return QString("anim::%1").arg(value.String().c_str());
 	case Tag::Cursor: return QString("style::cur_%1").arg(value.String().c_str());
 	case Tag::Align: return QString("style::al_%1").arg(value.String().c_str());
 	case Tag::Margins: {
@@ -1114,7 +1111,6 @@ bool Generator::collectUniqueValues() {
 		case Tag::Double:
 		case Tag::String:
 		case Tag::Color:
-		case Tag::Transition:
 		case Tag::Cursor:
 		case Tag::Align: break;
 		case Tag::Pixels: pxValues_.insert(value.Int(), true); break;
diff --git a/Telegram/SourceFiles/codegen/style/parsed_file.cpp b/Telegram/SourceFiles/codegen/style/parsed_file.cpp
index a0e77fb5e..faf0b1464 100644
--- a/Telegram/SourceFiles/codegen/style/parsed_file.cpp
+++ b/Telegram/SourceFiles/codegen/style/parsed_file.cpp
@@ -120,7 +120,6 @@ std::string logType(const structure::Type &type) {
 		{ structure::TypeTag::Color     , "color" },
 		{ structure::TypeTag::Point     , "point" },
 		{ structure::TypeTag::Size      , "size" },
-		{ structure::TypeTag::Transition, "transition" },
 		{ structure::TypeTag::Cursor    , "cursor" },
 		{ structure::TypeTag::Align     , "align" },
 		{ structure::TypeTag::Margins   , "margins" },
@@ -138,10 +137,6 @@ bool validateAnsiString(const QString &value) {
 	return true;
 }
 
-bool validateTransitionString(const QString &value) {
-	return QRegularExpression("^[a-zA-Z_]+$").match(value).hasMatch();
-}
-
 bool validateCursorString(const QString &value) {
 	return QRegularExpression("^[a-z_]+$").match(value).hasMatch();
 }
@@ -313,8 +308,6 @@ structure::Value ParsedFile::readValue() {
 		return pointValue;
 	} else if (auto sizeValue = readSizeValue()) {
 		return sizeValue;
-	} else if (auto transitionValue = readTransitionValue()) {
-		return transitionValue;
 	} else if (auto cursorValue = readCursorValue()) {
 		return cursorValue;
 	} else if (auto alignValue = readAlignValue()) {
@@ -606,26 +599,6 @@ structure::Value ParsedFile::readSizeValue() {
 	return {};
 }
 
-structure::Value ParsedFile::readTransitionValue() {
-	if (auto font = file_.getToken(BasicType::Name)) {
-		if (tokenValue(font) == "transition") {
-			assertNextToken(BasicType::LeftParenthesis);
-
-			auto transition = tokenValue(assertNextToken(BasicType::Name));
-
-			assertNextToken(BasicType::RightParenthesis);
-
-			if (validateTransitionString(transition)) {
-				return { structure::TypeTag::Transition, transition.toStdString() };
-			} else {
-				logError(kErrorBadString) << "bad transition value";
-			}
-		}
-		file_.putBack();
-	}
-	return {};
-}
-
 structure::Value ParsedFile::readCursorValue() {
 	if (auto font = file_.getToken(BasicType::Name)) {
 		if (tokenValue(font) == "cursor") {
diff --git a/Telegram/SourceFiles/codegen/style/parsed_file.h b/Telegram/SourceFiles/codegen/style/parsed_file.h
index 1c2271fe4..820d1a6a8 100644
--- a/Telegram/SourceFiles/codegen/style/parsed_file.h
+++ b/Telegram/SourceFiles/codegen/style/parsed_file.h
@@ -93,7 +93,6 @@ private:
 	structure::Value readColorValue();
 	structure::Value readPointValue();
 	structure::Value readSizeValue();
-	structure::Value readTransitionValue();
 	structure::Value readCursorValue();
 	structure::Value readAlignValue();
 	structure::Value readMarginsValue();
@@ -131,7 +130,6 @@ private:
 		{ "color"     , { structure::TypeTag::Color } },
 		{ "point"     , { structure::TypeTag::Point } },
 		{ "size"      , { structure::TypeTag::Size } },
-		{ "transition", { structure::TypeTag::Transition } },
 		{ "cursor"    , { structure::TypeTag::Cursor } },
 		{ "align"     , { structure::TypeTag::Align } },
 		{ "margins"   , { structure::TypeTag::Margins } },
diff --git a/Telegram/SourceFiles/codegen/style/structure_types.cpp b/Telegram/SourceFiles/codegen/style/structure_types.cpp
index e11042a34..f1c56f691 100644
--- a/Telegram/SourceFiles/codegen/style/structure_types.cpp
+++ b/Telegram/SourceFiles/codegen/style/structure_types.cpp
@@ -179,7 +179,6 @@ Value::Value(TypeTag type, int value) : Value(type, std::make_shared<DataTypes::
 
 Value::Value(TypeTag type, std::string value) : Value(type, std::make_shared<DataTypes::TString>(value)) {
 	if (type_.tag != TypeTag::String &&
-		type_.tag != TypeTag::Transition &&
 		type_.tag != TypeTag::Cursor &&
 		type_.tag != TypeTag::Align) {
 		type_.tag = TypeTag::Invalid;
@@ -197,7 +196,6 @@ Value::Value(Type type, Qt::Initialization) : type_(type) {
 	case TypeTag::Color: data_ = std::make_shared<DataTypes::TColor>(data::color { 0, 0, 0, 255 }); break;
 	case TypeTag::Point: data_ = std::make_shared<DataTypes::TPoint>(data::point { 0, 0 }); break;
 	case TypeTag::Size: data_ = std::make_shared<DataTypes::TSize>(data::size { 0, 0 }); break;
-	case TypeTag::Transition: data_ = std::make_shared<DataTypes::TString>("linear"); break;
 	case TypeTag::Cursor: data_ = std::make_shared<DataTypes::TString>("default"); break;
 	case TypeTag::Align: data_ = std::make_shared<DataTypes::TString>("topleft"); break;
 	case TypeTag::Margins: data_ = std::make_shared<DataTypes::TMargins>(data::margins { 0, 0, 0, 0 }); break;
diff --git a/Telegram/SourceFiles/codegen/style/structure_types.h b/Telegram/SourceFiles/codegen/style/structure_types.h
index 53c5b595a..58d508769 100644
--- a/Telegram/SourceFiles/codegen/style/structure_types.h
+++ b/Telegram/SourceFiles/codegen/style/structure_types.h
@@ -48,7 +48,6 @@ enum class TypeTag {
 	Color,
 	Point,
 	Size,
-	Transition,
 	Cursor,
 	Align,
 	Margins,
diff --git a/Telegram/SourceFiles/core/lambda_wrap.h b/Telegram/SourceFiles/core/lambda_wrap.h
index cd1a15559..4e4abe2ae 100644
--- a/Telegram/SourceFiles/core/lambda_wrap.h
+++ b/Telegram/SourceFiles/core/lambda_wrap.h
@@ -52,8 +52,9 @@ struct lambda_wrap_helper_base {
 	const call_type call;
 	const destruct_type destruct;
 
-	static constexpr size_t kFullStorageSize = sizeof(void*) + 24U;
+	static constexpr size_t kFullStorageSize = 24U + sizeof(void*);
 	static constexpr size_t kStorageSize = kFullStorageSize - sizeof(void*);
+	using alignment = uint64;
 
 	template <typename Lambda>
 	using IsLarge = std_::integral_constant<bool, !(sizeof(std_::decay_simple_t<Lambda>) <= kStorageSize)>;
@@ -144,7 +145,7 @@ struct lambda_wrap_helper_move_impl<Lambda, std_::false_type, Return, Args...> :
 		new (lambda) JustLambda(static_cast<JustLambda&&>(*source_lambda));
 	}
 	static void construct_move_lambda_method(void *lambda, void *source) {
-		static_assert(alignof(JustLambda) <= alignof(void*), "Bad lambda alignment.");
+		static_assert(alignof(JustLambda) <= alignof(typename Parent::alignment), "Bad lambda alignment.");
 		auto space = sizeof(JustLambda);
 		auto aligned = std_::align(alignof(JustLambda), space, lambda, space);
 		t_assert(aligned == lambda);
@@ -219,7 +220,7 @@ struct lambda_wrap_helper_copy_impl<Lambda, std_::false_type, Return, Args...> :
 		new (lambda) JustLambda(static_cast<const JustLambda &>(*source_lambda));
 	}
 	static void construct_copy_lambda_method(void *lambda, const void *source) {
-		static_assert(alignof(JustLambda) <= alignof(void*), "Bad lambda alignment.");
+		static_assert(alignof(JustLambda) <= alignof(typename Parent::alignment), "Bad lambda alignment.");
 		auto space = sizeof(JustLambda);
 		auto aligned = std_::align(alignof(JustLambda), space, lambda, space);
 		t_assert(aligned == lambda);
@@ -318,10 +319,12 @@ protected:
 	lambda_unique(const BaseHelper *helper, const Private &) : helper_(helper) {
 	}
 
-	const BaseHelper *helper_;
-
 	static_assert(BaseHelper::kStorageSize % sizeof(void*) == 0, "Bad pointer size.");
-	void *(storage_[BaseHelper::kStorageSize / sizeof(void*)]);
+	union {
+		void *(storage_[BaseHelper::kStorageSize / sizeof(void*)]);
+		typename BaseHelper::alignment alignment_;
+	};
+	const BaseHelper *helper_;
 
 };
 
diff --git a/Telegram/SourceFiles/dialogs/dialogs.style b/Telegram/SourceFiles/dialogs/dialogs.style
index 219b91c24..4d5ea7338 100644
--- a/Telegram/SourceFiles/dialogs/dialogs.style
+++ b/Telegram/SourceFiles/dialogs/dialogs.style
@@ -23,12 +23,6 @@ using "basic_types.style";
 
 using "ui/widgets/widgets.style";
 
-dialogsUnreadFg: #ffffff;
-dialogsUnreadFgActive: #5b94bf;
-dialogsUnreadBg: windowActiveFill;
-dialogsUnreadBgMuted: #bbbbbb;
-dialogsUnreadBgActive: #ffffff;
-dialogsUnreadBgMutedActive: #d3e2ee;
 dialogsUnreadFont: font(12px bold);
 dialogsUnreadHeight: 19px;
 dialogsUnreadPadding: 5px;
@@ -168,11 +162,9 @@ dialogsUpdateButton: flatButton {
 
 	color: activeButtonFg;
 	overColor: activeButtonFgOver;
-	downColor: activeButtonFgOver;
 
 	bgColor: activeButtonBg;
 	overBgColor: activeButtonBgOver;
-	downBgColor: activeButtonBgOver;
 
 	width: -34px;
 	height: 46px;
diff --git a/Telegram/SourceFiles/dialogs/dialogs_layout.cpp b/Telegram/SourceFiles/dialogs/dialogs_layout.cpp
index bae24e096..fc3dc862b 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_layout.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_layout.cpp
@@ -141,15 +141,17 @@ void paintRow(Painter &p, History *history, HistoryItem *item, Data::Draft *draf
 
 struct UnreadBadgeSizeData {
 	QImage circle;
-	QPixmap left[4], right[4];
+	QPixmap left[6], right[6];
 };
 class UnreadBadgeStyleData : public Data::AbstractStructure {
 public:
 	UnreadBadgeSizeData sizes[UnreadBadgeSizesCount];
-	const style::color *bg[4] = {
+	const style::color *bg[6] = {
 		&st::dialogsUnreadBg,
+		&st::dialogsUnreadBgOver,
 		&st::dialogsUnreadBgActive,
 		&st::dialogsUnreadBgMuted,
+		&st::dialogsUnreadBgMutedOver,
 		&st::dialogsUnreadBgMutedActive
 	};
 };
@@ -181,7 +183,7 @@ const style::icon *ChatTypeIcon(PeerData *peer, bool active, bool selected) {
 void paintUnreadBadge(Painter &p, const QRect &rect, const UnreadBadgeStyle &st) {
 	t_assert(rect.height() == st.size);
 
-	int index = (st.active ? 0x01 : 0x00) | (st.muted ? 0x02 : 0x00);
+	int index = (st.muted ? 0x03 : 0x00) + (st.active ? 0x02 : (st.selected ? 0x01 : 0x00));
 	int size = st.size, sizehalf = size / 2;
 
 	unreadBadgeStyle.createIfNull();
@@ -209,6 +211,7 @@ void paintUnreadBadge(Painter &p, const QRect &rect, const UnreadBadgeStyle &st)
 UnreadBadgeStyle::UnreadBadgeStyle()
 : align(style::al_right)
 , active(false)
+, selected(false)
 , muted(false)
 , size(st::dialogsUnreadHeight)
 , sizeId(UnreadBadgeInDialogs)
@@ -235,7 +238,7 @@ void paintUnreadCount(Painter &p, const QString &text, int x, int y, const Unrea
 	paintUnreadBadge(p, QRect(unreadRectLeft, unreadRectTop, unreadRectWidth, unreadRectHeight), st);
 
 	p.setFont(st.font);
-	p.setPen(st.active ? st::dialogsUnreadFgActive : st::dialogsUnreadFg);
+	p.setPen(st.active ? st::dialogsUnreadFgActive : (st.selected ? st::dialogsUnreadFgOver : st::dialogsUnreadFg));
 	p.drawText(unreadRectLeft + (unreadRectWidth - unreadWidth) / 2, unreadRectTop + (unreadRectHeight - st.font->height) / 2 + st.font->ascent, text);
 }
 
diff --git a/Telegram/SourceFiles/dialogs/dialogs_layout.h b/Telegram/SourceFiles/dialogs/dialogs_layout.h
index d5765bc60..4ec145ecd 100644
--- a/Telegram/SourceFiles/dialogs/dialogs_layout.h
+++ b/Telegram/SourceFiles/dialogs/dialogs_layout.h
@@ -50,6 +50,7 @@ struct UnreadBadgeStyle {
 
 	style::align align;
 	bool active;
+	bool selected;
 	bool muted;
 	int size;
 	UnreadBadgeSize sizeId;
diff --git a/Telegram/SourceFiles/dialogswidget.cpp b/Telegram/SourceFiles/dialogswidget.cpp
index ba87b6f03..93679c934 100644
--- a/Telegram/SourceFiles/dialogswidget.cpp
+++ b/Telegram/SourceFiles/dialogswidget.cpp
@@ -1828,9 +1828,9 @@ void DialogsWidget::step_show(float64 ms, bool timer) {
 
 		if (App::app()) App::app()->mtpUnpause();
 	} else {
-		a_coordUnder.update(dt, st::slideFunction);
-		a_coordOver.update(dt, st::slideFunction);
-		a_progress.update(dt, st::slideFunction);
+		a_coordUnder.update(dt, Window::SlideAnimation::transition());
+		a_coordOver.update(dt, Window::SlideAnimation::transition());
+		a_progress.update(dt, Window::SlideAnimation::transition());
 	}
 	if (timer) update();
 }
diff --git a/Telegram/SourceFiles/history/history.style b/Telegram/SourceFiles/history/history.style
index b17f4e898..6f21d0d5a 100644
--- a/Telegram/SourceFiles/history/history.style
+++ b/Telegram/SourceFiles/history/history.style
@@ -153,9 +153,6 @@ historyComposeField: flatTextarea {
 	phPos: point(2px, 0px);
 	phShift: 50px;
 	phDuration: 100;
-	phLeftFunc: transition(linear);
-	phAlphaFunc: transition(linear);
-	phColorFunc: transition(linear);
 }
 historyComposeFieldMaxHeight: 224px;
 // historyMinHeight: 56px;
diff --git a/Telegram/SourceFiles/history/history_drag_area.cpp b/Telegram/SourceFiles/history/history_drag_area.cpp
index 54a4e2861..71d835eab 100644
--- a/Telegram/SourceFiles/history/history_drag_area.cpp
+++ b/Telegram/SourceFiles/history/history_drag_area.cpp
@@ -38,7 +38,7 @@ DragArea::DragArea(QWidget *parent) : TWidget(parent)
 , _hiding(false)
 , _in(false)
 , a_opacity(0)
-, a_color(st::dragColor->c)
+, a_colorDrop(0)
 , _a_appearance(animation(this, &DragArea::step_appearance))
 , _shadow(st::boxShadow) {
 	setMouseTracking(true);
@@ -52,7 +52,7 @@ void DragArea::mouseMoveEvent(QMouseEvent *e) {
 	if (newIn != _in) {
 		_in = newIn;
 		a_opacity.start(1);
-		a_color.start((_in ? st::dragDropColor : st::dragColor)->c);
+		a_colorDrop.start(_in ? 1. : 0.);
 		_a_appearance.start();
 	}
 }
@@ -63,7 +63,7 @@ void DragArea::dragMoveEvent(QDragMoveEvent *e) {
 	if (newIn != _in) {
 		_in = newIn;
 		a_opacity.start(1);
-		a_color.start((_in ? st::dragDropColor : st::dragColor)->c);
+		a_colorDrop.start(_in ? 1. : 0.);
 		_a_appearance.start();
 	}
 	e->setDropAction(_in ? Qt::CopyAction : Qt::IgnoreAction);
@@ -90,7 +90,7 @@ void DragArea::paintEvent(QPaintEvent *e) {
 
 	p.fillRect(r, st::dragBg);
 
-	p.setPen(a_color.current());
+	p.setPen(anim::pen(st::dragColor, st::dragDropColor, a_colorDrop.current()));
 
 	p.setFont(st::dragFont);
 	p.drawText(QRect(0, (height() - st::dragHeight) / 2, width(), st::dragFont->height), _text, QTextOption(style::al_top));
@@ -109,7 +109,7 @@ void DragArea::dragLeaveEvent(QDragLeaveEvent *e) {
 	static_cast<HistoryWidget*>(parentWidget())->dragLeaveEvent(e);
 	_in = false;
 	a_opacity.start(_hiding ? 0 : 1);
-	a_color.start((_in ? st::dragDropColor : st::dragColor)->c);
+	a_colorDrop.start(_in ? 1. : 0.);
 	_a_appearance.start();
 }
 
@@ -140,21 +140,21 @@ void DragArea::hideStart() {
 	_hiding = true;
 	_in = false;
 	a_opacity.start(0);
-	a_color.start((_in ? st::dragDropColor : st::dragColor)->c);
+	a_colorDrop.start(_in ? 1. : 0.);
 	_a_appearance.start();
 }
 
 void DragArea::hideFinish() {
 	hide();
 	_in = false;
-	a_color = anim::cvalue(st::dragColor->c);
+	a_colorDrop = anim::fvalue(0.);
 }
 
 void DragArea::showStart() {
 	_hiding = false;
 	show();
 	a_opacity.start(1);
-	a_color.start((_in ? st::dragDropColor : st::dragColor)->c);
+	a_colorDrop.start(_in ? 1. : 0.);
 	_a_appearance.start();
 }
 
@@ -162,14 +162,14 @@ void DragArea::step_appearance(float64 ms, bool timer) {
 	float64 dt = ms / st::defaultDropdownDuration;
 	if (dt >= 1) {
 		a_opacity.finish();
-		a_color.finish();
+		a_colorDrop.finish();
 		if (_hiding) {
 			hideFinish();
 		}
 		_a_appearance.stop();
 	} else {
 		a_opacity.update(dt, anim::linear);
-		a_color.update(dt, anim::linear);
+		a_colorDrop.update(dt, anim::linear);
 	}
 	if (timer) update();
 }
diff --git a/Telegram/SourceFiles/history/history_drag_area.h b/Telegram/SourceFiles/history/history_drag_area.h
index 003bd9548..04bdb38ab 100644
--- a/Telegram/SourceFiles/history/history_drag_area.h
+++ b/Telegram/SourceFiles/history/history_drag_area.h
@@ -69,7 +69,7 @@ private:
 	bool _hiding, _in;
 
 	anim::fvalue a_opacity;
-	anim::cvalue a_color;
+	anim::fvalue a_colorDrop;
 	Animation _a_appearance;
 
 	Ui::RectShadow _shadow;
diff --git a/Telegram/SourceFiles/history/history_media_types.cpp b/Telegram/SourceFiles/history/history_media_types.cpp
index 759cb3f60..c4fcc31dc 100644
--- a/Telegram/SourceFiles/history/history_media_types.cpp
+++ b/Telegram/SourceFiles/history/history_media_types.cpp
@@ -417,7 +417,7 @@ void HistoryPhoto::draw(Painter &p, const QRect &r, TextSelection selection, uin
 			p.setBrush(st::msgDateImgBgSelected);
 		} else if (isThumbAnimation(ms)) {
 			auto over = _animation->a_thumbOver.current();
-			p.setBrush(style::interpolate(st::msgDateImgBg, st::msgDateImgBgOver, over));
+			p.setBrush(anim::brush(st::msgDateImgBg, st::msgDateImgBgOver, over));
 		} else {
 			auto over = ClickHandler::showAsActive(_data->loading() ? _cancell : _savel);
 			p.setBrush(over ? st::msgDateImgBgOver : st::msgDateImgBg);
@@ -755,7 +755,7 @@ void HistoryVideo::draw(Painter &p, const QRect &r, TextSelection selection, uin
 		p.setBrush(st::msgDateImgBgSelected);
 	} else if (isThumbAnimation(ms)) {
 		auto over = _animation->a_thumbOver.current();
-		p.setBrush(style::interpolate(st::msgDateImgBg, st::msgDateImgBgOver, over));
+		p.setBrush(anim::brush(st::msgDateImgBg, st::msgDateImgBgOver, over));
 	} else {
 		bool over = ClickHandler::showAsActive(_data->loading() ? _cancell : _savel);
 		p.setBrush(over ? st::msgDateImgBgOver : st::msgDateImgBg);
@@ -1109,7 +1109,7 @@ void HistoryDocument::draw(Painter &p, const QRect &r, TextSelection selection,
 				p.setBrush(st::msgDateImgBgSelected);
 			} else if (isThumbAnimation(ms)) {
 				auto over = _animation->a_thumbOver.current();
-				p.setBrush(style::interpolate(st::msgDateImgBg, st::msgDateImgBgOver, over));
+				p.setBrush(anim::brush(st::msgDateImgBg, st::msgDateImgBgOver, over));
 			} else {
 				auto over = ClickHandler::showAsActive(_data->loading() ? _cancell : _savel);
 				p.setBrush(over ? st::msgDateImgBgOver : st::msgDateImgBg);
@@ -1157,7 +1157,7 @@ void HistoryDocument::draw(Painter &p, const QRect &r, TextSelection selection,
 			p.setBrush(outbg ? st::msgFileOutBgSelected : st::msgFileInBgSelected);
 		} else if (isThumbAnimation(ms)) {
 			auto over = _animation->a_thumbOver.current();
-			p.setBrush(style::interpolate(outbg ? st::msgFileOutBg : st::msgFileInBg, outbg ? st::msgFileOutBgOver : st::msgFileInBgOver, over));
+			p.setBrush(anim::brush(outbg ? st::msgFileOutBg : st::msgFileInBg, outbg ? st::msgFileOutBgOver : st::msgFileInBgOver, over));
 		} else {
 			auto over = ClickHandler::showAsActive(_data->loading() ? _cancell : _savel);
 			p.setBrush(outbg ? (over ? st::msgFileOutBgOver : st::msgFileOutBg) : (over ? st::msgFileInBgOver : st::msgFileInBg));
@@ -1731,7 +1731,7 @@ void HistoryGif::draw(Painter &p, const QRect &r, TextSelection selection, uint6
 			p.setBrush(st::msgDateImgBgSelected);
 		} else if (isThumbAnimation(ms)) {
 			auto over = _animation->a_thumbOver.current();
-			p.setBrush(style::interpolate(st::msgDateImgBg, st::msgDateImgBgOver, over));
+			p.setBrush(anim::brush(st::msgDateImgBg, st::msgDateImgBgOver, over));
 		} else {
 			auto over = ClickHandler::showAsActive(_data->loading() ? _cancell : _savel);
 			p.setBrush(over ? st::msgDateImgBgOver : st::msgDateImgBg);
diff --git a/Telegram/SourceFiles/historywidget.cpp b/Telegram/SourceFiles/historywidget.cpp
index 20ff55111..8a1d11b03 100644
--- a/Telegram/SourceFiles/historywidget.cpp
+++ b/Telegram/SourceFiles/historywidget.cpp
@@ -3010,7 +3010,7 @@ HistoryWidget::HistoryWidget(QWidget *parent) : TWidget(parent)
 , _field(this, st::historyComposeField, lang(lng_message_ph))
 , _a_record(animation(this, &HistoryWidget::step_record))
 , _a_recording(animation(this, &HistoryWidget::step_recording))
-, a_recordCancel(st::historyRecordCancel->c, st::historyRecordCancel->c)
+, a_recordCancelActive(0, 0)
 , _recordCancelWidth(st::historyRecordFont->width(lang(lng_record_cancel)))
 , _kbScroll(this, st::botKbScroll)
 , _attachType(this, st::historyAttachDropdownMenu)
@@ -3272,7 +3272,7 @@ void HistoryWidget::onTextChange() {
 			_a_record.stop();
 			_inRecord = _inField = false;
 			a_recordDown = anim::fvalue(0, 0);
-			a_recordCancel = anim::cvalue(st::historyRecordCancel->c, st::historyRecordCancel->c);
+			a_recordCancelActive = anim::fvalue(0, 0);
 		}
 	}
 	if (updateCmdStartShown()) {
@@ -5511,9 +5511,9 @@ void HistoryWidget::step_show(float64 ms, bool timer) {
 
 		if (App::app()) App::app()->mtpUnpause();
 	} else {
-		a_coordUnder.update(dt, st::slideFunction);
-		a_coordOver.update(dt, st::slideFunction);
-		a_progress.update(dt, st::slideFunction);
+		a_coordUnder.update(dt, Window::SlideAnimation::transition());
+		a_coordOver.update(dt, Window::SlideAnimation::transition());
+		a_progress.update(dt, Window::SlideAnimation::transition());
 	}
 	if (timer) {
 		update();
@@ -5549,10 +5549,10 @@ void HistoryWidget::step_record(float64 ms, bool timer) {
 	if (dt >= 1 || !_send->isHidden() || isBotStart() || isBlocked()) {
 		_a_record.stop();
 		a_recordDown.finish();
-		a_recordCancel.finish();
+		a_recordCancelActive.finish();
 	} else {
 		a_recordDown.update(dt, anim::linear);
-		a_recordCancel.update(dt, anim::linear);
+		a_recordCancelActive.update(dt, anim::linear);
 	}
 	if (timer) {
 		if (_recording) {
@@ -5672,7 +5672,7 @@ void HistoryWidget::mouseMoveEvent(QMouseEvent *e) {
 	if (inField != _inField && _recording) {
 		_inField = inField;
 		a_recordDown.start(_inField ? 1 : 0);
-		a_recordCancel.start(_inField ? st::historyRecordCancel->c : st::historyRecordCancelActive->c);
+		a_recordCancelActive.start(_inField ? 0. : 1.);
 		_a_record.start();
 	}
 	if (inReplyEdit != _inReplyEdit) {
@@ -5721,7 +5721,7 @@ void HistoryWidget::stopRecording(bool send) {
 	updateField();
 
 	a_recordDown.start(0);
-	a_recordCancel = anim::cvalue(st::historyRecordCancel->c, st::historyRecordCancel->c);
+	a_recordCancelActive = anim::fvalue(0., 0.);
 	_a_record.start();
 }
 
@@ -7552,6 +7552,7 @@ HistoryWidget::PinnedBar::~PinnedBar() {
 }
 
 void HistoryWidget::updatePinnedBar(bool force) {
+	update();
 	if (!_pinnedBar) {
 		return;
 	}
@@ -7560,6 +7561,7 @@ void HistoryWidget::updatePinnedBar(bool force) {
 			return;
 		}
 	}
+
 	t_assert(_history != nullptr);
 	if (!_pinnedBar->msg) {
 		_pinnedBar->msg = App::histItemById(_history->channelId(), _pinnedBar->msgId);
@@ -7573,7 +7575,6 @@ void HistoryWidget::updatePinnedBar(bool force) {
 		}
 		destroyPinnedBar();
 		resizeEvent(0);
-		update();
 	}
 }
 
@@ -7623,7 +7624,6 @@ bool HistoryWidget::pinnedMsgVisibilityUpdated() {
 			_pinnedBar->msg = 0;
 			_pinnedBar->text.clear();
 			updatePinnedBar();
-			update();
 		}
 		if (!_pinnedBar->msg && App::api()) {
 			App::api()->requestMessageData(_peer->asChannel(), _pinnedBar->msgId, replyEditMessageDataCallback());
@@ -8656,7 +8656,7 @@ void HistoryWidget::drawRecording(Painter &p) {
 	int32 left = _attachPhoto->x() + _attachEmoji->width() + st::historyRecordFont->width(duration) + ((_send->width() - st::historyRecordVoice.width()) / 2);
 	int32 right = width() - _send->width();
 
-	p.setPen(a_recordCancel.current());
+	p.setPen(anim::pen(st::historyRecordCancel, st::historyRecordCancelActive, a_recordCancelActive.current()));
 	p.drawText(left + (right - left - _recordCancelWidth) / 2, _attachPhoto->y() + st::historyRecordTextTop + st::historyRecordFont->ascent, lang(lng_record_cancel));
 }
 
diff --git a/Telegram/SourceFiles/historywidget.h b/Telegram/SourceFiles/historywidget.h
index c479a6251..8af783d46 100644
--- a/Telegram/SourceFiles/historywidget.h
+++ b/Telegram/SourceFiles/historywidget.h
@@ -1124,7 +1124,7 @@ private:
 	anim::ivalue a_recordingLevel = { 0, 0 };
 	int32 _recordingSamples = 0;
 	anim::fvalue a_recordDown = { 0, 0 };
-	anim::cvalue a_recordCancel;
+	anim::fvalue a_recordCancelActive;
 	int32 _recordCancelWidth;
 
 	bool kbWasHidden() const;
diff --git a/Telegram/SourceFiles/inline_bots/inline_bot_layout_internal.cpp b/Telegram/SourceFiles/inline_bots/inline_bot_layout_internal.cpp
index e86ed36a6..d1bdca47e 100644
--- a/Telegram/SourceFiles/inline_bots/inline_bot_layout_internal.cpp
+++ b/Telegram/SourceFiles/inline_bots/inline_bot_layout_internal.cpp
@@ -172,7 +172,7 @@ void Gif::paint(Painter &p, const QRect &clip, const PaintContext *context) cons
 		auto radialOpacity = (radial && loaded) ? _animation->radial.opacity() : 1.;
 		if (_animation && _animation->_a_over.animating(context->ms)) {
 			auto over = _animation->_a_over.current();
-			p.fillRect(r, style::interpolate(st::msgDateImgBg, st::msgDateImgBgOver, over));
+			p.fillRect(r, anim::brush(st::msgDateImgBg, st::msgDateImgBgOver, over));
 		} else {
 			auto over = (_state & StateFlag::Over);
 			p.fillRect(r, over ? st::msgDateImgBgOver : st::msgDateImgBg);
@@ -708,11 +708,11 @@ void File::paint(Painter &p, const QRect &clip, const PaintContext *context) con
 	auto inner = rtlrect(0, st::inlineRowMargin, st::msgFileSize, st::msgFileSize, _width);
 	p.setPen(Qt::NoPen);
 	if (isThumbAnimation(context->ms)) {
-		float64 over = _animation->a_thumbOver.current();
-		p.setBrush(style::interpolate(st::msgFileInBg, st::msgFileInBgOver, over));
+		auto over = _animation->a_thumbOver.current();
+		p.setBrush(anim::brush(st::msgFileInBg, st::msgFileInBgOver, over));
 	} else {
 		bool over = ClickHandler::showAsActive(document->loading() ? _cancel : _open);
-		p.setBrush((over ? st::msgFileInBgOver : st::msgFileInBg));
+		p.setBrush(over ? st::msgFileInBgOver : st::msgFileInBg);
 	}
 
 	p.setRenderHint(QPainter::HighQualityAntialiasing);
diff --git a/Telegram/SourceFiles/intro/intro.style b/Telegram/SourceFiles/intro/intro.style
index 3117d1930..22709b21b 100644
--- a/Telegram/SourceFiles/intro/intro.style
+++ b/Telegram/SourceFiles/intro/intro.style
@@ -65,10 +65,6 @@ introSize: size(400px, 460px);
 introSlideShift: 500px; // intro hiding animation
 introSlideDuration: 200;
 introSlideDelta: 0; // between hide start and show start
-introHideFunc: transition(easeInCirc);
-introShowFunc: transition(easeOutCirc);
-introAlphaHideFunc: transition(easeOutCirc);
-introAlphaShowFunc: transition(easeInCirc);
 introTextTop: 22px;
 introTextSize: size(400px, 93px);
 introCallSkip: 15px;
diff --git a/Telegram/SourceFiles/intro/introwidget.cpp b/Telegram/SourceFiles/intro/introwidget.cpp
index d29791b21..f007cf49f 100644
--- a/Telegram/SourceFiles/intro/introwidget.cpp
+++ b/Telegram/SourceFiles/intro/introwidget.cpp
@@ -36,6 +36,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
 #include "ui/effects/widget_fade_wrap.h"
 #include "styles/style_intro.h"
 #include "autoupdater.h"
+#include "window/slide_animation.h"
 
 IntroWidget::IntroWidget(QWidget *parent) : TWidget(parent)
 , _a_stage(animation(this, &IntroWidget::step_stage))
@@ -229,9 +230,9 @@ void IntroWidget::step_show(float64 ms, bool timer) {
 		}
 		if (App::app()) App::app()->mtpUnpause();
 	} else {
-		a_coordUnder.update(dt, st::slideFunction);
-		a_coordOver.update(dt, st::slideFunction);
-		a_shadow.update(dt, st::slideFunction);
+		a_coordUnder.update(dt, Window::SlideAnimation::transition());
+		a_coordOver.update(dt, Window::SlideAnimation::transition());
+		a_shadow.update(dt, Window::SlideAnimation::transition());
 	}
 	if (timer) update();
 }
@@ -255,10 +256,10 @@ void IntroWidget::step_stage(float64 ms, bool timer) {
 		step()->activate();
 		if (App::app()) App::app()->mtpUnpause();
 	} else {
-		a_coordShow.update(dt2, st::introShowFunc);
-		a_opacityShow.update(dt2, st::introAlphaShowFunc);
-		a_coordHide.update(dt1, st::introHideFunc);
-		a_opacityHide.update(dt1, st::introAlphaHideFunc);
+		a_coordShow.update(dt2, anim::easeOutCirc);
+		a_opacityShow.update(dt2, anim::easeInCirc);
+		a_coordHide.update(dt1, anim::easeInCirc);
+		a_opacityHide.update(dt1, anim::easeOutCirc);
 	}
 	if (timer) update();
 }
diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp
index 3ae059064..72780f900 100644
--- a/Telegram/SourceFiles/mainwidget.cpp
+++ b/Telegram/SourceFiles/mainwidget.cpp
@@ -2757,9 +2757,9 @@ void MainWidget::step_show(float64 ms, bool timer) {
 
 		if (App::app()) App::app()->mtpUnpause();
 	} else {
-		a_coordUnder.update(dt, st::slideFunction);
-		a_coordOver.update(dt, st::slideFunction);
-		a_shadow.update(dt, st::slideFunction);
+		a_coordUnder.update(dt, Window::SlideAnimation::transition());
+		a_coordOver.update(dt, Window::SlideAnimation::transition());
+		a_shadow.update(dt, Window::SlideAnimation::transition());
 	}
 	if (timer) update();
 }
diff --git a/Telegram/SourceFiles/mediaview.cpp b/Telegram/SourceFiles/mediaview.cpp
index d28788425..8b19be1c5 100644
--- a/Telegram/SourceFiles/mediaview.cpp
+++ b/Telegram/SourceFiles/mediaview.cpp
@@ -1820,16 +1820,8 @@ void MediaView::paintDocRadialLoading(Painter &p, bool radial, float64 radialOpa
 		QRect inner(QPoint(_docIconRect.x() + ((_docIconRect.width() - st::radialSize.width()) / 2), _docIconRect.y() + ((_docIconRect.height() - st::radialSize.height()) / 2)), st::radialSize);
 
 		p.setPen(Qt::NoPen);
-		if (o == 0.) {
-			p.setOpacity(_doc->loaded() ? radialOpacity : 1.);
-			p.setBrush(st::msgDateImgBg);
-		} else if (o == 1.) {
-			p.setOpacity(_doc->loaded() ? radialOpacity : 1.);
-			p.setBrush(st::msgDateImgBgOver);
-		} else {
-			p.setOpacity((st::msgDateImgBg->c.alphaF() * (1 - o)) + (st::msgDateImgBgOver->c.alphaF() * o));
-			p.setBrush(style::interpolate(st::msgDateImgBg, st::msgDateImgBgOver, o));
-		}
+		p.setOpacity(_doc->loaded() ? radialOpacity : 1.);
+		p.setBrush(anim::brush(st::msgDateImgBg, st::msgDateImgBgOver, o));
 
 		p.setRenderHint(QPainter::HighQualityAntialiasing);
 		p.drawEllipse(inner);
diff --git a/Telegram/SourceFiles/overview/overview_layout.cpp b/Telegram/SourceFiles/overview/overview_layout.cpp
index d1946aac7..6de183253 100644
--- a/Telegram/SourceFiles/overview/overview_layout.cpp
+++ b/Telegram/SourceFiles/overview/overview_layout.cpp
@@ -332,7 +332,7 @@ void Video::paint(Painter &p, const QRect &clip, TextSelection selection, const
 		} else if (_a_iconOver.animating()) {
 			_a_iconOver.step(context->ms);
 			auto over = a_iconOver.current();
-			p.setBrush(style::interpolate(st::msgDateImgBg, st::msgDateImgBgOver, over));
+			p.setBrush(anim::brush(st::msgDateImgBg, st::msgDateImgBgOver, over));
 		} else {
 			auto over = ClickHandler::showAsActive(loaded ? _openl : (_data->loading() ? _cancell : _savel));
 			p.setBrush(over ? st::msgDateImgBgOver : st::msgDateImgBg);
@@ -454,10 +454,10 @@ void Voice::paint(Painter &p, const QRect &clip, TextSelection selection, const
 			p.setBrush(st::msgFileInBgSelected);
 		} else if (_a_iconOver.animating()) {
 			_a_iconOver.step(context->ms);
-			float64 over = a_iconOver.current();
-			p.setBrush(style::interpolate(st::msgFileInBg, st::msgFileInBgOver, over));
+			auto over = a_iconOver.current();
+			p.setBrush(anim::brush(st::msgFileInBg, st::msgFileInBgOver, over));
 		} else {
-			bool over = ClickHandler::showAsActive(loaded ? _openl : (_data->loading() ? _cancell : _openl));
+			auto over = ClickHandler::showAsActive(loaded ? _openl : (_data->loading() ? _cancell : _openl));
 			p.setBrush(over ? st::msgFileInBgOver : st::msgFileInBg);
 		}
 
@@ -665,10 +665,10 @@ void Document::paint(Painter &p, const QRect &clip, TextSelection selection, con
 				p.setBrush(st::msgFileInBgSelected);
 			} else if (_a_iconOver.animating()) {
 				_a_iconOver.step(context->ms);
-				float64 over = a_iconOver.current();
-				p.setBrush(style::interpolate(_st.songIconBg, _st.songOverBg, over));
+				auto over = a_iconOver.current();
+				p.setBrush(anim::brush(_st.songIconBg, _st.songOverBg, over));
 			} else {
-				bool over = ClickHandler::showAsActive(loaded ? _openl : (_data->loading() ? _cancell : _openl));
+				auto over = ClickHandler::showAsActive(loaded ? _openl : (_data->loading() ? _cancell : _openl));
 				p.setBrush(over ? _st.songOverBg : _st.songIconBg);
 			}
 
@@ -741,7 +741,7 @@ void Document::paint(Painter &p, const QRect &clip, TextSelection selection, con
 					} else if (_a_iconOver.animating()) {
 						_a_iconOver.step(context->ms);
 						auto over = a_iconOver.current();
-						p.setBrush(style::interpolate(wthumb ? st::msgDateImgBg : documentDarkColor(_colorIndex), wthumb ? st::msgDateImgBgOver : documentOverColor(_colorIndex), over));
+						p.setBrush(anim::brush(wthumb ? st::msgDateImgBg : documentDarkColor(_colorIndex), wthumb ? st::msgDateImgBgOver : documentOverColor(_colorIndex), over));
 					} else {
 						auto over = ClickHandler::showAsActive(_data->loading() ? _cancell : _savel);
 						p.setBrush(over ? (wthumb ? st::msgDateImgBgOver : documentOverColor(_colorIndex)) : (wthumb ? st::msgDateImgBg : documentDarkColor(_colorIndex)));
diff --git a/Telegram/SourceFiles/overviewwidget.cpp b/Telegram/SourceFiles/overviewwidget.cpp
index 7b67d7544..7172ff36b 100644
--- a/Telegram/SourceFiles/overviewwidget.cpp
+++ b/Telegram/SourceFiles/overviewwidget.cpp
@@ -2137,9 +2137,9 @@ void OverviewWidget::step_show(float64 ms, bool timer) {
 
 		if (App::app()) App::app()->mtpUnpause();
 	} else {
-		a_coordUnder.update(dt, st::slideFunction);
-		a_coordOver.update(dt, st::slideFunction);
-		a_progress.update(dt, st::slideFunction);
+		a_coordUnder.update(dt, Window::SlideAnimation::transition());
+		a_coordOver.update(dt, Window::SlideAnimation::transition());
+		a_progress.update(dt, Window::SlideAnimation::transition());
 	}
 	if (timer) {
 		update();
diff --git a/Telegram/SourceFiles/passcodewidget.cpp b/Telegram/SourceFiles/passcodewidget.cpp
index 3e63025cc..3cc48564f 100644
--- a/Telegram/SourceFiles/passcodewidget.cpp
+++ b/Telegram/SourceFiles/passcodewidget.cpp
@@ -28,6 +28,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
 #include "ui/text/text.h"
 #include "ui/buttons/round_button.h"
 #include "styles/style_boxes.h"
+#include "window/slide_animation.h"
 
 PasscodeWidget::PasscodeWidget(QWidget *parent) : TWidget(parent)
 , _a_show(animation(this, &PasscodeWidget::step_show))
@@ -140,9 +141,9 @@ void PasscodeWidget::step_show(float64 ms, bool timer) {
 
 		Ui::showChatsList();
 	} else {
-		a_coordUnder.update(dt, st::slideFunction);
-		a_coordOver.update(dt, st::slideFunction);
-		a_shadow.update(dt, st::slideFunction);
+		a_coordUnder.update(dt, Window::SlideAnimation::transition());
+		a_coordOver.update(dt, Window::SlideAnimation::transition());
+		a_shadow.update(dt, Window::SlideAnimation::transition());
 	}
 	if (timer) update();
 }
diff --git a/Telegram/SourceFiles/platform/win/main_window_win.cpp b/Telegram/SourceFiles/platform/win/main_window_win.cpp
index cef2dfd05..bf2863d2a 100644
--- a/Telegram/SourceFiles/platform/win/main_window_win.cpp
+++ b/Telegram/SourceFiles/platform/win/main_window_win.cpp
@@ -742,7 +742,7 @@ void MainWindow::psUpdateCounter() {
 	if (trayIcon) {
 		// Force Qt to use right icon size, not the larger one.
 		QIcon forTrayIcon;
-		forTrayIcon.addPixmap(iconSizeSmall.width() >= 32 ? iconSmallPixmap32 : iconSmallPixmap16);
+		forTrayIcon.addPixmap(iconSizeSmall.width() >= 20 ? iconSmallPixmap32 : iconSmallPixmap16);
 		trayIcon->setIcon(forTrayIcon);
 	}
 
diff --git a/Telegram/SourceFiles/stdafx.h b/Telegram/SourceFiles/stdafx.h
index 624599163..42ef303d6 100644
--- a/Telegram/SourceFiles/stdafx.h
+++ b/Telegram/SourceFiles/stdafx.h
@@ -68,8 +68,8 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
 #include "styles/style_basic_types.h"
 #include "styles/style_basic.h"
 
-#include "ui/twidget.h"
 #include "ui/animation.h"
+#include "ui/twidget.h"
 #include "ui/flatinput.h"
 #include "ui/flattextarea.h"
 #include "ui/flatbutton.h"
diff --git a/Telegram/SourceFiles/stickers/emoji_pan.cpp b/Telegram/SourceFiles/stickers/emoji_pan.cpp
index 41ab8dfa5..7b0873f00 100644
--- a/Telegram/SourceFiles/stickers/emoji_pan.cpp
+++ b/Telegram/SourceFiles/stickers/emoji_pan.cpp
@@ -3147,10 +3147,10 @@ void EmojiPan::step_slide(float64 ms, bool timer) {
 		_fromCache = _toCache = QPixmap();
 		if (_cache.isNull()) showAll();
 	} else {
-		a_fromCoord.update(dt1, st::introHideFunc);
-		a_fromAlpha.update(dt1, st::introAlphaHideFunc);
-		a_toCoord.update(dt2, st::introShowFunc);
-		a_toAlpha.update(dt2, st::introAlphaShowFunc);
+		a_fromCoord.update(dt1, anim::easeInCirc);
+		a_fromAlpha.update(dt1, anim::easeOutCirc);
+		a_toCoord.update(dt2, anim::easeOutCirc);
+		a_toAlpha.update(dt2, anim::easeInCirc);
 	}
 	if (timer) update();
 }
diff --git a/Telegram/SourceFiles/ui/animation.cpp b/Telegram/SourceFiles/ui/animation.cpp
index d404f7cf1..8a18e0595 100644
--- a/Telegram/SourceFiles/ui/animation.cpp
+++ b/Telegram/SourceFiles/ui/animation.cpp
@@ -46,52 +46,52 @@ AnimationManager *_manager = nullptr;
 
 namespace anim {
 
-float64 linear(const float64 &delta, const float64 &dt) {
+transition linear = [](const float64 &delta, const float64 &dt) {
 	return delta * dt;
-}
+};
 
-float64 sineInOut(const float64 &delta, const float64 &dt) {
+transition sineInOut = [](const float64 &delta, const float64 &dt) {
 	return -(delta / 2) * (cos(M_PI * dt) - 1);
-}
+};
 
-float64 halfSine(const float64 &delta, const float64 &dt) {
+transition halfSine = [](const float64 &delta, const float64 &dt) {
 	return delta * sin(M_PI * dt / 2);
-}
+};
 
-float64 easeOutBack(const float64 &delta, const float64 &dt) {
-	static const float64 s = 1.70158;
+transition easeOutBack = [](const float64 &delta, const float64 &dt) {
+	static constexpr auto s = 1.70158;
 
 	const float64 t = dt - 1;
 	return delta * (t * t * ((s + 1) * t + s) + 1);
-}
+};
 
-float64 easeInCirc(const float64 &delta, const float64 &dt) {
+transition easeInCirc = [](const float64 &delta, const float64 &dt) {
 	return -delta * (sqrt(1 - dt * dt) - 1);
-}
+};
 
-float64 easeOutCirc(const float64 &delta, const float64 &dt) {
+transition easeOutCirc = [](const float64 &delta, const float64 &dt) {
 	const float64 t = dt - 1;
 	return delta * sqrt(1 - t * t);
-}
+};
 
-float64 easeInCubic(const float64 &delta, const float64 &dt) {
+transition easeInCubic = [](const float64 &delta, const float64 &dt) {
 	return delta * dt * dt * dt;
-}
+};
 
-float64 easeOutCubic(const float64 &delta, const float64 &dt) {
+transition easeOutCubic = [](const float64 &delta, const float64 &dt) {
 	const float64 t = dt - 1;
 	return delta * (t * t * t + 1);
-}
+};
 
-float64 easeInQuint(const float64 &delta, const float64 &dt) {
+transition easeInQuint = [](const float64 &delta, const float64 &dt) {
 	const float64 t2 = dt * dt;
 	return delta * t2 * t2 * dt;
-}
+};
 
-float64 easeOutQuint(const float64 &delta, const float64 &dt) {
+transition easeOutQuint = [](const float64 &delta, const float64 &dt) {
 	const float64 t = dt - 1, t2 = t * t;
 	return delta * (t2 * t2 * t + 1);
-}
+};
 
 void startManager() {
 	stopManager();
diff --git a/Telegram/SourceFiles/ui/animation.h b/Telegram/SourceFiles/ui/animation.h
index 52f17e015..f58e4b3b1 100644
--- a/Telegram/SourceFiles/ui/animation.h
+++ b/Telegram/SourceFiles/ui/animation.h
@@ -89,228 +89,188 @@ enum Notification {
 
 namespace anim {
 
-	typedef float64 (*transition)(const float64 &delta, const float64 &dt);
+using transition = base::lambda_wrap<float64(float64 delta, float64 dt)>;
 
-    float64 linear(const float64 &delta, const float64 &dt);
-	float64 sineInOut(const float64 &delta, const float64 &dt);
-    float64 halfSine(const float64 &delta, const float64 &dt);
-    float64 easeOutBack(const float64 &delta, const float64 &dt);
-    float64 easeInCirc(const float64 &delta, const float64 &dt);
-    float64 easeOutCirc(const float64 &delta, const float64 &dt);
-    float64 easeInCubic(const float64 &delta, const float64 &dt);
-    float64 easeOutCubic(const float64 &delta, const float64 &dt);
-    float64 easeInQuint(const float64 &delta, const float64 &dt);
-    float64 easeOutQuint(const float64 &delta, const float64 &dt);
+extern transition linear;
+extern transition sineInOut;
+extern transition halfSine;
+extern transition easeOutBack;
+extern transition easeInCirc;
+extern transition easeOutCirc;
+extern transition easeInCubic;
+extern transition easeOutCirc;
+extern transition easeInQuint;
+extern transition easeOutQuint;
 
-	template <int BumpRatioNumerator, int BumpRatioDenominator>
-	float64 bumpy(const float64 &delta, const float64 &dt) {
-		struct Bumpy {
-			Bumpy()
-				: bump(BumpRatioNumerator / float64(BumpRatioDenominator))
-				, dt0(bump - sqrt(bump * (bump - 1.)))
-				, k(1 / (2 * dt0 - 1)) {
-			}
-			float64 bump;
-			float64 dt0;
-			float64 k;
-		};
-		static Bumpy data;
-		return delta * (data.bump - data.k * (dt - data.dt0) * (dt - data.dt0));
+inline transition bumpy(float64 bump) {
+	auto dt0 = (bump - sqrt(bump * (bump - 1.)));
+	auto k = (1 / (2 * dt0 - 1));
+	return [bump, dt0, k](float64 delta, float64 dt) {
+		return delta * (bump - k * (dt - dt0) * (dt - dt0));
+	};
+}
+
+// Basic animated value.
+class value {
+public:
+	using ValueType = float64;
+
+	value() = default;
+	value(float64 from) : _cur(from), _from(from) {
+	}
+	value(float64 from, float64 to) : _cur(from), _from(from), _delta(to - from) {
+	}
+	void start(float64 to) {
+		_from = _cur;
+		_delta = to - _from;
+	}
+	void restart() {
+		_delta = _from + _delta - _cur;
+		_from = _cur;
 	}
 
-	class fvalue { // float animated value
-	public:
-		using ValueType = float64;
+	float64 from() const {
+		return _from;
+	}
+	float64 current() const {
+		return _cur;
+	}
+	float64 to() const {
+		return _from + _delta;
+	}
+	void add(float64 delta) {
+		_from += delta;
+		_cur += delta;
+	}
+	value &update(float64 dt, const transition &func) {
+		_cur = _from + func(_delta, dt);
+		return *this;
+	}
+	void finish() {
+		_cur = _from + _delta;
+		_from = _cur;
+		_delta = 0;
+	}
 
-		fvalue() = default;
-		fvalue(float64 from) : _cur(from), _from(from) {
-		}
-		fvalue(float64 from, float64 to) : _cur(from), _from(from), _delta(to - from) {
-		}
-		void start(float64 to) {
-			_from = _cur;
-			_delta = to - _from;
-		}
-		void restart() {
-			_delta = _from + _delta - _cur;
-			_from = _cur;
-		}
+private:
+	float64 _cur = 0.;
+	float64 _from = 0.;
+	float64 _delta = 0.;
 
-		float64 from() const {
-			return _from;
-		}
-		float64 current() const {
-			return _cur;
-		}
-		float64 to() const {
-			return _from + _delta;
-		}
-		void add(float64 delta) {
-			_from += delta;
-			_cur += delta;
-		}
-		fvalue &update(float64 dt, transition func) {
-			_cur = _from + (*func)(_delta, dt);
-			return *this;
-		}
-		void finish() {
-			_cur = _from + _delta;
-			_from = _cur;
-			_delta = 0;
-		}
+};
 
-	private:
-		float64 _cur = 0.;
-		float64 _from = 0.;
-		float64 _delta = 0.;
+using fvalue = value;
 
+class ivalue { // int animated value
+public:
+	using ValueType = int;
+
+	ivalue() = default;
+	ivalue(int from) : _cur(from), _from(float64(from)) {
+	}
+	ivalue(int from, int to) : _cur(from), _from(float64(from)), _delta(float64(to - from)) {
+	}
+	void start(int32 to) {
+		_from = float64(_cur);
+		_delta = float64(to) - _from;
+	}
+	void restart() {
+		_delta = _from + _delta - float64(_cur);
+		_from = float64(_cur);
+	}
+
+	int from() const {
+		return _from;
+	}
+	int current() const {
+		return _cur;
+	}
+	int to() const {
+		return qRound(_from + _delta);
+	}
+	void add(int delta) {
+		_from += delta;
+		_cur += delta;
+	}
+	ivalue &update(float64 dt, const transition &func) {
+		_cur = qRound(_from + func(_delta, dt));
+		return *this;
+	}
+	void finish() {
+		_cur = qRound(_from + _delta);
+		_from = _cur;
+		_delta = 0;
+	}
+
+private:
+	int _cur = 0;
+	float64 _from = 0.;
+	float64 _delta = 0.;
+
+};
+
+void startManager();
+void stopManager();
+void registerClipManager(Media::Clip::Manager *manager);
+
+inline int interpolate(int a, int b, float64 b_ratio) {
+	return qRound(a + float64(b - a) * b_ratio);
+}
+
+inline QColor color(QColor a, QColor b, float64 b_ratio) {
+	auto bOpacity = snap(interpolate(0, 255, b_ratio), 0, 255) + 1;
+	auto aOpacity = (256 - bOpacity);
+	return {
+		(a.red() * aOpacity + b.red() * bOpacity) >> 8,
+		(a.green() * aOpacity + b.green() * bOpacity) >> 8,
+		(a.blue() * aOpacity + b.blue() * bOpacity) >> 8,
+		(a.alpha() * aOpacity + b.alpha() * bOpacity) >> 8
 	};
+}
 
-	class ivalue { // int animated value
-	public:
-		using ValueType = int;
+inline QColor color(const style::color &a, QColor b, float64 b_ratio) {
+	return color(a->c, b, b_ratio);
+}
 
-		ivalue() = default;
-		ivalue(int from) : _cur(from), _from(float64(from)) {
-		}
-		ivalue(int from, int to) : _cur(from), _from(float64(from)), _delta(float64(to - from)) {
-		}
-		void start(int32 to) {
-			_from = float64(_cur);
-			_delta = float64(to) - _from;
-		}
-		void restart() {
-			_delta = _from + _delta - float64(_cur);
-			_from = float64(_cur);
-		}
+inline QColor color(QColor a, const style::color &b, float64 b_ratio) {
+	return color(a, b->c, b_ratio);
+}
 
-		int from() const {
-			return _from;
-		}
-		int current() const {
-			return _cur;
-		}
-		int to() const {
-			return qRound(_from + _delta);
-		}
-		void add(int delta) {
-			_from += delta;
-			_cur += delta;
-		}
-		ivalue &update(float64 dt, transition func) {
-			_cur = qRound(_from + (*func)(_delta, dt));
-			return *this;
-		}
-		void finish() {
-			_cur = qRound(_from + _delta);
-			_from = _cur;
-			_delta = 0;
-		}
+inline QColor color(const style::color &a, const style::color &b, float64 b_ratio) {
+	return color(a->c, b->c, b_ratio);
+}
 
-	private:
-		int _cur = 0;
-		float64 _from = 0.;
-		float64 _delta = 0.;
+inline QPen pen(QColor a, QColor b, float64 b_ratio) {
+	return color(a, b, b_ratio);
+}
 
-	};
+inline QPen pen(const style::color &a, QColor b, float64 b_ratio) {
+	return (b_ratio > 0) ? pen(a->c, b, b_ratio) : a;
+}
 
-	class cvalue { // QColor animated value
-	public:
-		using ValueType = QColor;
+inline QPen pen(QColor a, const style::color &b, float64 b_ratio) {
+	return (b_ratio < 1) ? pen(a, b->c, b_ratio) : b;
+}
 
-		cvalue() = default;
-		explicit cvalue(QColor from)
-			: _cur(from)
-			, _from_r(from.redF())
-			, _from_g(from.greenF())
-			, _from_b(from.blueF())
-			, _from_a(from.alphaF()) {
-		}
-		cvalue(QColor from, QColor to)
-			: _cur(from)
-			, _from_r(from.redF())
-			, _from_g(from.greenF())
-			, _from_b(from.blueF())
-			, _from_a(from.alphaF())
-			, _delta_r(to.redF() - from.redF())
-			, _delta_g(to.greenF() - from.greenF())
-			, _delta_b(to.blueF() - from.blueF())
-			, _delta_a(to.alphaF() - from.alphaF()) {
-		}
-		void start(QColor to) {
-			_from_r = _cur.redF();
-			_from_g = _cur.greenF();
-			_from_b = _cur.blueF();
-			_from_a = _cur.alphaF();
-			_delta_r = to.redF() - _from_r;
-			_delta_g = to.greenF() - _from_g;
-			_delta_b = to.blueF() - _from_b;
-			_delta_a = to.alphaF() - _from_a;
-		}
-		void restart() {
-			_delta_r = _from_r + _delta_r - _cur.redF();
-			_delta_g = _from_g + _delta_g - _cur.greenF();
-			_delta_b = _from_b + _delta_b - _cur.blueF();
-			_delta_a = _from_a + _delta_a - _cur.alphaF();
-			_from_r = _cur.redF();
-			_from_g = _cur.greenF();
-			_from_b = _cur.blueF();
-			_from_a = _cur.alphaF();
-		}
-		QColor from() const {
-			QColor result;
-			result.setRedF(_from_r);
-			result.setGreenF(_from_g);
-			result.setBlueF(_from_b);
-			result.setAlphaF(_from_a);
-			return result;
-		}
-		QColor current() const {
-			return _cur;
-		}
-		QColor to() const {
-			QColor result;
-			result.setRedF(_from_r + _delta_r);
-			result.setGreenF(_from_g + _delta_g);
-			result.setBlueF(_from_b + _delta_b);
-			result.setAlphaF(_from_a + _delta_a);
-			return result;
-		}
-		cvalue &update(const float64 &dt, transition func) {
-			_cur.setRedF(_from_r + (*func)(_delta_r, dt));
-			_cur.setGreenF(_from_g + (*func)(_delta_g, dt));
-			_cur.setBlueF(_from_b + (*func)(_delta_b, dt));
-			_cur.setAlphaF(_from_a + (*func)(_delta_a, dt));
-			return *this;
-		}
-		void finish() {
-			_cur.setRedF(_from_r + _delta_r);
-			_cur.setGreenF(_from_g + _delta_g);
-			_cur.setBlueF(_from_b + _delta_b);
-			_cur.setAlphaF(_from_a + _delta_a);
-			_from_r = _cur.redF();
-			_from_g = _cur.greenF();
-			_from_b = _cur.blueF();
-			_from_a = _cur.alphaF();
-			_delta_r = _delta_g = _delta_b = _delta_a = 0;
-		}
+inline QPen pen(const style::color &a, const style::color &b, float64 b_ratio) {
+	return (b_ratio > 0) ? ((b_ratio < 1) ? pen(a->c, b->c, b_ratio) : b) : a;
+}
 
-	private:
-		QColor _cur;
-		float64 _from_r = 0.;
-		float64 _from_g = 0.;
-		float64 _from_b = 0.;
-		float64 _from_a = 0.;
-		float64 _delta_r = 0.;
-		float64 _delta_g = 0.;
-		float64 _delta_b = 0.;
-		float64 _delta_a = 0.;
+inline QBrush brush(QColor a, QColor b, float64 b_ratio) {
+	return color(a, b, b_ratio);
+}
 
-	};
+inline QBrush brush(const style::color &a, QColor b, float64 b_ratio) {
+	return (b_ratio > 0) ? brush(a->c, b, b_ratio) : a;
+}
 
-	void startManager();
-	void stopManager();
-	void registerClipManager(Media::Clip::Manager *manager);
+inline QBrush brush(QColor a, const style::color &b, float64 b_ratio) {
+	return (b_ratio < 1) ? brush(a, b->c, b_ratio) : b;
+}
+
+inline QBrush brush(const style::color &a, const style::color &b, float64 b_ratio) {
+	return (b_ratio > 0) ? ((b_ratio < 1) ? brush(a->c, b->c, b_ratio) : b) : a;
+}
 
 };
 
@@ -573,7 +533,6 @@ private:
 
 using FloatAnimation = SimpleAnimation<anim::fvalue>;
 using IntAnimation = SimpleAnimation<anim::ivalue>;
-using ColorAnimation = SimpleAnimation<anim::cvalue>;
 
 class AnimationManager : public QObject {
 	Q_OBJECT
diff --git a/Telegram/SourceFiles/ui/buttons/icon_button.cpp b/Telegram/SourceFiles/ui/buttons/icon_button.cpp
index ee61a36c9..e5794fe68 100644
--- a/Telegram/SourceFiles/ui/buttons/icon_button.cpp
+++ b/Telegram/SourceFiles/ui/buttons/icon_button.cpp
@@ -93,9 +93,7 @@ MaskButton::MaskButton(QWidget *parent, const style::MaskButton &st) : Button(pa
 void MaskButton::onStateChanged(int oldState, ButtonStateChangeSource source) {
 	auto over = (_state & StateOver);
 	if (over != (oldState & StateOver)) {
-		auto from = over ? _st.iconBg->c : _st.iconBgOver->c;
-		auto to = over ? _st.iconBgOver->c : _st.iconBg->c;
-		_a_iconBg.start([this] { update(); }, from, to, _st.duration);
+		_a_iconOver.start([this] { update(); }, over ? 0. : 1., over ? 1. : 0., _st.duration);
 	}
 }
 
@@ -115,11 +113,7 @@ void MaskButton::paintEvent(QPaintEvent *e) {
 		p.fillRect(clip, _st.bg);
 	}
 	if (icon.intersects(clip)) {
-		if (_a_iconBg.animating(getms())) {
-			p.fillRect(icon.intersected(clip), _a_iconBg.current());
-		} else {
-			p.fillRect(icon.intersected(clip), (_state & StateOver) ? _st.iconBgOver : _st.iconBg);
-		}
+		p.fillRect(icon.intersected(clip), anim::brush(_st.iconBg, _st.iconBgOver, _a_iconOver.current(getms(), (_state & StateOver) ? 1. : 0.)));
 		_st.icon.paint(p, position, width());
 	}
 }
diff --git a/Telegram/SourceFiles/ui/buttons/icon_button.h b/Telegram/SourceFiles/ui/buttons/icon_button.h
index a782681e1..7decf5144 100644
--- a/Telegram/SourceFiles/ui/buttons/icon_button.h
+++ b/Telegram/SourceFiles/ui/buttons/icon_button.h
@@ -58,7 +58,7 @@ protected:
 private:
 	const style::MaskButton &_st;
 
-	ColorAnimation _a_iconBg;
+	FloatAnimation _a_iconOver;
 
 };
 
diff --git a/Telegram/SourceFiles/ui/effects/round_image_checkbox.cpp b/Telegram/SourceFiles/ui/effects/round_image_checkbox.cpp
index f0fcb5456..ee57868d2 100644
--- a/Telegram/SourceFiles/ui/effects/round_image_checkbox.cpp
+++ b/Telegram/SourceFiles/ui/effects/round_image_checkbox.cpp
@@ -164,7 +164,7 @@ void RoundImageCheckbox::setChecked(bool checked, SetStyle speed) {
 	}
 	if (speed == SetStyle::Animated) {
 		prepareWideCache();
-		_selection.start(_updateCallback, _checked ? 0 : 1, _checked ? 1 : 0, _st.selectDuration, anim::bumpy<125, 100>);
+		_selection.start(_updateCallback, _checked ? 0 : 1, _checked ? 1 : 0, _st.selectDuration, anim::bumpy(1.25));
 	} else {
 		_selection.finish();
 	}
diff --git a/Telegram/SourceFiles/ui/flatbutton.cpp b/Telegram/SourceFiles/ui/flatbutton.cpp
index 108b77a0b..5d44c1b74 100644
--- a/Telegram/SourceFiles/ui/flatbutton.cpp
+++ b/Telegram/SourceFiles/ui/flatbutton.cpp
@@ -26,8 +26,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
 FlatButton::FlatButton(QWidget *parent, const QString &text, const style::flatButton &st) : Button(parent)
 , _text(text)
 , _st(st)
-, a_bg(st.bgColor->c)
-, a_text(st.color->c)
+, a_over(0)
 , _a_appearance(animation(this, &FlatButton::step_appearance)) {
 	if (_st.width < 0) {
 		_width = textWidth() - _st.width;
@@ -73,25 +72,18 @@ void FlatButton::step_appearance(float64 ms, bool timer) {
 	float64 dt = ms / _st.duration;
 	if (dt >= 1) {
 		_a_appearance.stop();
-		a_bg.finish();
-		a_text.finish();
+		a_over.finish();
 	} else {
-		a_bg.update(dt, anim::linear);
-		a_text.update(dt, anim::linear);
+		a_over.update(dt, anim::linear);
 	}
 	if (timer) update();
 }
 
 void FlatButton::onStateChange(int oldState, ButtonStateChangeSource source) {
-	auto &bgColorTo = (_state & StateOver) ? ((_state & StateDown) ? _st.downBgColor : _st.overBgColor) : _st.bgColor;
-	auto &colorTo = (_state & StateOver) ? ((_state & StateDown) ? _st.downColor : _st.overColor) : _st.color;
-
-	a_bg.start(bgColorTo->c);
-	a_text.start(colorTo->c);
+	a_over.start((_state & StateOver) ? 1. : 0.);
 	if (source == ButtonByUser || source == ButtonByPress) {
 		_a_appearance.stop();
-		a_bg.finish();
-		a_text.finish();
+		a_over.finish();
 		update();
 	} else {
 		_a_appearance.start();
@@ -103,23 +95,12 @@ void FlatButton::paintEvent(QPaintEvent *e) {
 
 	QRect r(0, height() - _st.height, width(), _st.height);
 
-	auto animating = _a_appearance.animating();
-	auto &bg = (_state & StateOver) ? ((_state & StateDown) ? _st.downBgColor : _st.overBgColor) : _st.bgColor;
-	auto &fg = (_state & StateOver) ? ((_state & StateDown) ? _st.downColor : _st.overColor) : _st.color;
 	p.setOpacity(_opacity);
-	if (animating) {
-		p.fillRect(r, a_bg.current());
-	} else {
-		p.fillRect(r, bg);
-	}
+	p.fillRect(r, anim::brush(_st.bgColor, _st.overBgColor, a_over.current()));
 
 	p.setFont((_state & StateOver) ? _st.overFont : _st.font);
 	p.setRenderHint(QPainter::TextAntialiasing);
-	if (animating) {
-		p.setPen(a_text.current());
-	} else {
-		p.setPen(fg);
-	}
+	p.setPen(anim::pen(_st.color, _st.overColor, a_over.current()));
 
 	int32 top = (_state & StateOver) ? ((_state & StateDown) ? _st.downTextTop : _st.overTextTop) : _st.textTop;
 	r.setTop(top);
diff --git a/Telegram/SourceFiles/ui/flatbutton.h b/Telegram/SourceFiles/ui/flatbutton.h
index a4bcc3148..bb11410cc 100644
--- a/Telegram/SourceFiles/ui/flatbutton.h
+++ b/Telegram/SourceFiles/ui/flatbutton.h
@@ -51,7 +51,7 @@ private:
 
 	const style::flatButton &_st;
 
-	anim::cvalue a_bg, a_text;
+	anim::fvalue a_over;
 	Animation _a_appearance;
 
 	float64 _opacity = 1.;
diff --git a/Telegram/SourceFiles/ui/flatinput.cpp b/Telegram/SourceFiles/ui/flatinput.cpp
index de9a5eae8..10b872d7b 100644
--- a/Telegram/SourceFiles/ui/flatinput.cpp
+++ b/Telegram/SourceFiles/ui/flatinput.cpp
@@ -79,9 +79,10 @@ FlatInput::FlatInput(QWidget *parent, const style::flatInput &st, const QString
 , _phVisible(!v.length())
 , a_phLeft(_phVisible ? 0 : st.phShift)
 , a_phAlpha(_phVisible ? 1 : 0)
-, a_phColor(st.phColor->c)
-, a_borderColor(st.borderColor->c)
-, a_bgColor(st.bgColor->c)
+, a_phColorFocus(0)
+, a_borderColorActive(0)
+, a_borderColorError(0)
+, a_bgColorActive(0)
 , _a_appearance(animation(this, &FlatInput::step_appearance))
 , _notingBene(0)
 , _st(st) {
@@ -173,10 +174,11 @@ void FlatInput::paintEvent(QPaintEvent *e) {
 	Painter p(this);
 
 	p.setRenderHint(QPainter::HighQualityAntialiasing);
-	auto pen = QPen(a_borderColor.current());
+	auto borderColor = anim::color(_st.borderColor, _st.borderActive, a_borderColorActive.current());
+	auto pen = anim::pen(borderColor, _st.borderError, a_borderColorError.current());
 	pen.setWidth(_st.borderWidth);
 	p.setPen(pen);
-	p.setBrush(QBrush(a_bgColor.current()));
+	p.setBrush(anim::brush(_st.bgColor, _st.bgActive, a_bgColorActive.current()));
 	p.drawRoundedRect(QRectF(0, 0, width(), height()).marginsRemoved(QMarginsF(_st.borderWidth / 2., _st.borderWidth / 2., _st.borderWidth / 2., _st.borderWidth / 2.)), st::buttonRadius - (_st.borderWidth / 2.), st::buttonRadius - (_st.borderWidth / 2.));
 	p.setRenderHint(QPainter::HighQualityAntialiasing, false);
 
@@ -202,22 +204,20 @@ void FlatInput::paintEvent(QPaintEvent *e) {
 }
 
 void FlatInput::focusInEvent(QFocusEvent *e) {
-	a_phColor.start(_st.phFocusColor->c);
-	if (_notingBene <= 0) {
-		a_borderColor.start(_st.borderActive->c);
-	}
-	a_bgColor.start(_st.bgActive->c);
+	a_phColorFocus.start(1.);
+	a_borderColorActive.start(1.);
+	a_borderColorError.restart();
+	a_bgColorActive.start(1);
 	_a_appearance.start();
 	QLineEdit::focusInEvent(e);
 	emit focused();
 }
 
 void FlatInput::focusOutEvent(QFocusEvent *e) {
-	a_phColor.start(_st.phColor->c);
-	if (_notingBene <= 0) {
-		a_borderColor.start(_st.borderColor->c);
-	}
-	a_bgColor.start(_st.bgColor->c);
+	a_phColorFocus.start(0.);
+	a_borderColorActive.start(0.);
+	a_borderColorError.restart();
+	a_bgColorActive.start(0);
 	_a_appearance.start();
 	QLineEdit::focusOutEvent(e);
 	emit blurred();
@@ -263,23 +263,25 @@ void FlatInput::step_appearance(float64 ms, bool timer) {
 		_a_appearance.stop();
 		a_phLeft.finish();
 		a_phAlpha.finish();
-		a_phColor.finish();
-		a_bgColor.finish();
+		a_phColorFocus.finish();
+		a_bgColorActive.finish();
 		if (_notingBene > 0) {
 			_notingBene = -1;
-			a_borderColor.start((hasFocus() ? _st.borderActive : _st.borderColor)->c);
+			a_borderColorActive.restart();
+			a_borderColorError.start(0);
 			_a_appearance.start();
 			return;
 		} else if (_notingBene) {
 			_notingBene = 0;
 		}
-		a_borderColor.finish();
+		a_borderColorActive.finish();
 	} else {
-		a_phLeft.update(dt, _st.phLeftFunc);
-		a_phAlpha.update(dt, _st.phAlphaFunc);
-		a_phColor.update(dt, _st.phColorFunc);
-		a_bgColor.update(dt, _st.phColorFunc);
-		a_borderColor.update(dt, _st.phColorFunc);
+		a_phLeft.update(dt, anim::linear);
+		a_phAlpha.update(dt, anim::linear);
+		a_phColorFocus.update(dt, anim::linear);
+		a_bgColorActive.update(dt, anim::linear);
+		a_borderColorActive.update(dt, anim::linear);
+		a_borderColorError.update(dt, anim::linear);
 	}
 	if (timer) update();
 }
@@ -326,8 +328,8 @@ void FlatInput::correctValue(const QString &was, QString &now) {
 }
 
 void FlatInput::phPrepare(Painter &p) {
-	p.setFont(_st.font->f);
-	p.setPen(a_phColor.current());
+	p.setFont(_st.font);
+	p.setPen(anim::pen(_st.phColor, _st.phFocusColor, a_phColorFocus.current()));
 }
 
 void FlatInput::keyPressEvent(QKeyEvent *e) {
@@ -381,7 +383,8 @@ void FlatInput::onTextChange(const QString &text) {
 void FlatInput::notaBene() {
 	_notingBene = 1;
 	setFocus();
-	a_borderColor.start(_st.borderError->c);
+	a_borderColorError.start(1.);
+	a_borderColorActive.restart();
 	_a_appearance.start();
 }
 
@@ -594,12 +597,13 @@ InputArea::InputArea(QWidget *parent, const style::InputArea &st, const QString
 , _placeholderVisible(val.isEmpty())
 , a_placeholderLeft(_placeholderVisible ? 0 : st.placeholderShift)
 , a_placeholderOpacity(_placeholderVisible ? 1 : 0)
-, a_placeholderFg(st.placeholderFg->c)
+, a_placeholderFgActive(0)
 , _a_placeholderFg(animation(this, &InputArea::step_placeholderFg))
 , _a_placeholderShift(animation(this, &InputArea::step_placeholderShift))
 
 , a_borderOpacityActive(0)
-, a_borderFg(st.borderFg->c)
+, a_borderFgActive(0)
+, a_borderFgError(0)
 , _a_border(animation(this, &InputArea::step_border))
 
 , _focused(false)
@@ -746,8 +750,10 @@ void InputArea::paintEvent(QPaintEvent *e) {
 		p.fillRect(0, height() - _st.border, width(), _st.border, _st.borderFg);
 	}
 	if (_st.borderActive && a_borderOpacityActive.current() > 0) {
+		auto borderFgActive = anim::color(_st.borderFg, _st.borderFgActive, a_borderFgActive.current());
+		auto borderFg = anim::color(borderFgActive, _st.borderFgError, a_borderFgError.current());
 		p.setOpacity(a_borderOpacityActive.current());
-		p.fillRect(0, height() - _st.borderActive, width(), _st.borderActive, a_borderFg.current());
+		p.fillRect(0, height() - _st.borderActive, width(), _st.borderActive, borderFg);
 		p.setOpacity(1);
 	}
 
@@ -765,7 +771,7 @@ void InputArea::paintEvent(QPaintEvent *e) {
 		if (rtl()) r.moveLeft(width() - r.left() - r.width());
 
 		p.setFont(_st.font);
-		p.setPen(a_placeholderFg.current());
+		p.setPen(anim::pen(_st.placeholderFg, _st.placeholderFgActive, a_placeholderFgActive.current()));
 		p.drawText(r, _placeholder, _st.placeholderAlign);
 
 		p.restore();
@@ -774,7 +780,8 @@ void InputArea::paintEvent(QPaintEvent *e) {
 }
 
 void InputArea::startBorderAnimation() {
-	a_borderFg.start((_error ? _st.borderFgError : (_focused ? _st.borderFgActive : _st.borderFg))->c);
+	a_borderFgActive.start(_focused ? 1. : 0.);
+	a_borderFgError.start(_error ? 1. : 0.);
 	a_borderOpacityActive.start((_error || _focused) ? 1 : 0);
 	_a_border.start();
 }
@@ -801,7 +808,7 @@ void InputArea::focusInInner() {
 	if (!_focused) {
 		_focused = true;
 
-		a_placeholderFg.start(_st.placeholderFgActive->c);
+		a_placeholderFgActive.start(1.);
 		_a_placeholderFg.start();
 
 		startBorderAnimation();
@@ -818,7 +825,7 @@ void InputArea::focusOutInner() {
 	if (_focused) {
 		_focused = false;
 
-		a_placeholderFg.start(_st.placeholderFg->c);
+		a_placeholderFgActive.start(0.);
 		_a_placeholderFg.start();
 
 		startBorderAnimation();
@@ -1149,9 +1156,9 @@ void InputArea::step_placeholderFg(float64 ms, bool timer) {
 	float64 dt = ms / _st.duration;
 	if (dt >= 1) {
 		_a_placeholderFg.stop();
-		a_placeholderFg.finish();
+		a_placeholderFgActive.finish();
 	} else {
-		a_placeholderFg.update(dt, anim::linear);
+		a_placeholderFgActive.update(dt, anim::linear);
 	}
 	if (timer) update();
 }
@@ -1174,10 +1181,12 @@ void InputArea::step_border(float64 ms, bool timer) {
 	bool res = true;
 	if (dt >= 1) {
 		_a_border.stop();
-		a_borderFg.finish();
+		a_borderFgActive.finish();
+		a_borderFgError.finish();
 		a_borderOpacityActive.finish();
 	} else {
-		a_borderFg.update(dt, anim::linear);
+		a_borderFgActive.update(dt, anim::linear);
+		a_borderFgError.update(dt, anim::linear);
 		a_borderOpacityActive.update(dt, anim::linear);
 	}
 	if (timer) update();
@@ -1317,12 +1326,13 @@ InputField::InputField(QWidget *parent, const style::InputField &st, const QStri
 , _placeholderVisible(val.isEmpty())
 , a_placeholderLeft(_placeholderVisible ? 0 : st.placeholderShift)
 , a_placeholderOpacity(_placeholderVisible ? 1 : 0)
-, a_placeholderFg(st.placeholderFg->c)
+, a_placeholderFgActive(0)
 , _a_placeholderFg(animation(this, &InputField::step_placeholderFg))
 , _a_placeholderShift(animation(this, &InputField::step_placeholderShift))
 
 , a_borderOpacityActive(0)
-, a_borderFg(st.borderFg->c)
+, a_borderFgActive(0)
+, a_borderFgError(0)
 , _a_border(animation(this, &InputField::step_border))
 
 , _focused(false)
@@ -1455,8 +1465,10 @@ void InputField::paintEvent(QPaintEvent *e) {
 		p.fillRect(0, height() - _st.border, width(), _st.border, _st.borderFg->b);
 	}
 	if (_st.borderActive && a_borderOpacityActive.current() > 0) {
+		auto borderFgActive = anim::color(_st.borderFg, _st.borderFgActive, a_borderFgActive.current());
+		auto borderFg = anim::color(borderFgActive, _st.borderFgError, a_borderFgError.current());
 		p.setOpacity(a_borderOpacityActive.current());
-		p.fillRect(0, height() - _st.borderActive, width(), _st.borderActive, a_borderFg.current());
+		p.fillRect(0, height() - _st.borderActive, width(), _st.borderActive, borderFg);
 		p.setOpacity(1);
 	}
 
@@ -1474,7 +1486,7 @@ void InputField::paintEvent(QPaintEvent *e) {
 		if (rtl()) r.moveLeft(width() - r.left() - r.width());
 
 		p.setFont(_st.font);
-		p.setPen(a_placeholderFg.current());
+		p.setPen(anim::pen(_st.placeholderFg, _st.placeholderFgActive, a_placeholderFgActive.current()));
 		p.drawText(r, _placeholder, _st.placeholderAlign);
 
 		p.restore();
@@ -1483,7 +1495,8 @@ void InputField::paintEvent(QPaintEvent *e) {
 }
 
 void InputField::startBorderAnimation() {
-	a_borderFg.start((_error ? _st.borderFgError : (_focused ? _st.borderFgActive : _st.borderFg))->c);
+	a_borderFgActive.start(_focused ? 1. : 0.);
+	a_borderFgError.start(_error ? 1. : 0.);
 	a_borderOpacityActive.start((_error || _focused) ? 1 : 0);
 	_a_border.start();
 }
@@ -1510,7 +1523,7 @@ void InputField::focusInInner() {
 	if (!_focused) {
 		_focused = true;
 
-		a_placeholderFg.start(_st.placeholderFgActive->c);
+		a_placeholderFgActive.start(1.);
 		_a_placeholderFg.start();
 
 		startBorderAnimation();
@@ -1527,7 +1540,7 @@ void InputField::focusOutInner() {
 	if (_focused) {
 		_focused = false;
 
-		a_placeholderFg.start(_st.placeholderFg->c);
+		a_placeholderFgActive.start(0.);
 		_a_placeholderFg.start();
 
 		startBorderAnimation();
@@ -1889,9 +1902,9 @@ void InputField::step_placeholderFg(float64 ms, bool timer) {
 	float64 dt = ms / _st.duration;
 	if (dt >= 1) {
 		_a_placeholderFg.stop();
-		a_placeholderFg.finish();
+		a_placeholderFgActive.finish();
 	} else {
-		a_placeholderFg.update(dt, anim::linear);
+		a_placeholderFgActive.update(dt, anim::linear);
 	}
 	if (timer) update();
 }
@@ -1918,10 +1931,12 @@ void InputField::step_border(float64 ms, bool timer) {
 	float64 dt = ms / _st.duration;
 	if (dt >= 1) {
 		_a_border.stop();
-		a_borderFg.finish();
+		a_borderFgActive.finish();
+		a_borderFgError.finish();
 		a_borderOpacityActive.finish();
 	} else {
-		a_borderFg.update(dt, anim::linear);
+		a_borderFgActive.update(dt, anim::linear);
+		a_borderFgError.update(dt, anim::linear);
 		a_borderOpacityActive.update(dt, anim::linear);
 	}
 	if (timer) update();
@@ -2064,12 +2079,13 @@ MaskedInputField::MaskedInputField(QWidget *parent, const style::InputField &st,
 , _placeholderFast(false)
 , a_placeholderLeft(_placeholderVisible ? 0 : st.placeholderShift)
 , a_placeholderOpacity(_placeholderVisible ? 1 : 0)
-, a_placeholderFg(st.placeholderFg->c)
+, a_placeholderFgActive(0)
 , _a_placeholderFg(animation(this, &MaskedInputField::step_placeholderFg))
 , _a_placeholderShift(animation(this, &MaskedInputField::step_placeholderShift))
 
 , a_borderOpacityActive(0)
-, a_borderFg(st.borderFg->c)
+, a_borderFgActive(0)
+, a_borderFgError(0)
 , _a_border(animation(this, &MaskedInputField::step_border))
 
 , _focused(false)
@@ -2183,8 +2199,10 @@ void MaskedInputField::paintEvent(QPaintEvent *e) {
 		p.fillRect(0, height() - _st.border, width(), _st.border, _st.borderFg->b);
 	}
 	if (_st.borderActive && a_borderOpacityActive.current() > 0) {
+		auto borderFgActive = anim::color(_st.borderFg, _st.borderFgActive, a_borderFgActive.current());
+		auto borderFg = anim::color(borderFgActive, _st.borderFgError, a_borderFgError.current());
 		p.setOpacity(a_borderOpacityActive.current());
-		p.fillRect(0, height() - _st.borderActive, width(), _st.borderActive, a_borderFg.current());
+		p.fillRect(0, height() - _st.borderActive, width(), _st.borderActive, borderFg);
 		p.setOpacity(1);
 	}
 
@@ -2195,7 +2213,8 @@ void MaskedInputField::paintEvent(QPaintEvent *e) {
 }
 
 void MaskedInputField::startBorderAnimation() {
-	a_borderFg.start((_error ? _st.borderFgError : (_focused ? _st.borderFgActive : _st.borderFg))->c);
+	a_borderFgActive.start(_focused ? 1. : 0.);
+	a_borderFgError.start(_error ? 1. : 0.);
 	a_borderOpacityActive.start((_error || _focused) ? 1 : 0);
 	_a_border.start();
 }
@@ -2204,7 +2223,7 @@ void MaskedInputField::focusInEvent(QFocusEvent *e) {
 	if (!_focused) {
 		_focused = true;
 
-		a_placeholderFg.start(_st.placeholderFgActive->c);
+		a_placeholderFgActive.start(1.);
 		_a_placeholderFg.start();
 
 		startBorderAnimation();
@@ -2217,7 +2236,7 @@ void MaskedInputField::focusOutEvent(QFocusEvent *e) {
 	if (_focused) {
 		_focused = false;
 
-		a_placeholderFg.start(_st.placeholderFg->c);
+		a_placeholderFgActive.start(0.);
 		_a_placeholderFg.start();
 
 		startBorderAnimation();
@@ -2263,9 +2282,9 @@ void MaskedInputField::step_placeholderFg(float64 ms, bool timer) {
 	float64 dt = ms / _st.duration;
 	if (dt >= 1) {
 		_a_placeholderFg.stop();
-		a_placeholderFg.finish();
+		a_placeholderFgActive.finish();
 	} else {
-		a_placeholderFg.update(dt, anim::linear);
+		a_placeholderFgActive.update(dt, anim::linear);
 	}
 	if (timer) update();
 }
@@ -2287,10 +2306,12 @@ void MaskedInputField::step_border(float64 ms, bool timer) {
 	float64 dt = ms / _st.duration;
 	if (dt >= 1) {
 		_a_border.stop();
-		a_borderFg.finish();
+		a_borderFgActive.finish();
+		a_borderFgError.finish();
 		a_borderOpacityActive.finish();
 	} else {
-		a_borderFg.update(dt, anim::linear);
+		a_borderFgActive.update(dt, anim::linear);
+		a_borderFgError.update(dt, anim::linear);
 		a_borderOpacityActive.update(dt, anim::linear);
 	}
 	if (timer) update();
@@ -2364,7 +2385,7 @@ void MaskedInputField::paintPlaceholder(Painter &p) {
 
 void MaskedInputField::placeholderPreparePaint(Painter &p) {
 	p.setFont(_st.font);
-	p.setPen(a_placeholderFg.current());
+	p.setPen(anim::pen(_st.placeholderFg, _st.placeholderFgActive, a_placeholderFgActive.current()));
 }
 
 void MaskedInputField::keyPressEvent(QKeyEvent *e) {
diff --git a/Telegram/SourceFiles/ui/flatinput.h b/Telegram/SourceFiles/ui/flatinput.h
index 5f5dddd30..60d8a2e4f 100644
--- a/Telegram/SourceFiles/ui/flatinput.h
+++ b/Telegram/SourceFiles/ui/flatinput.h
@@ -98,7 +98,10 @@ private:
 	bool _phVisible;
 	anim::ivalue a_phLeft;
 	anim::fvalue a_phAlpha;
-	anim::cvalue a_phColor, a_borderColor, a_bgColor;
+	anim::fvalue a_phColorFocus;
+	anim::fvalue a_borderColorActive;
+	anim::fvalue a_borderColorError;
+	anim::fvalue a_bgColorActive;
 	Animation _a_appearance;
 
 	int _notingBene;
@@ -303,11 +306,12 @@ private:
 	bool _placeholderVisible;
 	anim::ivalue a_placeholderLeft;
 	anim::fvalue a_placeholderOpacity;
-	anim::cvalue a_placeholderFg;
+	anim::fvalue a_placeholderFgActive;
 	Animation _a_placeholderFg, _a_placeholderShift;
 
 	anim::fvalue a_borderOpacityActive;
-	anim::cvalue a_borderFg;
+	anim::fvalue a_borderFgActive;
+	anim::fvalue a_borderFgError;
 	Animation _a_border;
 
 	bool _focused, _error;
@@ -472,11 +476,12 @@ private:
 	bool _placeholderVisible;
 	anim::ivalue a_placeholderLeft;
 	anim::fvalue a_placeholderOpacity;
-	anim::cvalue a_placeholderFg;
+	anim::fvalue a_placeholderFgActive;
 	Animation _a_placeholderFg, _a_placeholderShift;
 
 	anim::fvalue a_borderOpacityActive;
-	anim::cvalue a_borderFg;
+	anim::fvalue a_borderFgActive;
+	anim::fvalue a_borderFgError;
 	Animation _a_border;
 
 	bool _focused, _error;
@@ -588,11 +593,12 @@ private:
 	bool _placeholderVisible, _placeholderFast;
 	anim::ivalue a_placeholderLeft;
 	anim::fvalue a_placeholderOpacity;
-	anim::cvalue a_placeholderFg;
+	anim::fvalue a_placeholderFgActive;
 	Animation _a_placeholderFg, _a_placeholderShift;
 
 	anim::fvalue a_borderOpacityActive;
-	anim::cvalue a_borderFg;
+	anim::fvalue a_borderFgActive;
+	anim::fvalue a_borderFgError;
 	Animation _a_border;
 
 	bool _focused, _error;
diff --git a/Telegram/SourceFiles/ui/flattextarea.cpp b/Telegram/SourceFiles/ui/flattextarea.cpp
index 1e9635733..f8495a4a7 100644
--- a/Telegram/SourceFiles/ui/flattextarea.cpp
+++ b/Telegram/SourceFiles/ui/flattextarea.cpp
@@ -87,7 +87,7 @@ FlatTextarea::FlatTextarea(QWidget *parent, const style::flatTextarea &st, const
 , _phVisible(!v.length())
 , a_phLeft(_phVisible ? 0 : st.phShift)
 , a_phAlpha(_phVisible ? 1 : 0)
-, a_phColor(st.phColor->c)
+, a_phColorFocused(0)
 , _a_appearance(animation(this, &FlatTextarea::step_appearance))
 , _lastTextWithTags { v, tags }
 , _st(st) {
@@ -285,7 +285,7 @@ void FlatTextarea::paintEvent(QPaintEvent *e) {
 		p.save();
 		p.setClipRect(r);
 		p.setFont(_st.font);
-		p.setPen(a_phColor.current());
+		p.setPen(anim::pen(_st.phColor, _st.phFocusColor, a_phColorFocused.current()));
 		if (_st.phAlign == style::al_topleft && _phAfter > 0) {
 			int skipWidth = placeholderSkipWidth();
 			p.drawText(_st.textMrg.left() - _fakeMargin + a_phLeft.current() + skipWidth, _st.textMrg.top() - _fakeMargin - st::lineWidth + _st.font->ascent, _ph);
@@ -312,13 +312,13 @@ int FlatTextarea::placeholderSkipWidth() const {
 }
 
 void FlatTextarea::focusInEvent(QFocusEvent *e) {
-	a_phColor.start(_st.phFocusColor->c);
+	a_phColorFocused.start(1.);
 	_a_appearance.start();
 	QTextEdit::focusInEvent(e);
 }
 
 void FlatTextarea::focusOutEvent(QFocusEvent *e) {
-	a_phColor.start(_st.phColor->c);
+	a_phColorFocused.start(0.);
 	_a_appearance.start();
 	QTextEdit::focusOutEvent(e);
 }
@@ -1269,14 +1269,14 @@ void FlatTextarea::step_appearance(float64 ms, bool timer) {
 		_a_appearance.stop();
 		a_phLeft.finish();
 		a_phAlpha.finish();
-		a_phColor.finish();
+		a_phColorFocused.finish();
 		a_phLeft = anim::ivalue(a_phLeft.current());
 		a_phAlpha = anim::fvalue(a_phAlpha.current());
-		a_phColor = anim::cvalue(a_phColor.current());
+		a_phColorFocused = anim::fvalue(a_phColorFocused.current());
 	} else {
-		a_phLeft.update(dt, _st.phLeftFunc);
-		a_phAlpha.update(dt, _st.phAlphaFunc);
-		a_phColor.update(dt, _st.phColorFunc);
+		a_phLeft.update(dt, anim::linear);
+		a_phAlpha.update(dt, anim::linear);
+		a_phColorFocused.update(dt, anim::linear);
 	}
 	if (timer) update();
 }
diff --git a/Telegram/SourceFiles/ui/flattextarea.h b/Telegram/SourceFiles/ui/flattextarea.h
index 51929cc73..d78b6f904 100644
--- a/Telegram/SourceFiles/ui/flattextarea.h
+++ b/Telegram/SourceFiles/ui/flattextarea.h
@@ -196,7 +196,7 @@ private:
 	bool _phVisible;
 	anim::ivalue a_phLeft;
 	anim::fvalue a_phAlpha;
-	anim::cvalue a_phColor;
+	anim::fvalue a_phColorFocused;
 	Animation _a_appearance;
 
 	TextWithTags _lastTextWithTags;
diff --git a/Telegram/SourceFiles/ui/scrollarea.cpp b/Telegram/SourceFiles/ui/scrollarea.cpp
index 5dd8e58a7..19c32037d 100644
--- a/Telegram/SourceFiles/ui/scrollarea.cpp
+++ b/Telegram/SourceFiles/ui/scrollarea.cpp
@@ -47,8 +47,9 @@ ScrollBar::ScrollBar(ScrollArea *parent, bool vert, const style::flatScroll *st)
 , _connected(vert ? parent->verticalScrollBar() : parent->horizontalScrollBar())
 , _scrollMax(_connected->maximum())
 , _hideIn(-1)
-, a_bg(_st->hiding ? _st->bgColor->transparent() : _st->bgColor->c)
-, a_bar(_st->hiding ? _st->barColor->transparent() : _st->barColor->c)
+, a_bgOver(0.)
+, a_barOver(0.)
+, a_fullOpacity(_st->hiding ? 0. : 1.)
 , _a_appearance(animation(this, &ScrollBar::step_appearance)) {
 	recountSize();
 
@@ -119,8 +120,9 @@ void ScrollBar::updateBar(bool force) {
 
 void ScrollBar::onHideTimer() {
 	_hideIn = -1;
-	a_bg.start(QColor(a_bg.current().red(), a_bg.current().green(), a_bg.current().blue(), 0));
-	a_bar.start(QColor(a_bar.current().red(), a_bar.current().green(), a_bar.current().blue(), 0));
+	a_fullOpacity.start(0.);
+	a_bgOver.restart();
+	a_barOver.restart();
 	_a_appearance.start();
 }
 
@@ -133,22 +135,27 @@ void ScrollBar::paintEvent(QPaintEvent *e) {
 		hide();
 		return;
 	}
-	if (!a_bg.current().alpha() && !a_bar.current().alpha()) return;
+	if (a_fullOpacity.current() == 0.) return;
+
 	QPainter p(this);
 
-	int32 deltal = _vertical ? _st->deltax : 0, deltar = _vertical ? _st->deltax : 0;
-	int32 deltat = _vertical ? 0 : _st->deltax, deltab = _vertical ? 0 : _st->deltax;
+	auto deltal = _vertical ? _st->deltax : 0, deltar = _vertical ? _st->deltax : 0;
+	auto deltat = _vertical ? 0 : _st->deltax, deltab = _vertical ? 0 : _st->deltax;
 	p.setPen(Qt::NoPen);
+	auto bg = anim::color(_st->bgColor, _st->bgOverColor, a_bgOver.current());
+	bg.setAlpha(anim::interpolate(0, bg.alpha(), a_fullOpacity.current()));
+	auto bar = anim::color(_st->barColor, _st->barOverColor, a_barOver.current());
+	bar.setAlpha(anim::interpolate(0, bar.alpha(), a_fullOpacity.current()));
 	if (_st->round) {
 		p.setRenderHint(QPainter::HighQualityAntialiasing, true);
-		p.setBrush(a_bg.current());
+		p.setBrush(bg);
 		p.drawRoundedRect(QRect(deltal, deltat, width() - deltal - deltar, height() - deltat - deltab), _st->round, _st->round);
-		p.setBrush(a_bar.current());
+		p.setBrush(bar);
 		p.drawRoundedRect(_bar, _st->round, _st->round);
 		p.setRenderHint(QPainter::HighQualityAntialiasing, false);
 	} else {
-		p.fillRect(QRect(deltal, deltat, width() - deltal - deltar, height() - deltat - deltab), a_bg.current());
-		p.fillRect(_bar, a_bar.current());
+		p.fillRect(QRect(deltal, deltat, width() - deltal - deltar, height() - deltat - deltab), bg);
+		p.fillRect(_bar, bar);
 	}
 }
 
@@ -156,19 +163,22 @@ void ScrollBar::step_appearance(float64 ms, bool timer) {
 	float64 dt = ms / _st->duration;
 	if (dt >= 1) {
 		_a_appearance.stop();
-		a_bg.finish();
-		a_bar.finish();
+		a_bgOver.finish();
+		a_barOver.finish();
+		a_fullOpacity.finish();
 	} else {
-		a_bg.update(dt, anim::linear);
-		a_bar.update(dt, anim::linear);
+		a_bgOver.update(dt, anim::linear);
+		a_barOver.update(dt, anim::linear);
+		a_fullOpacity.update(dt, anim::linear);
 	}
 	if (timer) update();
 }
 
 void ScrollBar::hideTimeout(int64 dt) {
 	if (_hideIn < 0) {
-		a_bg.start((_over ? _st->bgOverColor : _st->bgColor)->c);
-		a_bar.start((_overbar ? _st->barOverColor : _st->barColor)->c);
+		a_bgOver.start(_over ? 1. : 0.);
+		a_barOver.start(_over ? 1. : 0.);
+		a_fullOpacity.start(1.);
 		_a_appearance.start();
 	}
 	_hideIn = dt;
@@ -181,16 +191,18 @@ void ScrollBar::enterEvent(QEvent *e) {
 	_hideTimer.stop();
 	setMouseTracking(true);
 	_over = true;
-	a_bg.start(_st->bgOverColor->c);
-	a_bar.start(_st->barColor->c);
+	a_bgOver.start(1.);
+	a_barOver.start(1.);
+	a_fullOpacity.start(1.);
 	_a_appearance.start();
 }
 
 void ScrollBar::leaveEvent(QEvent *e) {
 	if (!_moving) {
 		setMouseTracking(false);
-		a_bg.start(_st->bgColor->c);
-		a_bar.start(_st->barColor->c);
+		a_bgOver.start(0.);
+		a_barOver.start(0.);
+		a_fullOpacity.start(1.);
 		_a_appearance.start();
 		if (_hideIn >= 0) {
 			_hideTimer.start(_hideIn);
@@ -206,8 +218,9 @@ void ScrollBar::mouseMoveEvent(QMouseEvent *e) {
 	if (_overbar != newOverBar) {
 		_overbar = newOverBar;
 		if (!_moving) {
-			a_bar.start((newOverBar ? _st->barOverColor : _st->barColor)->c);
-			a_bg.start(_st->bgOverColor->c);
+			a_barOver.start(newOverBar ? 1. : 0.);
+			a_bgOver.start(1.);
+			a_fullOpacity.start(1.);
 			_a_appearance.start();
 		}
 	}
@@ -236,8 +249,9 @@ void ScrollBar::mousePressEvent(QMouseEvent *e) {
 		_connected->setValue(_startFrom);
 		if (!_overbar) {
 			_overbar = true;
-			a_bar.start(_st->barOverColor->c);
-			a_bg.start(_st->bgOverColor->c);
+			a_barOver.start(1.);
+			a_bgOver.start(1.);
+			a_fullOpacity.start(1.);
 			_a_appearance.start();
 		}
 	}
@@ -252,13 +266,17 @@ void ScrollBar::mouseReleaseEvent(QMouseEvent *e) {
 		bool a = false;
 		if (!_overbar) {
 			if (!_over || _hideIn) {
-				a_bar.start(_st->barColor->c);
+				a_bgOver.restart();
+				a_barOver.start(0.);
+				a_fullOpacity.start(1.);
 				a = true;
 			}
 		}
 		if (!_over) {
 			if (_hideIn) {
-				a_bg.start(_st->bgColor->c);
+				a_barOver.restart();
+				a_bgOver.start(0.);
+				a_fullOpacity.start(1.);
 				a = true;
 			}
 			if (_hideIn >= 0) {
diff --git a/Telegram/SourceFiles/ui/scrollarea.h b/Telegram/SourceFiles/ui/scrollarea.h
index 4f4a7e37f..306b36562 100644
--- a/Telegram/SourceFiles/ui/scrollarea.h
+++ b/Telegram/SourceFiles/ui/scrollarea.h
@@ -96,7 +96,7 @@ private:
 	int64 _hideIn;
 	QTimer _hideTimer;
 
-	anim::cvalue a_bg, a_bar;
+	anim::fvalue a_bgOver, a_barOver, a_fullOpacity;
 	Animation _a_appearance;
 
 	QRect _bar;
diff --git a/Telegram/SourceFiles/ui/style/style_core_color.h b/Telegram/SourceFiles/ui/style/style_core_color.h
index f02373b9e..0c8fed354 100644
--- a/Telegram/SourceFiles/ui/style/style_core_color.h
+++ b/Telegram/SourceFiles/ui/style/style_core_color.h
@@ -103,27 +103,4 @@ inline bool operator!=(const Color &a, const Color &b) {
 }
 
 } // namespace internal
-
-inline QColor interpolate(QColor a, QColor b, float64 opacity_b) {
-	auto bOpacity = static_cast<int>(opacity_b * 255) + 1, aOpacity = (256 - bOpacity);
-	return {
-		(a.red() * aOpacity + b.red() * bOpacity) >> 8,
-		(a.green() * aOpacity + b.green() * bOpacity) >> 8,
-		(a.blue() * aOpacity + b.blue() * bOpacity) >> 8,
-		(a.alpha() * aOpacity + b.alpha() * bOpacity) >> 8
-	};
-}
-
-inline QColor interpolate(const style::internal::Color &a, QColor b, float64 opacity_b) {
-	return interpolate(a->c, b, opacity_b);
-}
-
-inline QColor interpolate(QColor a, const style::internal::Color &b, float64 opacity_b) {
-	return interpolate(a, b->c, opacity_b);
-}
-
-inline QColor interpolate(const style::internal::Color &a, const style::internal::Color &b, float64 opacity_b) {
-	return interpolate(a->c, b->c, opacity_b);
-}
-
 } // namespace style
diff --git a/Telegram/SourceFiles/ui/style/style_core_types.h b/Telegram/SourceFiles/ui/style/style_core_types.h
index 89194a264..950f23ebc 100644
--- a/Telegram/SourceFiles/ui/style/style_core_types.h
+++ b/Telegram/SourceFiles/ui/style/style_core_types.h
@@ -27,7 +27,6 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
 #include <QtGui/QCursor>
 #include <QtGui/QFont>
 
-#include "ui/animation.h"
 #include "ui/style/style_core_font.h"
 #include "ui/style/style_core_color.h"
 #include "ui/style/style_core_icon.h"
@@ -38,7 +37,6 @@ using string = QString;
 using rect = QRect;
 using point = QPoint;
 using size = QSize;
-using transition = anim::transition;
 using cursor = Qt::CursorShape;
 using align = Qt::Alignment;
 using margins = QMargins;
diff --git a/Telegram/SourceFiles/ui/widgets/media_slider.cpp b/Telegram/SourceFiles/ui/widgets/media_slider.cpp
index 743390f3c..c3a7000e6 100644
--- a/Telegram/SourceFiles/ui/widgets/media_slider.cpp
+++ b/Telegram/SourceFiles/ui/widgets/media_slider.cpp
@@ -62,21 +62,15 @@ void MediaSlider::paintEvent(QPaintEvent *e) {
 	auto length = _alwaysDisplayMarker ? (horizontal ? width() : height()) : markerLength;
 	auto mid = qRound(from + value * length);
 	auto end = from + length;
-	auto activeFg = disabled ? &_st.activeFgDisabled : (over == 1. ? &_st.activeFgOver : (over == 0. ? &_st.activeFg : nullptr));
-	auto inactiveFg = disabled ? &_st.inactiveFgDisabled : (over == 1. ? &_st.inactiveFgOver : (over == 0. ? &_st.inactiveFg : nullptr));
-	auto activeFgOver = activeFg ? QColor() : style::interpolate(_st.activeFg, _st.activeFgOver, over);
-	auto inactiveFgOver = inactiveFg ? QColor() : style::interpolate(_st.inactiveFg, _st.inactiveFgOver, over);
+	auto activeFg = disabled ? _st.activeFgDisabled : anim::brush(_st.activeFg, _st.activeFgOver, over);
+	auto inactiveFg = disabled ? _st.inactiveFgDisabled : anim::brush(_st.inactiveFg, _st.inactiveFgOver, over);
 	if (mid > from) {
 		auto fromClipRect = horizontal ? QRect(0, 0, mid, height()) : QRect(0, 0, width(), mid);
 		auto fromRect = horizontal
 			? QRect(from, (height() - _st.width) / 2, mid + radius - from, _st.width)
 			: QRect((width() - _st.width) / 2, from, _st.width, mid + radius - from);
 		p.setClipRect(fromClipRect);
-		if (auto brush = (horizontal ? activeFg : inactiveFg)) {
-			p.setBrush(*brush);
-		} else {
-			p.setBrush(horizontal ? activeFgOver : inactiveFgOver);
-		}
+		p.setBrush(horizontal ? activeFg : inactiveFg);
 		p.drawRoundedRect(fromRect, radius, radius);
 	}
 	if (end > mid) {
@@ -85,11 +79,7 @@ void MediaSlider::paintEvent(QPaintEvent *e) {
 			? QRect(mid - radius, (height() - _st.width) / 2, end - (mid - radius), _st.width)
 			: QRect((width() - _st.width) / 2, mid - radius, _st.width, end - (mid - radius));
 		p.setClipRect(endClipRect);
-		if (auto brush = (horizontal ? inactiveFg : activeFg)) {
-			p.setBrush(*brush);
-		} else {
-			p.setBrush(horizontal ? inactiveFgOver : activeFgOver);
-		}
+		p.setBrush(horizontal ? inactiveFg : activeFg);
 		p.drawRoundedRect(endRect, radius, radius);
 	}
 	auto markerSizeRatio = disabled ? 0. : (_alwaysDisplayMarker ? 1. : over);
@@ -102,11 +92,7 @@ void MediaSlider::paintEvent(QPaintEvent *e) {
 		auto remove = static_cast<int>(((1. - markerSizeRatio) * size) / 2.);
 		if (remove * 2 < size) {
 			p.setClipRect(rect());
-			if (activeFg) {
-				p.setBrush(*activeFg);
-			} else {
-				p.setBrush(activeFgOver);
-			}
+			p.setBrush(activeFg);
 			p.drawEllipse(seekButton.marginsRemoved(QMargins(remove, remove, remove, remove)));
 		}
 	}
diff --git a/Telegram/SourceFiles/ui/widgets/multi_select.cpp b/Telegram/SourceFiles/ui/widgets/multi_select.cpp
index a55cd9ea6..d4c7c0364 100644
--- a/Telegram/SourceFiles/ui/widgets/multi_select.cpp
+++ b/Telegram/SourceFiles/ui/widgets/multi_select.cpp
@@ -349,7 +349,7 @@ void MultiSelect::Inner::Item::setVisibleAnimated(bool visible) {
 	prepareCache();
 	auto from = visible ? 0. : 1.;
 	auto to = visible ? 1. : 0.;
-	auto transition = visible ? anim::bumpy<1125, 1000> : anim::linear;
+	auto transition = visible ? anim::bumpy(1.125) : anim::linear;
 	_visibility.start(_updateCallback, from, to, _st.duration, transition);
 }
 
diff --git a/Telegram/SourceFiles/window/notifications_manager_default.cpp b/Telegram/SourceFiles/window/notifications_manager_default.cpp
index c12e34f7d..ca8a35195 100644
--- a/Telegram/SourceFiles/window/notifications_manager_default.cpp
+++ b/Telegram/SourceFiles/window/notifications_manager_default.cpp
@@ -400,7 +400,7 @@ void Widget::step_shift(float64 ms, bool timer) {
 }
 
 void Widget::hideSlow() {
-	hideAnimated(st::notifySlowHide, st::notifySlowHideFunc);
+	hideAnimated(st::notifySlowHide, anim::easeInCirc);
 }
 
 void Widget::hideFast() {
diff --git a/Telegram/SourceFiles/window/slide_animation.cpp b/Telegram/SourceFiles/window/slide_animation.cpp
index 5bab75b93..b6b2286ac 100644
--- a/Telegram/SourceFiles/window/slide_animation.cpp
+++ b/Telegram/SourceFiles/window/slide_animation.cpp
@@ -99,9 +99,9 @@ void SlideAnimation::step(float64 ms, bool timer) {
 		}
 	}
 
-	a_coordUnder.update(dt, st::slideFunction);
-	a_coordOver.update(dt, st::slideFunction);
-	a_progress.update(dt, st::slideFunction);
+	a_coordUnder.update(dt, transition());
+	a_coordOver.update(dt, transition());
+	a_progress.update(dt, transition());
 	if (timer && _repaintCallback) {
 		_repaintCallback();
 	}
diff --git a/Telegram/SourceFiles/window/slide_animation.h b/Telegram/SourceFiles/window/slide_animation.h
index 53a24c3b6..ead4c85c2 100644
--- a/Telegram/SourceFiles/window/slide_animation.h
+++ b/Telegram/SourceFiles/window/slide_animation.h
@@ -45,6 +45,10 @@ public:
 
 	void start();
 
+	static const anim::transition &transition() {
+		return anim::easeOutCirc;
+	}
+
 private:
 	void step(float64 ms, bool timer);
 
diff --git a/Telegram/SourceFiles/window/window.style b/Telegram/SourceFiles/window/window.style
index 4c130b571..0253aa14d 100644
--- a/Telegram/SourceFiles/window/window.style
+++ b/Telegram/SourceFiles/window/window.style
@@ -52,7 +52,6 @@ notifyClose: IconButton {
 notifyItemTop: 12px;
 notifyTextLeft: 12px;
 notifyTextTop: 7px;
-notifySlowHideFunc: transition(easeInCirc);
 notifyWaitLongHide: 3000;
 notifyFastAnim: 150;
 notifyWidth: 320px;