39 files changed, 444 insertions, 418 deletions
diff --git a/data/deftheme/Aria-1.0.0/pixmapGlobalTransparencyBackground.png b/data/deftheme/Aria-1.0.0/pixmapGlobalTransparencyBackground.png
deleted file mode 100644
index 8e31f1222..000000000
--- a/data/deftheme/Aria-1.0.0/pixmapGlobalTransparencyBackground.png
+++ /dev/null
diff --git a/data/deftheme/Aria-1.0.0/themedata.kvc b/data/deftheme/Aria-1.0.0/themedata.kvc
deleted file mode 100644
index ee2f85072..000000000
--- a/data/deftheme/Aria-1.0.0/themedata.kvc
+++ /dev/null
@@ -1,277 +0,0 @@
-# KVIrc configuration file
-[ThemeData]
-msgtypeLink=0,2,100,1,0
-msgtypeServerPing=36,15,100,1,0
-msgtypeUnban=68,5,100,1,1
-msgtypeHalfOp=174,3,100,1,1
-msgtypeIdent=171,2,100,1,3
-msgtypeQueryTrace=181,15,100,1,1
-msgtypeWallops=139,5,100,1,3
-msgtypeMeDeOp=191,3,100,1,5
-msgtypeMeBan=195,5,100,1,5
-mirccolor2=0,0,140
-mirccolor14=80,80,80
-iccolor4=255,255,255
-boolBoldedNicks=false
-boolShowTreeTaskbarHeader=false
-stringExtendedPrivmsgPrefix=[
-colorCaptionTextActive2=0,0,0
-colorGlobalTransparencyFade=255,255,255
-uintUserListPixmapAlign=1
-uintToolBarAppletPixmapAlign=0
-msgtypeChannelPrivateMessage=46,1,100,1,3
-msgtypeCtcpRequestReplied=52,5,100,1,2
-msgtypeKey=65,15,100,1,2
-msgtypeBroadcastPrivmsg=183,1,100,1,3
-mirccolor3=0,100,0
-mirccolor15=170,170,170
-iccolor5=0,150,190
-boolUseTreeWindowListTaskBar=true
-boolScaleAvatars=true
-boolDisableAvatars=false
-colorCaptionTextActive=255,255,255
-colorInputControl=200,100,0
-colorUserListViewOwnForeground=126,74,131
-uintUserListViewGridType=3
-uintTimeStampBackground=100
-msgtypeEcho=0,1,100,1,1
-msgtypeHostLookup=13,2,100,1,1
-msgtypeSystemError=24,4,100,1,4
-msgtypeRaw=25,2,100,1,1
-msgtypeSystemWarning=26,4,100,1,3
-msgtypeSystemMessage=27,2,100,1,1
-msgtypeUnhandledReply=28,2,100,1,1
-msgtypeJoin=39,14,100,1,2
-msgtypeVoice=35,3,100,1,1
-msgtypeMeInviteUnexcept=200,3,100,1,5
-msgtypeUserOp=174,3,100,1,1
-mirccolor4=230,0,0
-iccolor6=0,130,0
-pixmapMdiBackground=
-pixmapUserListViewBackground=
-colorTaskBarMinimizedText=60,60,60
-colorLabelBackground=255,255,255
-colorIrcToolBarAppletBackground=255,255,255
-colorIrcToolBarAppletForegroundHighContrastActive1=0,0,0
-colorTreeTaskBarProgress=150,150,150
-msgtypeOwnPrivateMessage=45,1,100,1,3
-msgtypeBanUnexcept=70,15,100,1,1
-msgtypeSpam=120,14,100,1,3
-msgtypeChanServ=165,5,100,1,2
-msgtypeBroadcastNotice=184,5,100,1,3
-msgtypeMeOp=189,3,100,1,5
-msgtypeMeDeHalfOp=194,3,100,1,5
-msgtypeMeBanExcept=197,3,100,1,5
-msgtypeMeChanUnAdmin=245,3,100,1,1
-msgtypeMeChanUnOwner=263,3,100,1,2
-mirccolor5=150,0,0
-iccolor7=150,0,170
-boolClassicTaskBarSetMaximumButtonWidth=true
-boolDrawGenderIcons=true
-colorTaskBarHighlight1Text=0,16,144
-colorUserListViewOpForeground=200,0,0
-colorIrcToolBarAppletForegroundHighContrastActive2=0,60,0
-colorTreeTaskBarBackground=255,255,255
-colorTreeTaskBarActiveForeground=0,0,0
-colorUserListViewGrid=216,216,216
-msgtypeCtcpRequestIgnored=53,5,100,1,1
-msgtypeAction=56,13,100,1,3
-msgtypeQuit=58,14,100,1,2
-msgtypeCreationTime=93,15,100,1,1
-msgtypeOwnPrivmsgCrypted=100,1,100,1,3
-msgtypeChannelNoticeCrypted=154,5,100,1,3
-msgtypeAway=170,3,100,1,4
-msgtypeInvite=176,7,100,1,4
-mirccolor6=80,0,80
-pixmapGlobalTransparencyBackground=pixmapGlobalTransparencyBackground.png
-boolObtainGlobalBackgroundFromKde=false
-boolUseGlobalApplicationFont=false
-boolDisableUserListLabel=false
-colorTaskBarHighlight2Text=32,0,255
-colorInputCursor=72,216,72
-colorUserListViewNormalForeground=0,0,0
-colorIrcToolBarAppletForegroundLowContrast=180,180,180
-uintGlobalTransparencyParentFadeFactor=10
-fontUserListView=Sans%20Serif,10,5,50,i
-msgtypeNicknameProblem=87,3,100,1,1
-msgtypeWhoisServer=91,2,100,1,1
-msgtypeNotifyOffLine=95,2,100,1,1
-msgtypeKick=110,4,100,1,2
-msgtypeMeDeVoice=192,3,100,1,5
-msgtypeMeDeUserOp=194,3,100,1,1
-msgtypeVerbose=259,15,100,1,0
-msgtypeServerError=272,14,100,1,1
-mirccolor7=255,90,0
-boolStripMircColorsInUserMessages=false
-colorUserListViewSelectionBackground=194,194,194
-colorTaskBarHighlight3Text=128,20,255
-msgtypeMotd=30,1,100,1,0
-msgtypeWho=75,2,100,1,1
-msgtypeChanPrivmsgCrypted=101,1,100,1,3
-msgtypeIcq=122,5,100,1,1
-msgtypeChannelNotice=153,5,100,1,3
-msgtypeMeHalfOp=193,3,100,1,5
-msgtypeMeUnban=196,5,100,1,5
-mirccolor8=255,255,0
-boolIrcViewShowImages=true
-boolUseExtendedPrivmsgView=false
-stringIconThemeSubdir=Aria-1.0.0
-colorInputSelectionForeground=0,0,0
-colorUserListViewHalfOpForeground=119,0,178
-colorTaskBarHighlight4Text=220,0,255
-uintGlobalTransparencyChildFadeFactor=30
-uintIrcViewPixmapAlign=34
-msgtypeAvatarChange=57,15,100,1,2
-msgtypeSplit=59,15,100,1,2
-msgtypeInviteExcept=71,15,100,1,1
-msgtypeWhoisOther=92,2,100,1,1
-msgtypeIrc=105,3,100,1,0
-msgtypeGenericVerbose=137,14,100,1,1
-msgtypeGenericWarning=132,5,100,1,0
-msgtypeGenericError=135,4,100,1,1
-msgtypeGenericCritical=134,4,100,1,4
-mirccolor9=0,255,0
-pixmapIrcViewBackground=
-boolIrcViewWrapMargin=true
-colorTaskBarHighlight5Text=255,0,0
-msgtypeSocketMessage=21,14,100,1,1
-msgtypeSocketWarning=22,5,100,1,3
-msgtypeSocketError=23,4,100,1,4
-msgtypeQueryPrivateMessage=48,1,100,1,4
-msgtypeCtcpReply=51,5,100,1,2
-msgtypeNick=61,2,100,1,1
-msgtypeMode=64,15,100,1,1
-msgtypeDccMsg=78,5,100,1,2
-msgtypeServerNotice=141,5,100,1,1
-msgtypeMultimedia=177,5,100,1,2
-msgtypeMeVoice=190,3,100,1,5
-msgtypeChanAdmin=242,3,100,1,1
-msgtypeMeUserOp=193,3,100,1,1
-msgtypeChanOwner=260,3,100,1,2
-msgtypeBitTorrent=177,1,100,1,2
-boolShowUserAndHostInPrivmsgView=false
-boolShowUserChannelIcons=true
-stringExtendedPrivmsgPostfix=]%20
-colorMdiBackground=0,0,0
-colorTaskBarNormalText=0,0,0
-colorUserListViewBackground=255,255,255
-colorUserListViewVoiceForeground=0,0,200
-colorUserListViewUserOpForeground=0,127,178
-msgtypeSelection=0,0,15,1,1
-msgtypePart=40,14,100,1,2
-msgtypeQueryPrivmsgCrypted=102,1,100,1,3
-msgtypeMeBanUnExcept=198,3,100,1,5
-boolIrcViewUrlHighlighting=true
-colorMdiCaptionInactive=180,180,180
-colorInputForeground=0,0,0
-uintInputPixmapAlign=32
-fontIrcView=Sans%20Serif,10,5,50
-fontTaskbar=Sans%20Serif,10,5,50
-msgtypeCtcpRequestUnknown=55,5,100,1,2
-msgtypeChanMode=73,15,100,1,1
-msgtypeWhoisUser=88,2,100,1,1
-msgtypeCtcpReplyUnknown=162,5,100,1,1
-msgtypeIgnore=203,15,100,1,1
-msgtypeStats=205,1,100,1,1
-msgtypeSSL=229,2,100,1,0
-msgtypeGenericSuccess=136,14,100,1,3
-msgtypeGenericStatus=133,14,100,1,1
-pixmapInputBackground=pixmapInputBackground.png
-boolColorNicks=true
-boolUseDifferentColorForOwnNick=true
-colorTreeTaskBarActiveBackground=200,200,200
-colorUserListViewAwayForeground=143,143,143
-msgtypeUrl=0,2,100,1,1
-msgtypeTopic=42,3,100,1,1
-msgtypeDeop=62,3,100,1,1
-msgtypeLimit=66,15,100,1,1
-msgtypeBan=67,5,100,1,1
-msgtypeWhoisIdle=90,2,100,1,1
-msgtypeQueryNoticeCrypted=156,5,100,1,3
-msgtypeMeKick=188,4,100,1,5
-boolDisablePopupIcons=false
-colorCaptionTextInactive2=30,30,30
-colorTreeTaskBarHighlight1Foreground=165,165,165
-uintTimeStampForeground=14
-msgtypeHighlight=0,7,100,1,5
-msgtypeParserError=11,4,100,1,1
-msgtypeParserWarning=12,5,100,1,0
-msgtypeJoinError=182,5,100,1,4
-msgtypeHelp=49,3,100,1,1
-msgtypeTextEncoding=236,1,100,1,0
-boolUserListViewDrawGrid=false
-colorCaptionTextInactive=0,0,0
-colorLabelForeground=0,0,0
-colorTreeTaskBarHighlight2Foreground=167,222,163
-colorIrcViewMarkLine=40,40,40
-fontInput=Sans%20Serif,10,5,50
-fontApplication=Sans%20Serif,10,5,50
-msgtypeConnection=14,5,100,1,1
-msgtypeUnrecognized=41,5,100,1,1
-msgtypeCtcpRequestFlood=54,5,100,1,1
-msgtypeInviteUnexcept=72,15,100,1,1
-msgtypeNotifyOnLine=94,2,100,1,1
-msgtypeLinks=112,2,100,1,1
-msgtypeQueryNotice=155,5,100,1,3
-msgtypeMeInviteExcept=199,3,100,1,5
-msgtypeSearch=206,0,1,1,1
-mirccolor10=0,150,180
-iccolor0=250,250,0
-pixmapLabelBackground=
-pixmapIrcToolBarAppletBackground=
-boolShowUserChannelState=false
-boolUseUserListColorsAsNickColors=false
-colorIrcViewBackground=255,255,255
-colorInputSelectionBackground=198,198,198
-colorIrcToolBarAppletForegroundHighContrastInactive1=40,40,40
-colorTreeTaskBarForeground=0,0,0
-colorTreeTaskBarHighlight3Foreground=128,0,255
-uintTreeTaskBarPixmapAlign=0
-msgtypeOp=34,3,100,1,2
-msgtypeBanExcept=69,15,100,1,1
-msgtypeDccError=79,5,100,1,1
-msgtypeDccChatMsgCrypted=104,1,100,1,3
-msgtypeNickServ=164,5,100,1,2
-msgtypeList=173,1,100,1,1
-msgtypeHalfDeOp=175,3,100,1,2
-msgtypeChanUnAdmin=243,3,100,1,1
-msgtypeMeChanAdmin=244,3,100,1,1
-msgtypeChanUnOwner=261,3,100,1,2
-msgtypeMeChanOwner=262,3,100,1,2
-mirccolor11=170,170,255
-iccolor1=0,0,0
-pixmapTreeTaskBarBackground=
-boolUseFlatClassicTaskbarButtons=true
-colorIrcToolBarAppletForegroundMidContrast=110,110,110
-colorIrcToolBarAppletForegroundHighContrastInactive2=40,40,40
-colorTreeTaskBarHighlight4Foreground=220,0,255
-colorUserListViewChanAdminForeground=83,54,5
-colorUserListViewChanOwnerForeground=81,87,111
-uintClassicTaskBarMaximumButtonWidth=100
-msgtypeServerInfo=29,1,100,1,1
-mirccolor0=255,255,255
-mirccolor12=15,15,255
-iccolor2=0,0,200
-boolUseGlobalPseudoTransparency=true
-boolUseTaskBarActivityMeter=false
-boolDrawEmoticons=true
-boolUseSpecialColorForTimestamp=true
-colorTaskBarProgressBar=180,180,180
-colorMdiCaptionActive=113,125,190
-colorInputBackgroundColor=255,255,255
-colorUserListViewSelectionForeground=0,0,0
-colorTreeTaskBarHighlight5Foreground=255,0,0
-fontLabel=Sans%20Serif,10,5,50
-fontIrcToolBarApplet=Verdana,10,5,50,i
-msgtypeQuitSplit=60,14,100,1,2
-msgtypeDevoice=63,3,100,1,1
-msgtypeDccRequest=77,5,100,1,3
-msgtypeWhoisChannels=89,2,100,1,1
-msgtypeDccChatMsg=103,1,100,1,3
-msgtypeIcqMessage=128,5,100,1,1
-msgtypeIcqMessageSent=129,5,100,1,1
-msgtypeUserDeOp=175,3,100,1,1
-mirccolor1=0,0,0
-mirccolor13=200,0,200
-iccolor3=200,0,0
-msgtypeMemoServ=316,5,100,1,2
diff --git a/data/deftheme/Aria-1.0.0/CMakeLists.txt b/data/deftheme/Aria-2.0.0/CMakeLists.txt
index 51914d9b8..6d65879c4 100644
--- a/data/deftheme/Aria-1.0.0/CMakeLists.txt
+++ b/data/deftheme/Aria-2.0.0/CMakeLists.txt
@@ -1,4 +1,4 @@
-# CMakeLists for data/deftheme/Aria-1.0.0
+# CMakeLists for data/deftheme/Aria-2.0.0
 
 file(GLOB images "${CMAKE_CURRENT_SOURCE_DIR}/*.png")
 file(GLOB themefiles "${CMAKE_CURRENT_SOURCE_DIR}/*.kvc")
@@ -6,11 +6,11 @@ list(APPEND files ${images} ${themefiles})
 
 if(UNIX)
 	if(APPLE)
-		install(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/themes/Aria-1.0.0/)
+		install(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/themes/Aria-2.0.0/)
 	else()
-		# Assume linux
-		install(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/themes/Aria-1.0.0/)
+		# Assume Linux
+		install(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/themes/Aria-2.0.0/)
 	endif()
 elseif(WIN32)
-	install(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/themes/Aria-1.0.0/)
+	install(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/themes/Aria-2.0.0/)
 endif()
diff --git a/data/deftheme/Aria-1.0.0/kvi_bigicon_actions.png b/data/deftheme/Aria-2.0.0/old/kvi_bigicon_actions.png
index c230d76ec..c230d76ec 100644
--- a/data/deftheme/Aria-1.0.0/kvi_bigicon_actions.png
+++ b/data/deftheme/Aria-2.0.0/old/kvi_bigicon_actions.png
diff --git a/data/deftheme/Aria-1.0.0/kvi_bigicon_codetester.png b/data/deftheme/Aria-2.0.0/old/kvi_bigicon_codetester.png
index 0d9b74e2e..0d9b74e2e 100644
--- a/data/deftheme/Aria-1.0.0/kvi_bigicon_codetester.png
+++ b/data/deftheme/Aria-2.0.0/old/kvi_bigicon_codetester.png
diff --git a/data/deftheme/Aria-1.0.0/kvi_bigicon_folder.png b/data/deftheme/Aria-2.0.0/old/kvi_bigicon_folder.png
index cbfd6e175..cbfd6e175 100644
--- a/data/deftheme/Aria-1.0.0/kvi_bigicon_folder.png
+++ b/data/deftheme/Aria-2.0.0/old/kvi_bigicon_folder.png
diff --git a/data/deftheme/Aria-1.0.0/kvi_bigicon_help.png b/data/deftheme/Aria-2.0.0/old/kvi_bigicon_help.png
index 788bbcd1c..788bbcd1c 100644
--- a/data/deftheme/Aria-1.0.0/kvi_bigicon_help.png
+++ b/data/deftheme/Aria-2.0.0/old/kvi_bigicon_help.png
diff --git a/data/deftheme/Aria-1.0.0/kvi_bigicon_identity.png b/data/deftheme/Aria-2.0.0/old/kvi_bigicon_identity.png
index 01b9aa772..01b9aa772 100644
--- a/data/deftheme/Aria-1.0.0/kvi_bigicon_identity.png
+++ b/data/deftheme/Aria-2.0.0/old/kvi_bigicon_identity.png
diff --git a/data/deftheme/Aria-1.0.0/kvi_bigicon_keyboard.png b/data/deftheme/Aria-2.0.0/old/kvi_bigicon_keyboard.png
index e34fef20b..e34fef20b 100644
--- a/data/deftheme/Aria-1.0.0/kvi_bigicon_keyboard.png
+++ b/data/deftheme/Aria-2.0.0/old/kvi_bigicon_keyboard.png
diff --git a/data/deftheme/Aria-1.0.0/kvi_bigicon_minimizeallwindows.png b/data/deftheme/Aria-2.0.0/old/kvi_bigicon_minimizeallwindows.png
index 0bfb94f92..0bfb94f92 100644
--- a/data/deftheme/Aria-1.0.0/kvi_bigicon_minimizeallwindows.png
+++ b/data/deftheme/Aria-2.0.0/old/kvi_bigicon_minimizeallwindows.png
diff --git a/data/deftheme/Aria-1.0.0/kvi_bigicon_newirccontext.png b/data/deftheme/Aria-2.0.0/old/kvi_bigicon_newirccontext.png
index 506071963..506071963 100644
--- a/data/deftheme/Aria-1.0.0/kvi_bigicon_newirccontext.png
+++ b/data/deftheme/Aria-2.0.0/old/kvi_bigicon_newirccontext.png
diff --git a/data/deftheme/Aria-1.0.0/kvi_bigicon_open.png b/data/deftheme/Aria-2.0.0/old/kvi_bigicon_open.png
index e26ac93b5..e26ac93b5 100644
--- a/data/deftheme/Aria-1.0.0/kvi_bigicon_open.png
+++ b/data/deftheme/Aria-2.0.0/old/kvi_bigicon_open.png
diff --git a/data/deftheme/Aria-1.0.0/kvi_bigicon_regusers.png b/data/deftheme/Aria-2.0.0/old/kvi_bigicon_regusers.png
index 951899196..951899196 100644
--- a/data/deftheme/Aria-1.0.0/kvi_bigicon_regusers.png
+++ b/data/deftheme/Aria-2.0.0/old/kvi_bigicon_regusers.png
diff --git a/data/deftheme/Aria-1.0.0/kvi_bigicon_save.png b/data/deftheme/Aria-2.0.0/old/kvi_bigicon_save.png
index 019142d13..019142d13 100644
--- a/data/deftheme/Aria-1.0.0/kvi_bigicon_save.png
+++ b/data/deftheme/Aria-2.0.0/old/kvi_bigicon_save.png
diff --git a/data/deftheme/Aria-1.0.0/kvi_bigicon_screenshot.png b/data/deftheme/Aria-2.0.0/old/kvi_bigicon_screenshot.png
index 40a202fa5..40a202fa5 100644
--- a/data/deftheme/Aria-1.0.0/kvi_bigicon_screenshot.png
+++ b/data/deftheme/Aria-2.0.0/old/kvi_bigicon_screenshot.png
diff --git a/data/deftheme/Aria-1.0.0/kvi_bigicon_settings.png b/data/deftheme/Aria-2.0.0/old/kvi_bigicon_settings.png
index 75da9b3b3..75da9b3b3 100644
--- a/data/deftheme/Aria-1.0.0/kvi_bigicon_settings.png
+++ b/data/deftheme/Aria-2.0.0/old/kvi_bigicon_settings.png
diff --git a/data/deftheme/Aria-1.0.0/kvi_bigicon_theme.png b/data/deftheme/Aria-2.0.0/old/kvi_bigicon_theme.png
index a369ee68e..a369ee68e 100644
--- a/data/deftheme/Aria-1.0.0/kvi_bigicon_theme.png
+++ b/data/deftheme/Aria-2.0.0/old/kvi_bigicon_theme.png
diff --git a/data/deftheme/Aria-1.0.0/kvi_bigicon_themeoptions.png b/data/deftheme/Aria-2.0.0/old/kvi_bigicon_themeoptions.png
index 367886474..367886474 100644
--- a/data/deftheme/Aria-1.0.0/kvi_bigicon_themeoptions.png
+++ b/data/deftheme/Aria-2.0.0/old/kvi_bigicon_themeoptions.png
diff --git a/data/deftheme/Aria-1.0.0/kvi_bigicon_tilewindows.png b/data/deftheme/Aria-2.0.0/old/kvi_bigicon_tilewindows.png
index d7a5d061f..d7a5d061f 100644
--- a/data/deftheme/Aria-1.0.0/kvi_bigicon_tilewindows.png
+++ b/data/deftheme/Aria-2.0.0/old/kvi_bigicon_tilewindows.png
diff --git a/data/deftheme/Aria-1.0.0/kvi_bigicon_tools.png b/data/deftheme/Aria-2.0.0/old/kvi_bigicon_tools.png
index 20da2e3fd..20da2e3fd 100644
--- a/data/deftheme/Aria-1.0.0/kvi_bigicon_tools.png
+++ b/data/deftheme/Aria-2.0.0/old/kvi_bigicon_tools.png
diff --git a/data/deftheme/Aria-1.0.0/kvi_bigicon_trashcan.png b/data/deftheme/Aria-2.0.0/old/kvi_bigicon_trashcan.png
index 403a12f9b..403a12f9b 100644
--- a/data/deftheme/Aria-1.0.0/kvi_bigicon_trashcan.png
+++ b/data/deftheme/Aria-2.0.0/old/kvi_bigicon_trashcan.png
diff --git a/data/deftheme/Aria-2.0.0/pixmapGlobalTransparencyBackground.png b/data/deftheme/Aria-2.0.0/pixmapGlobalTransparencyBackground.png
new file mode 100644
index 000000000..01549e71f
--- /dev/null
+++ b/data/deftheme/Aria-2.0.0/pixmapGlobalTransparencyBackground.png
diff --git a/data/deftheme/Aria-1.0.0/pixmapInputBackground.png b/data/deftheme/Aria-2.0.0/pixmapInputBackground.png
index 1d629ed0b..1d629ed0b 100644
--- a/data/deftheme/Aria-1.0.0/pixmapInputBackground.png
+++ b/data/deftheme/Aria-2.0.0/pixmapInputBackground.png
diff --git a/data/deftheme/Aria-2.0.0/screenshot.png b/data/deftheme/Aria-2.0.0/screenshot.png
new file mode 100644
index 000000000..83bf1b118
--- /dev/null
+++ b/data/deftheme/Aria-2.0.0/screenshot.png
diff --git a/data/deftheme/Aria-2.0.0/screenshot_medium.png b/data/deftheme/Aria-2.0.0/screenshot_medium.png
new file mode 100644
index 000000000..83bf1b118
--- /dev/null
+++ b/data/deftheme/Aria-2.0.0/screenshot_medium.png
diff --git a/data/deftheme/Aria-2.0.0/screenshot_small.png b/data/deftheme/Aria-2.0.0/screenshot_small.png
new file mode 100644
index 000000000..83bf1b118
--- /dev/null
+++ b/data/deftheme/Aria-2.0.0/screenshot_small.png
diff --git a/data/deftheme/Aria-2.0.0/themedata.kvc b/data/deftheme/Aria-2.0.0/themedata.kvc
new file mode 100644
index 000000000..b94fdac4b
--- /dev/null
+++ b/data/deftheme/Aria-2.0.0/themedata.kvc
@@ -0,0 +1,297 @@
+# KVIrc configuration file
+[ThemeData]
+boolShowAvatarsInUserlist=true
+boolShowUserListStatisticLabel=true
+fontWindowList=Courier%2010%20Pitch,10,5,75,b
+msgtypeLink=185,12,100,1,0
+msgtypeServerPing=36,14,100,1,0
+msgtypeUnban=68,5,100,1,1
+msgtypeHalfOp=174,3,100,1,1
+msgtypeIdent=171,2,100,1,3
+msgtypeQueryTrace=181,14,100,1,1
+msgtypeWallops=139,5,100,1,3
+msgtypeMeDeOp=191,3,100,1,5
+msgtypeMeBan=195,5,100,1,5
+mirccolor2=57,57,140,255
+mirccolor14=80,80,80,255
+iccolor4=255,255,255,255
+boolBoldedNicks=true
+stringExtendedPrivmsgPrefix=[
+colorGlobalTransparencyFade=255,255,255,255
+colorTreeWindowListActiveBackground=125,168,255,255
+uintUserListPixmapAlign=1
+uintToolBarAppletPixmapAlign=0
+uintNotifierInactiveTransparency=80
+uintToolBarButtonStyle=0
+msgtypeChannelPrivateMessage=46,1,100,1,3
+msgtypeCtcpRequestReplied=52,5,100,1,2
+msgtypeKey=65,14,100,1,2
+msgtypeBroadcastPrivmsg=183,1,100,1,3
+mirccolor3=0,100,0,255
+mirccolor15=170,170,170,255
+iccolor5=0,150,190,255
+boolScaleAvatars=true
+colorUserListViewOwnForeground=180,53,180,255
+colorInputControl=200,100,0,255
+colorTreeWindowListHighlight1Foreground=0,122,147,255
+uintUserListViewGridType=3
+uintTimeStampBackground=100
+uintUserIrcViewOwnForeground=4
+msgtypeEcho=0,1,100,1,1
+msgtypeHostLookup=13,2,100,1,1
+msgtypeSystemError=24,4,100,1,4
+msgtypeRaw=25,2,100,1,1
+msgtypeSystemWarning=26,4,100,1,3
+msgtypeSystemMessage=27,2,100,1,1
+msgtypeUnhandledReply=28,2,100,1,1
+msgtypeJoin=39,14,100,1,2
+msgtypeVoice=35,3,100,1,1
+msgtypeMeInviteUnexcept=200,3,100,1,5
+msgtypeUserOp=174,3,100,1,1
+mirccolor4=214,0,0,255
+iccolor6=0,130,0,255
+pixmapMdiBackground=
+pixmapUserListViewBackground=
+boolUseCompositingForTransparency=false
+colorLabelBackground=255,255,255,255
+colorIrcToolBarAppletBackground=255,255,255,255
+colorIrcToolBarAppletForegroundHighContrastActive1=0,0,0,255
+colorTreeWindowListHighlight2Foreground=57,57,140,255
+msgtypeOwnPrivateMessage=45,1,100,1,3
+msgtypeBanUnexcept=70,14,100,1,1
+msgtypeSpam=120,14,100,1,3
+msgtypeChanServ=165,5,100,1,2
+msgtypeBroadcastNotice=184,5,100,1,3
+msgtypeMeOp=189,3,100,1,5
+msgtypeMeDeHalfOp=194,3,100,1,5
+msgtypeMeBanExcept=197,3,100,1,5
+msgtypeMeChanUnAdmin=245,3,100,1,1
+msgtypeMeChanUnOwner=263,3,100,1,2
+mirccolor5=173,0,0,255
+iccolor7=150,0,170,255
+boolDrawGenderIcons=true
+colorUserListViewOpForeground=173,0,0,255
+colorIrcToolBarAppletForegroundHighContrastActive2=0,100,0,255
+colorTreeWindowListForeground=0,0,0,255
+colorTreeWindowListHighlight3Foreground=95,0,95,255
+colorUserListViewGrid=216,216,216,255
+uintGlobalWindowOpacityPercent=100
+uintTreeWindowListPixmapAlign=0
+msgtypeCtcpRequestIgnored=53,5,100,1,1
+msgtypeAction=56,2,100,1,3
+msgtypeQuit=58,13,100,1,2
+msgtypeCreationTime=93,14,100,1,1
+msgtypeOwnPrivmsgCrypted=100,1,100,1,3
+msgtypeChannelNoticeCrypted=154,5,100,1,3
+msgtypeAway=170,3,100,1,4
+msgtypeInvite=176,7,100,1,4
+mirccolor6=95,0,95,255
+pixmapTreeWindowListBackground=
+pixmapGlobalTransparencyBackground=pixmapGlobalTransparencyBackground.png
+boolUseGlobalApplicationFont=false
+boolUseFlatClassicWindowListButtons=true
+colorInputCursor=37,127,37,255
+colorUserListViewNormalForeground=0,0,0,255
+colorIrcToolBarAppletForegroundLowContrast=180,180,180,255
+colorTreeWindowListHighlight4Foreground=66,66,225,255
+uintGlobalTransparencyParentFadeFactor=10
+uintClassicWindowListMaximumButtonWidth=100
+fontUserListView=Courier%2010%20Pitch,10,5,75,b
+msgtypeNicknameProblem=87,3,100,1,1
+msgtypeWhoisServer=91,2,100,1,1
+msgtypeNotifyOffLine=95,2,100,1,1
+msgtypeKick=110,4,100,1,2
+msgtypeMeDeVoice=192,3,100,1,5
+msgtypeMeDeUserOp=194,3,100,1,1
+msgtypeVerbose=259,14,100,1,0
+msgtypeServerError=272,0,4,1,1
+mirccolor7=230,84,31,255
+boolUseTreeWindowList=true
+boolUseWindowListActivityMeter=true
+boolStripMircColorsInUserMessages=false
+colorWindowListProgressBar=80,80,80,255
+colorUserListViewSelectionBackground=125,168,255,255
+colorTreeWindowListHighlight5Foreground=173,0,0,255
+msgtypeMotd=30,1,100,1,0
+msgtypeWho=75,2,100,1,1
+msgtypeChanPrivmsgCrypted=101,1,100,1,3
+msgtypeIcq=122,5,100,1,1
+msgtypeChannelNotice=153,5,100,1,3
+msgtypeMeHalfOp=193,3,100,1,5
+msgtypeMeUnban=196,5,100,1,5
+msgtypeDeIrcOp=298,3,100,1,5
+msgtypeMemoServ=316,5,100,1,2
+mirccolor8=240,225,6,255
+boolIrcViewShowImages=true
+boolUseExtendedPrivmsgView=false
+boolUseSpecifiedSmartColorForOwnNick=true
+stringIconThemeSubdir=Aria-2.0.0
+colorInputSelectionForeground=244,244,244,255
+colorUserListViewHalfOpForeground=95,0,95,255
+uintGlobalTransparencyChildFadeFactor=30
+uintIrcViewPixmapAlign=34
+uintNotifierActiveTransparency=100
+fontTreeWindowList=Courier%2010%20Pitch,10,5,75,b
+msgtypeAvatarChange=57,14,100,1,2
+msgtypeSplit=59,3,100,1,2
+msgtypeInviteExcept=71,14,100,1,1
+msgtypeWhoisOther=92,2,100,1,1
+msgtypeIrc=105,3,100,1,0
+msgtypeGenericVerbose=137,14,100,1,1
+msgtypeGenericWarning=132,5,100,1,0
+msgtypeGenericError=135,5,100,1,1
+msgtypeGenericCritical=134,5,100,1,4
+mirccolor9=60,207,60,255
+pixmapIrcViewBackground=
+boolIrcViewWrapMargin=true
+boolUseWindowsDesktopForTransparency=false
+boolShowTreeWindowListHeader=false
+colorNotifierForeground=244,244,244,255
+uintNotifierPixmapAlign=0
+msgtypeSocketMessage=21,14,100,1,1
+msgtypeSocketWarning=22,5,100,1,3
+msgtypeSocketError=23,4,100,1,4
+msgtypeQueryPrivateMessage=48,1,100,1,4
+msgtypeCtcpReply=51,5,100,1,2
+msgtypeNick=61,2,100,1,1
+msgtypeMode=64,14,100,1,1
+msgtypeDccMsg=78,5,100,1,2
+msgtypeServerNotice=141,5,100,1,1
+msgtypeMultimedia=177,5,100,1,2
+msgtypeMeVoice=190,3,100,1,5
+msgtypeChanAdmin=242,3,100,1,1
+msgtypeMeUserOp=193,3,100,1,1
+msgtypeChanOwner=260,3,100,1,2
+msgtypeBitTorrent=241,1,100,1,2
+pixmapNotifierBackground=
+boolShowUserAndHostInPrivmsgView=false
+boolShowUserChannelIcons=true
+stringExtendedPrivmsgPostfix=]%20
+colorMdiBackground=0,0,0,255
+colorUserListViewBackground=80,80,80,255
+colorUserListViewVoiceForeground=57,57,140,255
+colorUserListViewUserOpForeground=0,150,180,255
+uintUserIrcViewOwnBackground=8
+msgtypeSelection=0,0,11,1,1
+msgtypePart=40,14,100,1,2
+msgtypeQueryPrivmsgCrypted=102,1,100,1,3
+msgtypeMeBanUnExcept=198,3,100,1,5
+msgtypeIrcOp=296,3,100,1,5
+boolIrcViewUrlHighlighting=true
+colorWindowListMinimizedText=80,80,80,255
+colorNotifierTitleForeground=244,244,244,255
+colorInputForeground=0,0,0,255
+colorTreeWindowListProgress=80,80,80,255
+uintInputPixmapAlign=32
+fontIrcView=Courier%2010%20Pitch,10,5,50
+msgtypeCtcpRequestUnknown=55,5,100,1,2
+msgtypeChanMode=73,14,100,1,1
+msgtypeWhoisUser=88,2,100,1,1
+msgtypeCtcpReplyUnknown=162,5,100,1,1
+msgtypeIgnore=203,14,100,1,1
+msgtypeStats=205,1,100,1,1
+msgtypeSSL=229,0,4,1,0
+msgtypeGenericSuccess=136,14,100,1,3
+msgtypeGenericStatus=133,14,100,1,1
+pixmapInputBackground=
+boolColorNicks=true
+boolShowIconsInPopupMenus=true
+boolUseDifferentColorForOwnNick=true
+boolClassicWindowListSetMaximumButtonWidth=true
+colorWindowListHighlight1Text=125,168,255,255
+colorUserListViewAwayForeground=80,80,80,255
+colorTreeWindowListBackground=0,0,0,255
+colorTreeWindowListActiveForeground=244,244,244,255
+fontNotifier=Courier%2010%20Pitch,10,5,75,b
+msgtypeUrl=185,2,100,1,1
+msgtypeTopic=42,3,100,1,1
+msgtypeDeop=62,3,100,1,1
+msgtypeLimit=66,14,100,1,1
+msgtypeBan=67,5,100,1,1
+msgtypeWhoisIdle=90,2,100,1,1
+msgtypeQueryNoticeCrypted=156,5,100,1,3
+msgtypeMeKick=188,4,100,1,5
+colorWindowListHighlight2Text=57,57,140,255
+uintTimeStampForeground=1
+msgtypeHighlight=181,3,100,1,5
+msgtypeParserError=11,4,100,1,1
+msgtypeParserWarning=12,5,100,1,0
+msgtypeJoinError=182,5,100,1,4
+msgtypeHelp=49,3,100,1,1
+msgtypeTextEncoding=236,1,100,1,0
+msgtypeMeDeIrcOp=300,3,100,1,5
+boolUserListViewDrawGrid=false
+colorLabelForeground=0,0,0,255
+colorWindowListHighlight3Text=95,0,95,255
+colorIrcViewMarkLine=57,57,140,255
+fontInput=Courier%2010%20Pitch,10,5,75,b
+fontApplication=Sans%20Serif,10,5,50
+fontNotifierTitle=Courier%2010%20Pitch,10,5,75,b
+msgtypeConnection=14,5,100,1,1
+msgtypeUnrecognized=41,5,100,1,1
+msgtypeCtcpRequestFlood=54,5,100,1,1
+msgtypeInviteUnexcept=72,14,100,1,1
+msgtypeNotifyOnLine=94,2,100,1,1
+msgtypeLinks=112,2,100,1,1
+msgtypeQueryNotice=155,5,100,1,3
+msgtypeMeInviteExcept=199,3,100,1,5
+msgtypeSearch=143,0,1,1,1
+msgtypeChanUrl=185,10,100,1,3
+mirccolor10=0,143,171,255
+iccolor0=250,250,0,255
+pixmapLabelBackground=
+pixmapIrcToolBarAppletBackground=
+boolShowUserChannelState=true
+boolUseUserListColorsAsNickColors=true
+colorIrcViewBackground=255,255,255,255
+colorInputSelectionBackground=125,168,255,255
+colorIrcToolBarAppletForegroundHighContrastInactive1=40,40,40,255
+colorWindowListHighlight4Text=180,53,180,255
+uintToolBarIconSize=32
+msgtypeOp=34,3,100,1,2
+msgtypeBanExcept=69,14,100,1,1
+msgtypeDccError=79,5,100,1,1
+msgtypeDccChatMsgCrypted=104,1,100,1,3
+msgtypeNickServ=164,5,100,1,2
+msgtypeList=173,1,100,1,1
+msgtypeHalfDeOp=175,3,100,1,2
+msgtypeChanUnAdmin=243,3,100,1,1
+msgtypeMeChanAdmin=244,3,100,1,1
+msgtypeChanUnOwner=261,3,100,1,2
+msgtypeMeChanOwner=262,3,100,1,2
+msgtypeCap=29,8,1,1,1
+mirccolor11=125,168,255,255
+iccolor1=0,0,0,255
+colorNotifierBackground=0,0,0,255
+colorIrcToolBarAppletForegroundMidContrast=110,110,110,255
+colorIrcToolBarAppletForegroundHighContrastInactive2=40,40,40,255
+colorWindowListHighlight5Text=214,0,0,255
+colorUserListViewChanAdminForeground=83,54,5,255
+colorUserListViewChanOwnerForeground=81,87,111,255
+uintIrcViewMarkerStyle=4
+msgtypeServerInfo=29,1,100,1,1
+msgtypeMeIrcOp=299,3,100,1,5
+mirccolor0=244,244,244,255
+mirccolor12=66,66,225,255
+iccolor2=0,0,200,255
+boolUseGlobalPseudoTransparency=true
+boolDrawEmoticons=true
+boolUseSpecialColorForTimestamp=true
+colorWindowListNormalText=255,255,255,255
+colorUserListViewIrcOpForeground=190,78,78,255
+colorInputBackgroundColor=244,244,244,255
+colorUserListViewSelectionForeground=244,244,244,255
+uintIrcViewMarkerSize=1
+fontLabel=Courier%2010%20Pitch,10,5,75,b
+fontIrcToolBarApplet=Courier%2010%20Pitch,10,5,75,bi
+msgtypeQuitSplit=60,14,100,1,2
+msgtypeDevoice=63,3,100,1,1
+msgtypeDccRequest=77,5,100,1,3
+msgtypeWhoisChannels=89,2,100,1,1
+msgtypeDccChatMsg=103,1,100,1,3
+msgtypeIcqMessage=123,5,100,1,1
+msgtypeIcqMessageSent=124,5,100,1,1
+msgtypeUserDeOp=175,3,100,1,1
+mirccolor1=0,0,0,255
+mirccolor13=180,53,180,255
+iccolor3=200,0,0,255
diff --git a/data/deftheme/Aria-1.0.0/themeinfo.kvc b/data/deftheme/Aria-2.0.0/themeinfo.kvc
index 9f3c5d565..2ee2fed1f 100644
--- a/data/deftheme/Aria-1.0.0/themeinfo.kvc
+++ b/data/deftheme/Aria-2.0.0/themeinfo.kvc
@@ -1,9 +1,9 @@
 # KVIrc configuration file
 [ThemeInfo]
-Date=Thu%20Mar%2013%2015:42:40%202008
+Date=Sat%20Sep%2012%2001:47:15%202015
 Name=Aria
-Version=1.0.0
+Version=2.0.0
 Author=Szymon%20Stefanek
 ThemeEngineVersion=1.0.0
-Description=A%20theme%20based%20on%20SilverIRC%20with%20the%20addition%20of%20a%20nice%20gray%20background%20with%20the%20KVIrc%20logo%20and%20some%20nice%20features%20enabled.
-Application=KVIrc%203.4.0.20080304
+Description=A%20theme%20based%20on%20SilverIRC%20with%20the%20addition%20of%20a%20nice%20gray%20background%20with%20the%20KVIrc%20text.%0a%0aFeatures:%20Avatar%20support,%20smart%20nickname%20colors%20and%20more.%0a%0aRevamped%20in%202015%20for%20KVIrc%204.3.x
+Application=KVIrc%204.3.2.20150910
diff --git a/data/deftheme/CMakeLists.txt b/data/deftheme/CMakeLists.txt
index 4e9525f4b..b088a1599 100644
--- a/data/deftheme/CMakeLists.txt
+++ b/data/deftheme/CMakeLists.txt
@@ -1,5 +1,5 @@
 # CMakeLists for data/deftheme
 
 # Find subdirs
-subdirs(MinimalDark-1.0.0 Aria-1.0.0)
+subdirs(MinimalDark-2.0.0 Aria-2.0.0)
 
diff --git a/data/deftheme/MinimalDark-1.0.0/themeinfo.kvc b/data/deftheme/MinimalDark-1.0.0/themeinfo.kvc
deleted file mode 100644
index f6a5393c1..000000000
--- a/data/deftheme/MinimalDark-1.0.0/themeinfo.kvc
+++ /dev/null
@@ -1,9 +0,0 @@
-# KVIrc configuration file
-[ThemeInfo]
-Date=mar%20feb%2023%2012:46:45%202010
-Name=MinimalDark
-Version=1.0.0
-Author=CtrlAltCa
-ThemeEngineVersion=1.0.0
-Description=A%20minimalistic%20dark%20theme%20with%20a%20monospaced%20font
-Application=KVIrc%204.0.0.20100125
diff --git a/data/deftheme/MinimalDark-1.0.0/CMakeLists.txt b/data/deftheme/MinimalDark-2.0.0/CMakeLists.txt
index 633f6e140..acd506afd 100644
--- a/data/deftheme/MinimalDark-1.0.0/CMakeLists.txt
+++ b/data/deftheme/MinimalDark-2.0.0/CMakeLists.txt
@@ -1,4 +1,4 @@
-# CMakeLists for data/deftheme/MinimalDark-1.0.0
+# CMakeLists for data/deftheme/MinimalDark-2.0.0
 
 file(GLOB images "${CMAKE_CURRENT_SOURCE_DIR}/*.png")
 file(GLOB themefiles "${CMAKE_CURRENT_SOURCE_DIR}/*.kvc")
@@ -6,11 +6,11 @@ list(APPEND files ${images} ${themefiles})
 
 if(UNIX)
 	if(APPLE)
-		install(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/themes/MinimalDark-1.0.0/)
+		install(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/Contents/Resources/themes/MinimalDark-2.0.0/)
 	else()
-		# Assume linux
-		install(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/themes/MinimalDark-1.0.0/)
+		# Assume Linux
+		install(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kvirc/${VERSION_BRANCH}/themes/MinimalDark-2.0.0/)
 	endif()
 elseif(WIN32)
-	install(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/themes/MinimalDark-1.0.0/)
+	install(FILES ${files} DESTINATION ${CMAKE_INSTALL_PREFIX}/themes/MinimalDark-2.0.0/)
 endif()
diff --git a/data/deftheme/MinimalDark-2.0.0/screenshot.png b/data/deftheme/MinimalDark-2.0.0/screenshot.png
new file mode 100644
index 000000000..debbe5865
--- /dev/null
+++ b/data/deftheme/MinimalDark-2.0.0/screenshot.png
diff --git a/data/deftheme/MinimalDark-2.0.0/screenshot_medium.png b/data/deftheme/MinimalDark-2.0.0/screenshot_medium.png
new file mode 100644
index 000000000..debbe5865
--- /dev/null
+++ b/data/deftheme/MinimalDark-2.0.0/screenshot_medium.png
diff --git a/data/deftheme/MinimalDark-2.0.0/screenshot_small.png b/data/deftheme/MinimalDark-2.0.0/screenshot_small.png
new file mode 100644
index 000000000..debbe5865
--- /dev/null
+++ b/data/deftheme/MinimalDark-2.0.0/screenshot_small.png
diff --git a/data/deftheme/MinimalDark-1.0.0/themedata.kvc b/data/deftheme/MinimalDark-2.0.0/themedata.kvc
index c5ee5a69d..c1581efea 100644
--- a/data/deftheme/MinimalDark-1.0.0/themedata.kvc
+++ b/data/deftheme/MinimalDark-2.0.0/themedata.kvc
@@ -3,7 +3,7 @@
 boolShowAvatarsInUserlist=true
 boolShowUserListStatisticLabel=true
 fontWindowList=Courier%2010%20Pitch,10,0,50
-msgtypeLink=0,2,100,1,0
+msgtypeLink=185,12,100,1,0
 msgtypeServerPing=36,15,100,1,0
 msgtypeUnban=68,5,100,1,1
 msgtypeHalfOp=174,3,100,1,1
@@ -12,26 +12,28 @@ msgtypeQueryTrace=181,15,100,1,1
 msgtypeWallops=139,5,100,1,3
 msgtypeMeDeOp=191,3,100,1,5
 msgtypeMeBan=195,5,100,1,5
-mirccolor2=0,0,140
-mirccolor14=80,80,80
-iccolor4=255,255,255
-boolBoldedNicks=false
+mirccolor2=125,168,255,255
+mirccolor14=90,90,90,255
+iccolor4=255,255,255,255
+boolBoldedNicks=true
 stringExtendedPrivmsgPrefix=[
-colorGlobalTransparencyFade=255,255,255
-colorTreeWindowListActiveBackground=200,200,200
+colorGlobalTransparencyFade=255,255,255,255
+colorTreeWindowListActiveBackground=180,180,180,255
 uintUserListPixmapAlign=1
 uintToolBarAppletPixmapAlign=0
+uintNotifierInactiveTransparency=80
+uintToolBarButtonStyle=0
 msgtypeChannelPrivateMessage=46,0,100,1,3
 msgtypeCtcpRequestReplied=52,5,100,1,2
 msgtypeKey=65,15,100,1,2
 msgtypeBroadcastPrivmsg=183,0,100,1,3
-mirccolor3=0,100,0
-mirccolor15=170,170,170
-iccolor5=0,150,190
+mirccolor3=118,240,118,255
+mirccolor15=170,170,170,255
+iccolor5=0,150,190,255
 boolScaleAvatars=true
-colorUserListViewOwnForeground=126,74,131
-colorInputControl=200,100,0
-colorTreeWindowListHighlight1Foreground=0,16,144
+colorUserListViewOwnForeground=172,93,190,255
+colorInputControl=225,166,84,255
+colorTreeWindowListHighlight1Foreground=85,170,255,255
 uintUserListViewGridType=3
 uintTimeStampBackground=100
 uintUserIrcViewOwnForeground=4
@@ -42,20 +44,20 @@ msgtypeRaw=25,2,100,1,1
 msgtypeSystemWarning=26,4,100,1,3
 msgtypeSystemMessage=27,2,100,1,1
 msgtypeUnhandledReply=28,2,100,1,1
-msgtypeJoin=39,14,100,1,2
+msgtypeJoin=39,11,100,1,2
 msgtypeVoice=35,3,100,1,1
 msgtypeMeInviteUnexcept=200,3,100,1,5
 msgtypeUserOp=174,3,100,1,1
-mirccolor4=230,0,0
-iccolor6=0,130,0
+mirccolor4=241,84,84,255
+iccolor6=0,130,0,255
 pixmapMdiBackground=
 pixmapUserListViewBackground=
 boolUseCompositingForTransparency=false
-colorLabelBackground=0,0,0
-colorIrcToolBarAppletBackground=0,0,0
-colorIrcToolBarAppletForegroundHighContrastActive1=255,255,255
-colorTreeWindowListHighlight2Foreground=32,0,255
-msgtypeOwnPrivateMessage=45,0,1,1,3
+colorLabelBackground=0,0,0,255
+colorIrcToolBarAppletBackground=0,0,0,255
+colorIrcToolBarAppletForegroundHighContrastActive1=244,244,244,255
+colorTreeWindowListHighlight2Foreground=117,195,255,255
+msgtypeOwnPrivateMessage=45,0,100,1,3
 msgtypeBanUnexcept=70,15,100,1,1
 msgtypeSpam=120,14,100,1,3
 msgtypeChanServ=165,5,100,1,2
@@ -65,32 +67,33 @@ msgtypeMeDeHalfOp=194,3,100,1,5
 msgtypeMeBanExcept=197,3,100,1,5
 msgtypeMeChanUnAdmin=245,3,100,1,1
 msgtypeMeChanUnOwner=263,3,100,1,2
-mirccolor5=150,0,0
-iccolor7=150,0,170
+mirccolor5=255,155,155,255
+iccolor7=150,0,170,255
 boolDrawGenderIcons=true
-colorUserListViewOpForeground=200,0,0
-colorIrcToolBarAppletForegroundHighContrastActive2=0,60,0
-colorTreeWindowListForeground=255,255,255
-colorTreeWindowListHighlight3Foreground=128,0,255
-colorUserListViewGrid=216,216,216
+colorUserListViewOpForeground=230,113,113,255
+colorIrcToolBarAppletForegroundHighContrastActive2=108,220,108,255
+colorTreeWindowListForeground=255,255,255,255
+colorTreeWindowListHighlight3Foreground=219,145,255,255
+colorUserListViewGrid=216,216,216,255
+uintGlobalWindowOpacityPercent=100
 uintTreeWindowListPixmapAlign=0
 msgtypeCtcpRequestIgnored=53,5,100,1,1
-msgtypeAction=56,13,100,1,3
-msgtypeQuit=58,14,100,1,2
+msgtypeAction=56,9,100,1,3
+msgtypeQuit=58,10,100,1,2
 msgtypeCreationTime=93,15,100,1,1
 msgtypeOwnPrivmsgCrypted=100,0,100,1,3
 msgtypeChannelNoticeCrypted=154,5,100,1,3
 msgtypeAway=170,3,100,1,4
 msgtypeInvite=176,7,100,1,4
-mirccolor6=80,0,80
+mirccolor6=220,108,220,255
 pixmapTreeWindowListBackground=
 pixmapGlobalTransparencyBackground=
 boolUseGlobalApplicationFont=false
-boolUseFlatClassicWindowListButtons=false
-colorInputCursor=72,216,72
-colorUserListViewNormalForeground=255,255,255
-colorIrcToolBarAppletForegroundLowContrast=180,180,180
-colorTreeWindowListHighlight4Foreground=220,0,255
+boolUseFlatClassicWindowListButtons=true
+colorInputCursor=115,230,0,255
+colorUserListViewNormalForeground=244,244,244,255
+colorIrcToolBarAppletForegroundLowContrast=180,180,180,255
+colorTreeWindowListHighlight4Foreground=234,125,255,255
 uintGlobalTransparencyParentFadeFactor=10
 uintClassicWindowListMaximumButtonWidth=100
 fontUserListView=Courier%2010%20Pitch,10,0,50,i
@@ -101,15 +104,15 @@ msgtypeKick=110,4,100,1,2
 msgtypeMeDeVoice=192,3,100,1,5
 msgtypeMeDeUserOp=194,3,100,1,1
 msgtypeVerbose=259,15,100,1,0
-msgtypeServerError=272,14,100,1,1
-mirccolor7=255,90,0
+msgtypeServerError=272,4,100,1,1
+mirccolor7=255,158,105,255
 boolUseTreeWindowList=true
-boolUseWindowListActivityMeter=false
+boolUseWindowListActivityMeter=true
 boolStripMircColorsInUserMessages=false
-colorWindowListProgressBar=180,180,180
-colorUserListViewSelectionBackground=194,194,194
-colorTreeWindowListHighlight5Foreground=255,0,0
-msgtypeMotd=30,0,100,1,0
+colorWindowListProgressBar=180,180,180,255
+colorUserListViewSelectionBackground=180,180,180,255
+colorTreeWindowListHighlight5Foreground=255,125,125,255
+msgtypeMotd=30,7,100,1,0
 msgtypeWho=75,2,100,1,1
 msgtypeChanPrivmsgCrypted=101,0,100,1,3
 msgtypeIcq=122,5,100,1,1
@@ -117,33 +120,35 @@ msgtypeChannelNotice=153,5,100,1,3
 msgtypeMeHalfOp=193,3,100,1,5
 msgtypeMeUnban=196,5,100,1,5
 msgtypeDeIrcOp=298,3,100,1,5
-mirccolor8=255,255,0
-boolIrcViewShowImages=false
+msgtypeMemoServ=316,0,100,1,2
+mirccolor8=226,226,48,255
+boolIrcViewShowImages=true
 boolUseExtendedPrivmsgView=false
-boolUseSpecifiedSmartColorForOwnNick=false
-stringIconThemeSubdir=MinimalDark-1.0.0
-colorInputSelectionForeground=255,128,0
-colorUserListViewHalfOpForeground=119,0,178
+boolUseSpecifiedSmartColorForOwnNick=true
+stringIconThemeSubdir=MinimalDark-2.0.0
+colorInputSelectionForeground=244,244,244,255
+colorUserListViewHalfOpForeground=230,113,230,255
 uintGlobalTransparencyChildFadeFactor=30
 uintIrcViewPixmapAlign=33
-fontTreeWindowList=Courier%2010%20Pitch,10,0,50
+uintNotifierActiveTransparency=100
+fontTreeWindowList=Courier%2010%20Pitch,10,5,75,b
 msgtypeAvatarChange=57,15,100,1,2
-msgtypeSplit=59,15,100,1,2
+msgtypeSplit=59,10,100,1,2
 msgtypeInviteExcept=71,15,100,1,1
 msgtypeWhoisOther=92,2,100,1,1
 msgtypeIrc=105,3,100,1,0
 msgtypeGenericVerbose=137,14,100,1,1
-msgtypeGenericWarning=132,5,100,1,0
+msgtypeGenericWarning=132,4,100,1,0
 msgtypeGenericError=135,4,100,1,1
 msgtypeGenericCritical=134,4,100,1,4
-mirccolor9=0,255,0
+mirccolor9=188,244,120,255
 pixmapIrcViewBackground=
 boolIrcViewWrapMargin=true
 boolUseWindowsDesktopForTransparency=false
 boolShowTreeWindowListHeader=false
-colorNotifierForeground=255,255,255
+colorNotifierForeground=244,244,244,255
 uintNotifierPixmapAlign=0
-msgtypeSocketMessage=21,14,100,1,1
+msgtypeSocketMessage=21,10,100,1,1
 msgtypeSocketWarning=22,5,100,1,3
 msgtypeSocketError=23,4,100,1,4
 msgtypeQueryPrivateMessage=48,0,100,1,4
@@ -152,31 +157,31 @@ msgtypeNick=61,2,100,1,1
 msgtypeMode=64,15,100,1,1
 msgtypeDccMsg=78,5,100,1,2
 msgtypeServerNotice=141,5,100,1,1
-msgtypeMultimedia=177,5,100,1,2
+msgtypeMultimedia=145,5,100,1,2
 msgtypeMeVoice=190,3,100,1,5
 msgtypeChanAdmin=242,3,100,1,1
 msgtypeMeUserOp=193,3,100,1,1
 msgtypeChanOwner=260,3,100,1,2
-msgtypeBitTorrent=177,0,100,1,2
+msgtypeBitTorrent=145,0,100,1,2
 pixmapNotifierBackground=
 boolShowUserAndHostInPrivmsgView=false
 boolShowUserChannelIcons=true
 stringExtendedPrivmsgPostfix=]%20
-colorMdiBackground=0,0,0
-colorUserListViewBackground=0,0,0
-colorUserListViewVoiceForeground=0,0,200
-colorUserListViewUserOpForeground=0,127,178
+colorMdiBackground=0,0,0,255
+colorUserListViewBackground=0,0,0,255
+colorUserListViewVoiceForeground=125,140,255,255
+colorUserListViewUserOpForeground=85,170,255,255
 uintUserIrcViewOwnBackground=8
-msgtypeSelection=0,0,15,1,1
-msgtypePart=40,14,100,1,2
+msgtypeSelection=0,0,2,1,1
+msgtypePart=40,11,100,1,2
 msgtypeQueryPrivmsgCrypted=102,0,100,1,3
 msgtypeMeBanUnExcept=198,3,100,1,5
 msgtypeIrcOp=296,3,100,1,5
 boolIrcViewUrlHighlighting=true
-colorWindowListMinimizedText=60,60,60
-colorNotifierTitleForeground=255,255,255
-colorInputForeground=255,255,255
-colorTreeWindowListProgress=150,150,150
+colorWindowListMinimizedText=100,100,100,255
+colorNotifierTitleForeground=244,244,244,255
+colorInputForeground=244,244,244,255
+colorTreeWindowListProgress=150,150,150,255
 uintInputPixmapAlign=32
 fontIrcView=Courier%2010%20Pitch,10,0,50
 msgtypeCtcpRequestUnknown=55,5,100,1,2
@@ -186,19 +191,19 @@ msgtypeCtcpReplyUnknown=162,5,100,1,1
 msgtypeIgnore=203,15,100,1,1
 msgtypeStats=205,0,100,1,1
 msgtypeSSL=229,2,100,1,0
-msgtypeGenericSuccess=136,14,100,1,3
-msgtypeGenericStatus=133,14,100,1,1
+msgtypeGenericSuccess=136,10,100,1,3
+msgtypeGenericStatus=133,10,100,1,1
 pixmapInputBackground=
-boolColorNicks=true
+boolColorNicks=false
 boolShowIconsInPopupMenus=true
 boolUseDifferentColorForOwnNick=true
 boolClassicWindowListSetMaximumButtonWidth=true
-colorWindowListHighlight1Text=0,16,144
-colorUserListViewAwayForeground=143,143,143
-colorTreeWindowListBackground=0,0,0
-colorTreeWindowListActiveForeground=0,0,128
+colorWindowListHighlight1Text=105,180,255,255
+colorUserListViewAwayForeground=180,180,180,255
+colorTreeWindowListBackground=0,0,0,255
+colorTreeWindowListActiveForeground=0,0,0,255
 fontNotifier=Courier%2010%20Pitch,9,0,50
-msgtypeUrl=0,2,100,1,1
+msgtypeUrl=185,2,100,1,1
 msgtypeTopic=42,3,100,1,1
 msgtypeDeop=62,3,100,1,1
 msgtypeLimit=66,15,100,1,1
@@ -206,21 +211,21 @@ msgtypeBan=67,5,100,1,1
 msgtypeWhoisIdle=90,2,100,1,1
 msgtypeQueryNoticeCrypted=156,5,100,1,3
 msgtypeMeKick=188,4,100,1,5
-colorWindowListHighlight2Text=32,0,255
-uintTimeStampForeground=14
-msgtypeHighlight=0,7,100,1,5
+colorWindowListHighlight2Text=105,122,255,255
+uintTimeStampForeground=0
+msgtypeHighlight=181,7,100,1,5
 msgtypeParserError=11,4,100,1,1
-msgtypeParserWarning=12,5,100,1,0
+msgtypeParserWarning=12,4,100,1,0
 msgtypeJoinError=182,5,100,1,4
 msgtypeHelp=49,3,100,1,1
 msgtypeTextEncoding=236,0,100,1,0
 msgtypeMeDeIrcOp=300,3,100,1,5
 boolUserListViewDrawGrid=false
-colorLabelForeground=255,255,255
-colorWindowListHighlight3Text=128,20,255
-colorIrcViewMarkLine=0,119,0
+colorLabelForeground=244,244,244,255
+colorWindowListHighlight3Text=173,105,255,255
+colorIrcViewMarkLine=85,170,0,255
 fontInput=Courier%2010%20Pitch,10,0,50
-fontApplication=Courier%2010%20Pitch,12,0,50
+fontApplication=Courier%2010%20Pitch,11,5,50
 fontNotifierTitle=Courier%2010%20Pitch,9,0,50
 msgtypeConnection=14,5,100,1,1
 msgtypeUnrecognized=41,5,100,1,1
@@ -230,17 +235,19 @@ msgtypeNotifyOnLine=94,2,100,1,1
 msgtypeLinks=112,2,100,1,1
 msgtypeQueryNotice=155,5,100,1,3
 msgtypeMeInviteExcept=199,3,100,1,5
-msgtypeSearch=206,0,1,1,1
-mirccolor10=0,150,180
-iccolor0=250,250,0
+msgtypeSearch=143,0,100,1,1
+msgtypeChanUrl=185,10,100,1,3
+mirccolor10=130,170,190,255
+iccolor0=250,250,0,255
 pixmapLabelBackground=
 pixmapIrcToolBarAppletBackground=
-boolShowUserChannelState=false
-boolUseUserListColorsAsNickColors=false
-colorIrcViewBackground=0,0,0
-colorInputSelectionBackground=198,198,198
-colorIrcToolBarAppletForegroundHighContrastInactive1=220,220,220
-colorWindowListHighlight4Text=220,0,255
+boolShowUserChannelState=true
+boolUseUserListColorsAsNickColors=true
+colorIrcViewBackground=0,0,0,255
+colorInputSelectionBackground=125,168,255,255
+colorIrcToolBarAppletForegroundHighContrastInactive1=180,180,180,255
+colorWindowListHighlight4Text=255,105,250,255
+uintToolBarIconSize=32
 msgtypeOp=34,3,100,1,2
 msgtypeBanExcept=69,15,100,1,1
 msgtypeDccError=79,5,100,1,1
@@ -253,39 +260,38 @@ msgtypeMeChanAdmin=244,3,100,1,1
 msgtypeChanUnOwner=261,3,100,1,2
 msgtypeMeChanOwner=262,3,100,1,2
 msgtypeCap=29,0,100,1,1
-mirccolor11=170,170,255
-iccolor1=0,0,0
-colorNotifierBackground=0,0,0
-colorIrcToolBarAppletForegroundMidContrast=110,110,110
-colorIrcToolBarAppletForegroundHighContrastInactive2=195,195,195
-colorWindowListHighlight5Text=255,0,0
-colorUserListViewChanAdminForeground=83,54,5
-colorUserListViewChanOwnerForeground=81,87,111
-uintIrcViewMarkerStyle=0
+mirccolor11=170,170,255,255
+iccolor1=0,0,0,255
+colorNotifierBackground=0,0,0,255
+colorIrcToolBarAppletForegroundMidContrast=124,124,124,255
+colorIrcToolBarAppletForegroundHighContrastInactive2=131,185,200,255
+colorWindowListHighlight5Text=255,105,105,255
+colorUserListViewChanAdminForeground=180,129,53,255
+colorUserListViewChanOwnerForeground=138,151,180,255
+uintIrcViewMarkerStyle=4
 msgtypeServerInfo=29,0,100,1,1
 msgtypeMeIrcOp=299,3,100,1,5
-mirccolor0=255,255,255
-mirccolor12=15,15,255
-iccolor2=0,0,200
+mirccolor0=244,244,244,255
+mirccolor12=105,180,255,255
+iccolor2=0,0,200,255
 boolUseGlobalPseudoTransparency=false
 boolDrawEmoticons=false
 boolUseSpecialColorForTimestamp=true
-colorWindowListNormalText=255,255,255
-colorUserListViewIrcOpForeground=200,0,0
-colorInputBackgroundColor=0,0,0
-colorUserListViewSelectionForeground=255,128,0
+colorWindowListNormalText=255,255,255,255
+colorUserListViewIrcOpForeground=190,78,78,255
+colorInputBackgroundColor=0,0,0,255
+colorUserListViewSelectionForeground=0,0,0,255
 uintIrcViewMarkerSize=1
 fontLabel=Courier%2010%20Pitch,10,0,50
 fontIrcToolBarApplet=Courier%2010%20Pitch,10,0,50,i
-msgtypeQuitSplit=60,14,100,1,2
+msgtypeQuitSplit=60,10,100,1,2
 msgtypeDevoice=63,3,100,1,1
 msgtypeDccRequest=77,5,100,1,3
 msgtypeWhoisChannels=89,2,100,1,1
 msgtypeDccChatMsg=103,0,100,1,3
-msgtypeIcqMessage=128,5,100,1,1
-msgtypeIcqMessageSent=129,5,100,1,1
+msgtypeIcqMessage=123,5,100,1,1
+msgtypeIcqMessageSent=125,5,100,1,1
 msgtypeUserDeOp=175,3,100,1,1
-mirccolor1=0,0,0
-mirccolor13=200,0,200
-iccolor3=200,0,0
-msgtypeMemoServ=316,5,100,1,2
-\ No newline at end of file
+mirccolor1=0,0,0,255
+mirccolor13=255,125,251,255
+iccolor3=200,0,0,255
diff --git a/data/deftheme/MinimalDark-2.0.0/themeinfo.kvc b/data/deftheme/MinimalDark-2.0.0/themeinfo.kvc
new file mode 100644
index 000000000..e8f7c65a8
--- /dev/null
+++ b/data/deftheme/MinimalDark-2.0.0/themeinfo.kvc
@@ -0,0 +1,9 @@
+# KVIrc configuration file
+[ThemeInfo]
+Date=Sat%20Sep%2012%2002:21:19%202015
+Name=MinimalDark
+Version=2.0.0
+Author=CtrlAltCa
+ThemeEngineVersion=1.0.0
+Description=A%20minimalistic%20black%20theme%20with%20a%20monospaced%20font.%0a%0aRevamped%20in%202015%20for%20KVIrc%204.3.x%0a%0a
+Application=KVIrc%204.3.2.20150910
diff --git a/data/pics/kvi_setup_theme_hires.png b/data/pics/kvi_setup_theme_hires.png
index 7c2f79846..5a3192cc9 100644
--- a/data/pics/kvi_setup_theme_hires.png
+++ b/data/pics/kvi_setup_theme_hires.png
diff --git a/data/pics/kvi_setup_theme_lowres.png b/data/pics/kvi_setup_theme_lowres.png
index 59bdffe65..9a2f57980 100644
--- a/data/pics/kvi_setup_theme_lowres.png
+++ b/data/pics/kvi_setup_theme_lowres.png
diff --git a/src/modules/setup/libkvisetup.cpp b/src/modules/setup/libkvisetup.cpp
index f45bb05a7..7fe378646 100644
--- a/src/modules/setup/libkvisetup.cpp
+++ b/src/modules/setup/libkvisetup.cpp
@@ -89,10 +89,10 @@ KVIMODULEEXPORTFUNC void setup_finish()
 		switch(g_iThemeToApply)
 		{
 			case THEME_APPLY_HIRES:
-				KviTheme::apply("Aria-1.0.0",KviThemeInfo::Builtin,out);
+				KviTheme::apply("Aria-2.0.0",KviThemeInfo::Builtin,out);
 			break;
 			case THEME_APPLY_LORES:
-				KviTheme::apply("MinimalDark-1.0.0",KviThemeInfo::Builtin,out);
+				KviTheme::apply("MinimalDark-2.0.0",KviThemeInfo::Builtin,out);
 			break;
 			// default: no theme
 		}