diff --git a/icon.ico b/icon.ico
new file mode 100644
index 0000000..41ed0c8
Binary files /dev/null and b/icon.ico differ
diff --git a/setup.py b/setup.py
index 088bda6..cb67a0c 100644
--- a/setup.py
+++ b/setup.py
@@ -4,36 +4,19 @@
 includefiles = []
 
 
-if platform.system() == 'Windows':
 
-    includefiles = [
-        ('icons/delete.png', 'icons/delete.png'),
-        ('icons/icon.png', 'icons/icon.png'),
-        ('icons/next.png', 'icons/next.png'),
-        ('icons/pause.png', 'icons/pause.png'),
-        ('icons/play.png', 'icons/play.png'),
-        ('icons/stop.png', 'icons/stop.png'),
+includefiles = [
+    ('icons/delete.png', 'icons/delete.png'),
+    ('icons/icon.png', 'icons/icon.png'),
+    ('icons/next.png', 'icons/next.png'),
+    ('icons/pause.png', 'icons/pause.png'),
+    ('icons/play.png', 'icons/play.png'),
+    ('icons/stop.png', 'icons/stop.png'),
+    ('icon.icns', 'icon.icns'),
+    ('ffmpeg/ffmpeg', 'ffmpeg/ffmpeg'),
+    ('ffmpeg/ffprobe', 'ffmpeg/ffprobe'),
 
-        ('ffmpeg/ffmpeg.exe', 'ffmpeg/ffmpeg.exe'),
-        ('ffmpeg/ffprobe.exe', 'ffmpeg/ffprobe.exe'),
-
-
-    ]
-else:
-    includefiles = [
-        ('icons/delete.png', 'icons/delete.png'),
-        ('icons/icon.png', 'icons/icon.png'),
-        ('icons/next.png', 'icons/next.png'),
-        ('icons/pause.png', 'icons/pause.png'),
-        ('icons/play.png', 'icons/play.png'),
-        ('icons/stop.png', 'icons/stop.png'),
-
-        ('icon.icns', 'icon.icns'),
-
-        ('ffmpeg/ffmpeg', 'ffmpeg/ffmpeg'),
-        ('ffmpeg/ffprobe', 'ffmpeg/ffprobe'),
-
-    ]
+]
 
 
 includes = []
@@ -43,22 +26,10 @@
 base = ""
 
 """
-<key>LSEnvironment</key>
-<dict>
-    <key>LANG</key>
-    <string>pl_PL.UTF-8</string>
-    <key>LC_ALL</key>
-    <string>pl_PL.UTF-8</string>
-</dict>
-
 python setup.py bdist_mac
 bdist_dmg
 """
 
-
-if platform.system() == 'Windows':
-    base = 'Win32GUI'
-
 plist_items = [
     ('LSEnvironment', {
         'LANG': 'pl_PL.UTF-8',
diff --git a/setup_windows.py b/setup_windows.py
new file mode 100644
index 0000000..88bb5d5
--- /dev/null
+++ b/setup_windows.py
@@ -0,0 +1,89 @@
+import sys
+from cx_Freeze import setup, Executable
+
+includefiles = [
+    ('icons/delete.png', 'icons/delete.png'),
+    ('icons/icon.png', 'icons/icon.png'),
+    ('icons/next.png', 'icons/next.png'),
+    ('icons/pause.png', 'icons/pause.png'),
+    ('icons/play.png', 'icons/play.png'),
+    ('icons/stop.png', 'icons/stop.png'),
+
+    ('icon.ico', 'icon.ico'),
+
+    ('ffmpeg/ffmpeg.exe', 'ffmpeg/ffmpeg.exe'),
+    ('ffmpeg/ffprobe.exe', 'ffmpeg/ffprobe.exe'),
+]
+
+includes = []
+excludes = []
+packages = []
+
+base = "Win32GUI"
+
+
+product_name = 'Milonga'
+
+directory_table = [
+    ("ProgramMenuFolder", "TARGETDIR", "."),
+    ("MyProgramMenu", "ProgramMenuFolder", "MYPROG~1|My Program"),]
+   
+shortcut_table = [
+    ("DesktopShortcut",        # Shortcut
+     "DesktopFolder",          # Directory_
+     "Milonga",           # Name that will be show on the link
+     "TARGETDIR",              # Component_
+     "[TARGETDIR]Milonga.exe",# Target exe to exexute
+     None,                     # Arguments
+     None,                     # Description
+     None,                     # Hotkey
+     None,                     # Icon
+     None,                     # IconIndex
+     None,                     # ShowCmd
+     'TARGETDIR'               # WkDir
+     ),
+     
+
+    ]
+
+
+msi_data = {"Shortcut": shortcut_table}
+
+
+bdist_msi_options = {
+    # 'upgrade_code': '{66620F3A-DC3A-11E2-B341-002219E9B01E}',
+    'add_to_path': False,
+    'initial_target_dir': r'C:\ProgramFiles\%s' % (product_name),
+    'target_name' : 'Milonga',
+    'directories' : directory_table, 
+    "summary_data": {"author": "Me",
+    "comments": "Milonga DJ"},
+    "data":msi_data
+    }
+   
+
+# Konfiguracja `setup`
+setup(
+    name="Milonga",
+    version="1.0",
+    description='Milonga DJ App',
+    author='Paweł Wąsowicz',
+    options={
+        'build_exe': {
+            "include_msvcr": True,
+            'includes': includes,
+            'excludes': excludes,
+            'packages': packages,
+            'include_files': includefiles
+        },
+        'bdist_msi': bdist_msi_options
+    },
+    executables=[
+        Executable(
+            "milonga.py",
+            base=base,
+            target_name='Milonga',
+            icon="icon.ico"  # Opcjonalnie: ustaw ikonę aplikacji
+        )
+    ],
+)