diff --git a/README.md b/README.md
index 29e1e125399ddc8f00581d705d438ed5740e37dc..ec6ae019486bfa451596c59aabee6ad16847a91d 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,8 @@
 ###### fireice-uk's and psychocrypt's
 # XMR-Stak - Monero/Aeon All-in-One Mining Software
 
+**XMR-Stak is ready for the POW change of Monero-v7, Aeon-v7 and Sumukoin-v3**
+
 XMR-Stak is a universal Stratum pool miner. This miner supports CPUs, AMD and NVIDIA gpus and can be used to mine the crypto currency Monero and Aeon.
 
 ## HTML reports
diff --git a/doc/FAQ.md b/doc/FAQ.md
index 8739fc40f7de1ef6b78d9839965d9d5f196a71f7..35dc2488dfa1ce5db6a7c08277b063405bb40caa 100644
--- a/doc/FAQ.md
+++ b/doc/FAQ.md
@@ -72,7 +72,7 @@ If your antivirus software flags **xmr-stak**, it will likely move it to its qua
 
 If the miner is compiled for Monero and Aeon than you can change
  - the value `currency` in the config *or*
- - start the miner with the [command line option](usage.md) `--currency monero7` or `--currency aeon`
+ - start the miner with the [command line option](usage.md) `--currency monero7` or `--currency aeon7`
  - run `xmr-stak --help` to see all supported currencies and algorithms
 
 ## How can I mine Monero
diff --git a/xmrstak/backend/cryptonight.hpp b/xmrstak/backend/cryptonight.hpp
index 538f1d8c8b06233a3d8e6d49f0a4e77bcbdaff46..8a8e2594443f77f8f4f903f18e81b379badb0864 100644
--- a/xmrstak/backend/cryptonight.hpp
+++ b/xmrstak/backend/cryptonight.hpp
@@ -49,16 +49,14 @@ inline size_t cn_select_memory(xmrstak_algo algo)
 {
 	switch(algo)
 	{
+	case cryptonight_monero:
 	case cryptonight:
-		return CRYPTONIGHT_MEMORY;
+		return CRYPTONIGHT_MEMORY;	
+	case cryptonight_aeon:
 	case cryptonight_lite:
 		return CRYPTONIGHT_LITE_MEMORY;
-	case cryptonight_monero:
-		return CRYPTONIGHT_MEMORY;
 	case cryptonight_heavy:
 		return CRYPTONIGHT_HEAVY_MEMORY;
-	case cryptonight_aeon:
-		return CRYPTONIGHT_LITE_MEMORY;
 	default:
 		return 0;
 	}
@@ -86,16 +84,14 @@ inline size_t cn_select_mask(xmrstak_algo algo)
 {
 	switch(algo)
 	{
+	case cryptonight_monero:
 	case cryptonight:
 		return CRYPTONIGHT_MASK;
+	case cryptonight_aeon:
 	case cryptonight_lite:
 		return CRYPTONIGHT_LITE_MASK;
-	case cryptonight_monero:
-		return CRYPTONIGHT_MASK;
 	case cryptonight_heavy:
 		return CRYPTONIGHT_HEAVY_MASK;
-	case cryptonight_aeon:
-		return CRYPTONIGHT_LITE_MASK;
 	default:
 		return 0;
 	}
@@ -123,16 +119,14 @@ inline size_t cn_select_iter(xmrstak_algo algo)
 {
 	switch(algo)
 	{
+	case cryptonight_monero:
 	case cryptonight:
 		return CRYPTONIGHT_ITER;
+	case cryptonight_aeon:
 	case cryptonight_lite:
 		return CRYPTONIGHT_LITE_ITER;
-	case cryptonight_monero:
-		return CRYPTONIGHT_ITER;
 	case cryptonight_heavy:
 		return CRYPTONIGHT_HEAVY_ITER;
-	case cryptonight_aeon:
-		return CRYPTONIGHT_LITE_ITER;
 	default:
 		return 0;
 	}
diff --git a/xmrstak/misc/executor.cpp b/xmrstak/misc/executor.cpp
index 85202378fc290e7876360b1cf8b1ed5040577c9e..0e1dd9f4e203f8fe60f79e699d4b2d48988dc2ef 100644
--- a/xmrstak/misc/executor.cpp
+++ b/xmrstak/misc/executor.cpp
@@ -563,15 +563,8 @@ void executor::ex_main()
 		else
 			pools.emplace_front(0, "donate.xmr-stak.net:5500", "", "", "", 0.0, true, false, "", false);
 		break;
-	
-	case cryptonight_lite:
-		if(dev_tls)
-			pools.emplace_front(0, "donate.xmr-stak.net:7777", "", "", "", 0.0, true, true, "", true);
-		else
-			pools.emplace_front(0, "donate.xmr-stak.net:4444", "", "", "", 0.0, true, false, "", true);
-		break;
-
 	case cryptonight_aeon:
+	case cryptonight_lite:
 		if(dev_tls)
 			pools.emplace_front(0, "donate.xmr-stak.net:7777", "", "", "", 0.0, true, true, "", true);
 		else
diff --git a/xmrstak/pools.tpl b/xmrstak/pools.tpl
index d3a8a5ae2eb176306c0110608f6a50d8427b067b..f5afff6c5334798235e0eb37b46961eb1348d1f6 100644
--- a/xmrstak/pools.tpl
+++ b/xmrstak/pools.tpl
@@ -20,7 +20,7 @@ POOLCONF],
 /*
  * Currency to mine. Supported values:
  *
- *    aeon
+ *    aeon7 (use this for Aeon's new PoW)
  *    cryptonight (try this if your coin is not listed)
  *    cryptonight_lite
  *    edollar