diff --git a/MedLaunch/App.xaml b/MedLaunch/App.xaml
index 54b124d..c84ead4 100644
--- a/MedLaunch/App.xaml
+++ b/MedLaunch/App.xaml
@@ -10,7 +10,11 @@
         
         <ResourceDictionary>
             
-           
+           <!-- Groupbox styleing -->
+            <Style TargetType="GroupBox" BasedOn="{StaticResource MetroGroupBox}">
+                
+            </Style>
+            
             <!-- NumericUpDown Styling -->
             <Style x:Key="NoArrows" TargetType="{StaticResource MetroNumericUpDown}">
                 <Style.Triggers>
diff --git a/MedLaunch/Classes/MednaNet/DiscordChannels.cs b/MedLaunch/Classes/MednaNet/DiscordChannels.cs
new file mode 100644
index 0000000..2fa7301
--- /dev/null
+++ b/MedLaunch/Classes/MednaNet/DiscordChannels.cs
@@ -0,0 +1,102 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Documents;
+
+namespace MedLaunch.Classes.MednaNet
+{
+    public class DiscordChannels
+    {
+        public List<DiscordChannel> Data { get; set; }
+        public int ActiveChannel { get; set; }
+
+        public DiscordChannels()
+        {
+            Data = new List<DiscordChannel>();
+
+            Data = new List<DiscordChannel>
+            {
+                new DiscordChannel()
+                {
+                    ChannelId = 1,
+                    ChannelName = "general",
+                    Paragraph = new Paragraph()
+                },
+                new DiscordChannel()
+                {
+                    ChannelId = 5,
+                    ChannelName = "support",
+                    Paragraph = new Paragraph()
+                },
+                new DiscordChannel()
+                {
+                    ChannelId = 2,
+                    ChannelName = "notifications",
+                    Paragraph = new Paragraph()
+                },
+                new DiscordChannel()
+                {
+                    ChannelId = 3,
+                    ChannelName = "netplay",
+                    Paragraph = new Paragraph()
+                },
+                new DiscordChannel()
+                {
+                    ChannelId = 4,
+                    ChannelName = "development",
+                    Paragraph = new Paragraph()
+                },
+
+
+            };
+
+            /*
+            // temp data
+            for (int i = 1; i < 6; i++)
+            {
+                DiscordChannel d = new DiscordChannel();
+                d.ChannelId = i;
+                d.ChannelName = "Dynamic Channel " + i;
+                d.Paragraph = new Paragraph();
+                Data.Add(d);
+            }
+            */
+        }
+
+        /// <summary>
+        /// Adds or Updates specific discord channel data
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="name"></param>
+        /// <param name="paragraph"></param>
+        public void UpdateChannel(int id, string name, Paragraph paragraph)
+        {
+            var lookup = Data.Where(a => a.ChannelId == id).FirstOrDefault();
+
+            if (lookup == null)
+            {
+                // channel does not exist - add it to the collection
+                DiscordChannel dc = new DiscordChannel();
+                dc.ChannelId = id;
+                dc.ChannelName = name;
+                dc.Paragraph = new Paragraph();
+                Data.Add(dc);                
+            }
+            else
+            {
+                // channel already exists - update the paragraph
+                lookup.ChannelName = name;
+                lookup.Paragraph = paragraph;
+            }
+        }
+    }
+
+    public class DiscordChannel
+    {
+        public int ChannelId { get; set; }
+        public string ChannelName { get; set; }
+        public Paragraph Paragraph { get; set; }
+    }
+}
diff --git a/MedLaunch/Classes/MednaNet/DiscordMessage.cs b/MedLaunch/Classes/MednaNet/DiscordMessage.cs
new file mode 100644
index 0000000..78a6dc3
--- /dev/null
+++ b/MedLaunch/Classes/MednaNet/DiscordMessage.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MedLaunch.Classes.MednaNet
+{
+    public class DiscordMessage
+    {
+        public int messageId { get; set; }
+        public string code { get; set; }
+        public string message { get; set; }
+        public DateTime postedOn { get; set; }
+        public string name { get; set; }
+        public int channel { get; set; }
+        public int userId { get; set; }
+    }
+}
diff --git a/MedLaunch/Classes/MednaNet/DiscordUsers.cs b/MedLaunch/Classes/MednaNet/DiscordUsers.cs
new file mode 100644
index 0000000..7be57ec
--- /dev/null
+++ b/MedLaunch/Classes/MednaNet/DiscordUsers.cs
@@ -0,0 +1,137 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MedLaunch.Classes.MednaNet
+{
+    public class DiscordUsers
+    {
+        public List<DiscordUser> Users { get; set; }
+
+        public DiscordUsers()
+        {
+            Users = new List<DiscordUser>();
+
+            // temp data
+            Users = new List<DiscordUser>
+            {
+                new DiscordUser()
+                {
+                    UserId = 1,
+                    UserName = "D. Hicks",
+                    clientType = ClientType.discord,
+                    IsOnline = true
+                },
+                new DiscordUser()
+                {
+                    UserId = 2,
+                    UserName = "W. Hudson",
+                    clientType = ClientType.medlaunch,
+                    IsOnline = true
+                },
+                new DiscordUser()
+                {
+                    UserId = 3,
+                    UserName = "S. Gorman",
+                    clientType = ClientType.discord,
+                    IsOnline = true
+                },
+                new DiscordUser()
+                {
+                    UserId = 4,
+                    UserName = "J. Vasquez",
+                    clientType = ClientType.medlaunch,
+                    IsOnline = true
+                },
+                new DiscordUser()
+                {
+                    UserId = 100,
+                    UserName = "A. Apone",
+                    clientType = ClientType.discord,
+                    IsOnline = true
+                },
+                new DiscordUser()
+                {
+                    UserId = 200,
+                    UserName = "C. Ferro",
+                    clientType = ClientType.medlaunch,
+                    IsOnline = true
+                },
+                new DiscordUser()
+                {
+                    UserId = 300,
+                    UserName = "M. Drake",
+                    clientType = ClientType.discord,
+                    IsOnline = true
+                },
+                new DiscordUser()
+                {
+                    UserId = 37,
+                    UserName = "T. Crowe",
+                    clientType = ClientType.medlaunch,
+                    IsOnline = true
+                },
+                new DiscordUser()
+                {
+                    UserId = 3004,
+                    UserName = "T. Wierzbowski",
+                    clientType = ClientType.discord,
+                    IsOnline = true
+                },
+                new DiscordUser()
+                {
+                    UserId = 375,
+                    UserName = "R. Frost",
+                    clientType = ClientType.medlaunch,
+                    IsOnline = true
+                },
+                new DiscordUser()
+                {
+                    UserId = 37543,
+                    UserName = "D. Spunkmeyer",
+                    clientType = ClientType.medlaunch,
+                    IsOnline = true
+                },
+            };
+        }
+
+        public void UpdateUser(int userId, string userName, ClientType clientType, bool isOnline)
+        {
+            var lookup = Users.Where(a => a.UserId == userId).FirstOrDefault();
+
+            if (lookup == null)
+            {
+                // user does not exist - create
+                DiscordUser du = new DiscordUser();
+                du.UserId = userId;
+                du.UserName = userName;
+                du.clientType = clientType;
+                du.IsOnline = isOnline;
+                Users.Add(du);
+            }
+            else
+            {
+                // user already exists - update
+                lookup.UserName = userName;
+                lookup.clientType = clientType;
+                lookup.IsOnline = isOnline;
+            }
+        }
+    }
+
+    public class DiscordUser
+    {
+        public int UserId { get; set; }
+        public string UserName { get; set; }
+        public ClientType clientType { get; set; }
+        public bool IsOnline { get; set; }
+    }
+
+    public enum ClientType
+    {
+        medlaunch,
+        discord
+    }
+}
diff --git a/MedLaunch/Classes/MednaNet/DiscordVisualHandler.cs b/MedLaunch/Classes/MednaNet/DiscordVisualHandler.cs
index a2033f0..92db4c3 100644
--- a/MedLaunch/Classes/MednaNet/DiscordVisualHandler.cs
+++ b/MedLaunch/Classes/MednaNet/DiscordVisualHandler.cs
@@ -2,9 +2,16 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using System.Text.RegularExpressions;
+using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
 
 namespace MedLaunch.Classes.MednaNet
 {
@@ -12,22 +19,622 @@ public class DiscordVisualHandler
     {
         public MainWindow mw { get; set; }
         public List<RadioButton> ChannelRadios { get; set; }
-        public List<Button> UserButtons { get; set; }
+        public List<Label> UserButtons { get; set; }
         public TextBox tbDiscordName { get; set; }
+        public Label lblConnectedStatus { get; set; }
+        public Button btnDiscordConnect { get; set; }
+        public ScrollViewer scrlDiscordChannels { get; set; }
+        public ScrollViewer scrlDiscordUsers { get; set; }
+        public TextBox tbDiscordMessageBox { get; set; }
+        public Button btnDiscordChatSend { get; set; }
+        public RichTextBox rtbDocument { get; set; }
+        public StackPanel DiscordSelectorWrapPanel { get; set; }
+        public StackPanel DiscordUserListWrapPanel { get; set; }
+        public Expander expDiscordUsersOnline { get; set; }
 
+        private Paragraph paragraph { get; set; }
 
+        public DiscordChannels channels { get; set; }
+        public DiscordUsers users { get; set; }
+
+        public bool APIConnected { get; set; }
+
+        /// <summary>
+        /// default contructor
+        /// </summary>
         public DiscordVisualHandler()
         {
             mw = Application.Current.Windows.OfType<MainWindow>().FirstOrDefault();
 
+            APIConnected = false;
+
             // get misc controls
             tbDiscordName = (TextBox)mw.FindName("tbDiscordName");
+            btnDiscordConnect = (Button)mw.FindName("btnDiscordConnect");
+            scrlDiscordChannels = (ScrollViewer)mw.FindName("scrlDiscordChannels");
+            scrlDiscordUsers = (ScrollViewer)mw.FindName("scrlDiscordUsers");
+            tbDiscordMessageBox = (TextBox)mw.FindName("tbDiscordMessageBox");
+            btnDiscordChatSend = (Button)mw.FindName("btnDiscordChatSend");
+            DiscordSelectorWrapPanel = (StackPanel)mw.FindName("DiscordSelectorWrapPanel");
+            DiscordUserListWrapPanel = (StackPanel)mw.FindName("DiscordUserListWrapPanel");
+            expDiscordUsersOnline = (Expander)mw.FindName("expDiscordUsersOnline");
+
+            // chat text window
+            rtbDocument = (RichTextBox)mw.FindName("rtbDocument");
+
 
             // get channel radios
 
             // get user buttons
+
+            // get labels
+            lblConnectedStatus = (Label)mw.FindName("lblConnectedStatus");
+
+
+            // set connected status
+            SetConnectedStatus(false);
+
+            // initialise channels object (empty)
+            channels = new DiscordChannels();
+
+            // init user object (empty)
+            users = new DiscordUsers();
+
+            // initialise richtextbox
+            paragraph = new Paragraph();
+            rtbDocument.Document = new FlowDocument(paragraph);
+            rtbDocument.IsDocumentEnabled = true;
+
+            UpdateChannelButtons();
+            UpdateUsers();
+
+            
+        }
+
+        // non-static methods
+
+        public Paragraph GetChannelParagraph(int channelId)
+        {
+            var chan = channels.Data.Where(a => a.ChannelId == channelId).FirstOrDefault();
+            if (chan == null)
+                return null;
+
+            return chan.Paragraph;
+        }
+
+        /// <summary>
+        /// Begin sending a message to the chatbox
+        /// </summary>
+        /// <param name="message"></param>
+        public async void PostMessage(string message, int channelId)
+        {
+            // post message on another thread
+            ThreadPool.QueueUserWorkItem(o =>
+            {
+                ChatUpdater(message, channelId);
+            });
+        }
+
+        /// <summary>
+        /// Begin sending a message to the chatbox
+        /// </summary>
+        /// <param name="message"></param>
+        public async void PostMessage(DiscordMessage discordMessage)
+        {
+            // post message on another thread
+            ThreadPool.QueueUserWorkItem(o =>
+            {
+                ChatUpdater(discordMessage);
+            });
+        }
+
+        /// <summary>
+        /// update the chatbox
+        /// </summary>
+        /// <param name="message"></param>
+        private async void ChatUpdater(string message, int channelId)
+        {
+            await mw.Dispatcher.BeginInvoke((Action)(() =>
+            {
+                // get channel paragraph
+                var para = GetChannelParagraph(channelId);
+
+                para.Inlines.Add(message);
+                para.Inlines.Add(new LineBreak());
+            }));            
+        }
+
+        public void PostFromLocal(string message)
+        {
+            // build discordMessage object
+            DiscordMessage dm = new DiscordMessage();
+            dm.postedOn = DateTime.Now;
+            dm.name = tbDiscordName.Text;
+            dm.messageId = 0;
+            dm.message = message;
+            dm.channel = channels.ActiveChannel;
+            
+
+            // send to API
+            //not yet implemented
+
+            // send to chat window
+            PostMessage(dm);
+        }
+
+        /// <summary>
+        /// update the chatbox
+        /// </summary>
+        /// <param name="message"></param>
+        private async void ChatUpdater(DiscordMessage discordMessage)
+        {
+            await mw.Dispatcher.BeginInvoke((Action)(() =>
+            {
+                // get channel paragraph
+                var para = GetChannelParagraph(discordMessage.channel);
+
+                // timestamp
+                string stamp = discordMessage.postedOn.ToShortTimeString();
+                para.Inlines.Add(new Run(" " + stamp + " ")
+                {
+                    Foreground = Brushes.Silver
+                });
+
+                // get user client type
+                var usr = users.Users.Where(a => a.UserName == discordMessage.name).FirstOrDefault();
+
+                // username formatting
+                if (usr != null)
+                {
+                    if (usr.clientType == ClientType.discord)
+                    {
+                        para.Inlines.Add(new Run(" " + discordMessage.name + "   ")
+                        {
+                            Foreground = Brushes.AliceBlue
+                        });
+                    }
+                    else if (usr.clientType == ClientType.medlaunch)
+                    {
+                        para.Inlines.Add(new Run(" " + discordMessage.name + "   ")
+                        {
+                            Foreground = Brushes.ForestGreen
+                        });
+                    }
+                    else
+                    {
+                        // no formatting
+                        para.Inlines.Add(new Run(" " + discordMessage.name + "   "));
+                    }
+                }
+                else
+                {
+                    // user not listed in online users. local testing?
+                    para.Inlines.Add(new Bold(new Run(" " + discordMessage.name + "   "))
+                    {
+                        Foreground = Brushes.Red
+                    });
+                }
+
+                //para.Inlines.Add(discordMessage.message);
+                ParseMessage(para, discordMessage.message);
+                para.Inlines.Add(new LineBreak());
+            }));
+        }
+
+        public void ParseMessage(Paragraph para, string message)
+        {
+            DetectURLs(message, para);
+        }
+
+        private static readonly Regex UrlRegex = new Regex(@"(?#Protocol)(?:(?:ht|f)tp(?:s?)\:\/\/|~/|/)?(?#Username:Password)(?:\w+:\w+@)?(?#Subdomains)(?:(?:[-\w]+\.)+(?#TopLevel Domains)(?:com|org|net|gov|mil|biz|info|mobi|name|aero|jobs|museum|travel|[a-z]{2}))(?#Port)(?::[\d]{1,5})?(?#Directories)(?:(?:(?:/(?:[-\w~!$+|.,=]|%[a-f\d]{2})+)+|/)+|\?|#)?(?#Query)(?:(?:\?(?:[-\w~!$+|.,*:]|%[a-f\d{2}])+=(?:[-\w~!$+|.,*:=]|%[a-f\d]{2})*)(?:&amp;(?:[-\w~!$+|.,*:]|%[a-f\d{2}])+=(?:[-\w~!$+|.,*:=]|%[a-f\d]{2})*)*)*(?#Anchor)(?:#(?:[-\w~!$+|.,*:=]|%[a-f\d]{2})*)?");
+        
+        public void DetectURLs(string par, Paragraph para)
+        {
+            string paragraphText = par;
+
+            // Split the paragraph by words
+            string[] words = paragraphText.Split(' ');
+            List<int> positionToReplace = new List<int>();
+
+            //foreach (string word in paragraphText.Split(' ').ToList())
+
+            // iterate through each word
+            for (int i = 0; i < words.Length; i++)
+            {
+                if (!IsHyperlink(words[i]))
+                {
+                    // word is not a hyperlink - just post it
+                    para.Inlines.Add(words[i] + " ");
+                }
+                else
+                {
+                    // word is detected as a hyperlink
+                    positionToReplace.Add(i);
+
+                    Uri uri = new Uri(words[i], UriKind.RelativeOrAbsolute);
+
+                    if (!uri.IsAbsoluteUri)
+                    {
+                        // Prepend it with http
+                        uri = new Uri(@"http://" + words[i], UriKind.Absolute);
+                    }
+
+                    if (uri != null)
+                    {
+                        var link = new Hyperlink()
+                        {
+                            NavigateUri = uri,
+                        };
+                        link.IsEnabled = true;
+                        link.Inlines.Add(words[i]);
+                        link.Click += mw.Hyperlink_Click;
+
+                        // post the hyperlink
+                        para.Inlines.Add(link);
+                        para.Inlines.Add(" ");
+                    }
+                    else
+                    {
+                        //just post word
+                        para.Inlines.Add(words[i] + " ");
+                    }
+
+                    //
+                }
+            }
+        }
+
+        public static bool IsHyperlink(string word)
+        {
+            try
+            {
+                // First check to make sure the word has at least one of the characters we need to make a hyperlink
+                if (word.IndexOfAny(@":.\/".ToCharArray()) != -1)
+                {
+                    if (Uri.IsWellFormedUriString(word, UriKind.Absolute))
+                    {
+                        // The string is an Absolute URI
+                        return true;
+                    }
+                    else if (UrlRegex.IsMatch(word))
+                    {
+                        Uri uri = new Uri(word, UriKind.RelativeOrAbsolute);
+
+                        if (!uri.IsAbsoluteUri)
+                        {
+                            // rebuild it it with http to turn it into an Absolute URI
+                            uri = new Uri(@"http://" + word, UriKind.Absolute);
+                        }
+
+                        if (uri.IsAbsoluteUri)
+                        {
+                            return true;
+                        }
+                    }
+                    else
+                    {
+                        /*
+                        try
+                        {
+                            Uri wordUri = new Uri(word);
+
+                            // Check to see if URL is a network path
+                            if (wordUri.IsUnc || wordUri.IsFile)
+                            {
+                                return true;
+                            }
+                        }
+                        catch
+                        {
+                            return false;
+                        }
+                        */
+                        
+                    }
+                }
+
+                return false;
+            }
+            catch
+            {
+                return false;
+            }
+            
+        }
+
+        /// <summary>
+        /// writes to the chatbox with a different color (for system messages, etc)
+        /// </summary>
+        /// <param name="message"></param>
+        public void PostLocalOnlyMessage(string message)
+        {
+            // post to all paragraphs
+            RefreshChannels();
+            for (int i = 0; i < channels.Data.Count(); i++)
+            {
+                channels.Data[i].Paragraph.Inlines.Add(new Bold(new Italic(new Run("MedLaunch (local): " + message)))
+                {
+                    Foreground = Brushes.Red
+                });
+
+                channels.Data[i].Paragraph.Inlines.Add(new LineBreak());
+            }
+            /*
+            paragraph.Inlines.Add(new Bold(new Italic(new Run("MedLaunch (local): " + message)))
+            {
+                Foreground = Brushes.Red
+            });
+
+            paragraph.Inlines.Add(new LineBreak());
+            */
+        }
+
+
+        public void SetConnectedStatus(bool connectedstatus)
+        {
+            if (connectedstatus == true)
+            {
+                tbDiscordName.IsReadOnly = true;
+                tbDiscordName.IsEnabled = false;
+                lblConnectedStatus.Foreground = new SolidColorBrush(Colors.Green);
+                lblConnectedStatus.Content = "CONNECTED";
+                btnDiscordConnect.Content = "DISCONNECT";
+                DiscordUIState(UIState.enabled);
+            }
+                
+            else
+            {
+                tbDiscordName.IsEnabled = true;
+                tbDiscordName.IsReadOnly = false;
+                lblConnectedStatus.Foreground = new SolidColorBrush(Colors.Red);
+                lblConnectedStatus.Content = "DISCONNECTED";
+                btnDiscordConnect.Content = "CONNECT";
+                DiscordUIState(UIState.disabled);
+            }
+        }
+
+        private void DiscordUIState(UIState uiState)
+        {
+            if (uiState == UIState.enabled)
+            {
+                scrlDiscordChannels.Visibility = Visibility.Visible;
+                scrlDiscordUsers.Visibility = Visibility.Visible;
+                tbDiscordMessageBox.IsReadOnly = false;
+                tbDiscordMessageBox.IsEnabled = true;
+                btnDiscordChatSend.IsEnabled = true;
+                return;
+            }
+            
+            if (uiState == UIState.disabled)
+            {
+                scrlDiscordChannels.Visibility = Visibility.Collapsed;
+                scrlDiscordUsers.Visibility = Visibility.Collapsed;
+                tbDiscordMessageBox.IsReadOnly = true;
+                tbDiscordMessageBox.IsEnabled = false;
+                btnDiscordChatSend.IsEnabled = false;
+                return;
+            }
+        }
+
+        public enum UIState
+        {
+            enabled,
+            disabled
+        }
+
+        public async void UpdateUsers()
+        {
+            // call the refreshusers method on a different thread
+            ThreadPool.QueueUserWorkItem(o =>
+            {
+                RefreshUsers();
+            });
         }
 
+        public async void RefreshUsers()
+        {
+            await mw.Dispatcher.BeginInvoke((Action)(() =>
+            {
+                // get all user buttons
+                var controls = UIHandler.GetChildren(DiscordUserListWrapPanel);
+                UserButtons = controls.Labels;
+
+                // get a copy of the DiscordUsers data object
+                var usrs = users.Users.OrderBy(a => a.UserName).ToList();
+
+                // set online user count
+                expDiscordUsersOnline.Header = "USERS ONLINE (" + usrs.Count() + ")";
+
+                List<Label> bTemp = new List<Label>();
+
+                // iterate through each user
+                for (int i = 0; i < usrs.Count(); i++)
+                {
+                    // if the user button already exists, update it
+                    var cr = UserButtons.Where(a => a.Name == "btnDiscordUs" + usrs[i].UserId).FirstOrDefault();
+                    if (cr != null)
+                    {
+                        if (cr.Content.ToString() != usrs[i].UserName)
+                        {
+                            cr.Content = usrs[i].UserName;
+                            bTemp.Add(cr);
+                        }
+
+                        continue;
+                    }
+
+                    // update completed. now button creation..
+
+                    // create image
+                    Image img = new Image();
+                    if (usrs[i].clientType == ClientType.discord)
+                        img.Source = new BitmapImage(new Uri(@"Data/Graphics/Icons/usericon_discord.png", UriKind.Relative));
+                    else
+                        img.Source = new BitmapImage(new Uri(@"Data/Graphics/Icons/usericon_medlaunch.png", UriKind.Relative));
+                    img.Height = 20;
+                    img.Width = 20;
+                    img.HorizontalAlignment = HorizontalAlignment.Left;
+
+                    // textblock
+                    TextBlock tb = new TextBlock();
+                    tb.Text = usrs[i].UserName;
+                    Thickness margin = tb.Margin;
+                    margin.Left = 10;
+                    tb.Margin = margin;
+                    tb.VerticalAlignment = VerticalAlignment.Center;
+                    tb.HorizontalAlignment = HorizontalAlignment.Left;
+                    
+
+                    // button stackpanel
+                    StackPanel stackPnl = new StackPanel();
+                    stackPnl.Orientation = Orientation.Horizontal;
+                    stackPnl.HorizontalAlignment = HorizontalAlignment.Left;
+                    stackPnl.Children.Add(img);
+                    stackPnl.Children.Add(tb);
+
+                    Label l = new Label();
+                    l.Name = "btnDiscordUs" + usrs[i].UserId;
+                    l.Content = stackPnl;
+                    l.HorizontalAlignment = HorizontalAlignment.Left;
+                    l.HorizontalContentAlignment = HorizontalAlignment.Left;
+                    Thickness mar = l.Margin;
+                    mar.Bottom = 0;
+                    mar.Top = 0;
+                    mar.Left = 0;
+                    mar.Right = 0;
+                    l.Padding = new Thickness(0);
+
+                    if (usrs[i].clientType == ClientType.discord)
+                    {
+                        l.Foreground = (SolidColorBrush)(new BrushConverter().ConvertFrom("#7289DA"));
+                    }
+                        
+                    else if (usrs[i].clientType == ClientType.medlaunch)
+                    {
+                        // get the current primary color and set the user label as this
+                        var color = mw.discordChannelExpander.Background;
+                        l.Foreground = color;
+                    }
+                        
+
+                    DiscordUserListWrapPanel.Children.Add(l);
+
+                    /*
+                    // create the user button
+                    Button b = new Button();
+                    b.Name = "btnDiscordUs" + usrs[i].UserId;
+                    b.Content = stackPnl;
+                    b.HorizontalContentAlignment = HorizontalAlignment.Left;
+
+                    DiscordUserListWrapPanel.Children.Add(b);
+                    
+                    bTemp.Add(b);
+                    */
+                }
+
+            }));
+        }
+        
+        public async void UpdateChannelButtons()
+        {
+            // call the refreshchannels method on a different thread
+            ThreadPool.QueueUserWorkItem(o =>
+            {
+                RefreshChannels();
+            });
+        }
+
+        private async void RefreshChannels()
+        {
+            await mw.Dispatcher.BeginInvoke((Action)(() =>
+            {
+                // get all channel buttons
+                var controls = UIHandler.GetChildren(DiscordSelectorWrapPanel);
+                ChannelRadios = controls.RadioButtons;
+
+                // get a copy of the DiscordChannels data object
+                var chans = channels.Data.ToList();
+
+                List<RadioButton> rbTemp = new List<RadioButton>();
+
+                // iterate through each channel
+                for (int i = 0; i < chans.Count(); i++)
+                {
+                    // if the channel button already exists, update it
+                    var cr = ChannelRadios.Where(a => a.Name == "rbDiscordCh" + chans[i].ChannelId).FirstOrDefault();
+                    if (cr != null)
+                    {
+                        if (cr.Content.ToString() != chans[i].ChannelName)
+                        {
+                            cr.Content = chans[i].ChannelName;
+                            rbTemp.Add(cr);
+                        }
+                            
+                        continue;
+                    }
+
+                    // update completed. now button creation..
+
+                    // create the channel button
+                    RadioButton rb = new RadioButton();
+                    rb.Name = "rbDiscordCh" + chans[i].ChannelId;
+                    rb.Content = chans[i].ChannelName;
+                    rb.GroupName = "grpDiscordChannels";
+                    rb.AddHandler(Button.ClickEvent, new RoutedEventHandler(mw.btnDiscordChannel_Checked));
+
+                    // width binding
+                    /*
+                    Binding b = new Binding("Width");
+                    b.ElementName = "DiscordSelectorWrapPanel";
+                    b.Path = new PropertyPath(DiscordSelectorWrapPanel.Width);
+                    rb.SetBinding(FrameworkElement.WidthProperty, b);
+                    */
+
+                    // styling
+                    Style style = new Style(typeof(RadioButton));
+                    style.BasedOn = (Style)mw.TryFindResource(typeof(ToggleButton));
+                    rb.Style = style;
+
+                    // add button to UI
+                    DiscordSelectorWrapPanel.Children.Add(rb);
+
+                    rbTemp.Add(rb);
+                }
+
+                /*
+                // if active channel is not set, click the button
+                if (channels.ActiveChannel == 0)
+                {
+                    var chan = channels.Data.FirstOrDefault();
+                    if (chan != null)
+                    {
+                        RadioButton b = rbTemp.Where(a => a.Name == "rbDiscordCh" + chan.ChannelId).FirstOrDefault();
+                        if (b != null)
+                        {
+                            b.IsChecked = true;
+                        }
+                    }
+                }
+                */
+            }));
+        }
+
+        public void ChangeChannel(int channelId)
+        {
+            var chan = channels.Data.Where(a => a.ChannelId == channelId).FirstOrDefault();
+            if (chan == null)
+                return;
+
+            channels.ActiveChannel = channelId;
+
+            // set the flowdocument of the richtextbox to be the correct one for the selected channel
+            paragraph = chan.Paragraph;
+            rtbDocument.Document = new FlowDocument(paragraph);
+            rtbDocument.IsDocumentEnabled = true;
+        }
+
+        // static methods
+
         public static void Disconnected()
         {
 
diff --git a/MedLaunch/Classes/Scraper/ScraperHandler.cs b/MedLaunch/Classes/Scraper/ScraperHandler.cs
index 1932556..3e55232 100644
--- a/MedLaunch/Classes/Scraper/ScraperHandler.cs
+++ b/MedLaunch/Classes/Scraper/ScraperHandler.cs
@@ -450,7 +450,8 @@ public static void DownloadFile(string url, string localdir)
                 catch (Exception e)
                 {
                     Console.WriteLine(e);
-                    wc.Dispose();
+                    //wc.Dispose();
+                    return;
                 }
                 finally { wc.Dispose(); }
             }
diff --git a/MedLaunch/Classes/VisualHandlers/GamesLibraryVisualHandler.cs b/MedLaunch/Classes/VisualHandlers/GamesLibraryVisualHandler.cs
index f84b5b3..c8a00cc 100644
--- a/MedLaunch/Classes/VisualHandlers/GamesLibraryVisualHandler.cs
+++ b/MedLaunch/Classes/VisualHandlers/GamesLibraryVisualHandler.cs
@@ -40,6 +40,9 @@ public static void UpdateSidebar()
         {
             // no gameId specified - hide everything
             MainWindow mw = Application.Current.Windows.OfType<MainWindow>().FirstOrDefault();
+
+            //mw.sidebarColumn.Width = new GridLength(0);
+
             ScrollViewer sv = (ScrollViewer)mw.FindName("srcSidebar");
             sv.Visibility = Visibility.Collapsed;
             ColumnDefinition cd = (ColumnDefinition)mw.FindName("sidebarColumn");
@@ -95,13 +98,10 @@ public static async void DoSidebarUpdate(int gameId, MainWindow mw)
             var ga = Game.GetGame(gameId);
             if (ga == null)
                 return;
-
-            // get an instance of the MainWindow
-            //MainWindow mw = Application.Current.Windows.OfType<MainWindow>().FirstOrDefault();
-
+            
             // use dispatcher invoke to get to the UI thread
             await mw.Dispatcher.BeginInvoke((Action)(() =>
-            {
+            {                
                 // new instance of the LibrarySidebar class
                 LibrarySidebar lsb = new LibrarySidebar(gameId);
 
@@ -377,6 +377,9 @@ await mw.Dispatcher.BeginInvoke((Action)(() =>
                     brdSidebarFanArt.Visibility = Visibility.Collapsed;
                     brdSidebarOverview.Visibility = Visibility.Collapsed;
                     brdManuals.Visibility = Visibility.Collapsed;
+
+                    // set the sidebar width (as it will be wrong if the sidebar was previously hidden)
+                    mw.sidebarColumn.Width = new GridLength(mw.GamesSidebarWidth); // (GridLength)glcon.ConvertFrom(mw.GamesSidebarWidth);
                     return;
                 }
                 else
@@ -700,6 +703,9 @@ await mw.Dispatcher.BeginInvoke((Action)(() =>
                     else
                         brdManuals.Visibility = Visibility.Visible;
 
+                    // set the sidebar width (as it will be wrong if the sidebar was previously hidden)
+                    mw.sidebarColumn.Width = new GridLength(mw.GamesSidebarWidth); // (GridLength)glcon.ConvertFrom(mw.GamesSidebarWidth);
+
                 }
             }));
 
diff --git a/MedLaunch/Data/Graphics/Icons/usericon_discord.png b/MedLaunch/Data/Graphics/Icons/usericon_discord.png
new file mode 100644
index 0000000..1101855
Binary files /dev/null and b/MedLaunch/Data/Graphics/Icons/usericon_discord.png differ
diff --git a/MedLaunch/Data/Graphics/Icons/usericon_medlaunch.png b/MedLaunch/Data/Graphics/Icons/usericon_medlaunch.png
new file mode 100644
index 0000000..b20bf20
Binary files /dev/null and b/MedLaunch/Data/Graphics/Icons/usericon_medlaunch.png differ
diff --git a/MedLaunch/MainWindow.xaml b/MedLaunch/MainWindow.xaml
index ce804da..66963f8 100644
--- a/MedLaunch/MainWindow.xaml
+++ b/MedLaunch/MainWindow.xaml
@@ -12,7 +12,7 @@
         xmlns:i="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity" 
 xmlns:ic="clr-namespace:Microsoft.Expression.Interactivity.Core;assembly=Microsoft.Expression.Interactions" 
 xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Microsoft.Expression.Interactions"          
-        
+        TextOptions.TextFormattingMode="Display"
         mc:Ignorable="d"
         xmlns:Controls="clr-namespace:MahApps.Metro.Controls;assembly=MahApps.Metro"
         Title="MedLaunch - Windows Front-End for Mednafen (This string is replaced at runtime)" 
@@ -261,11 +261,12 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
                 CenterY="0"
                 />
         </Grid.LayoutTransform>
+        
+        <!--
         <Grid.Background>
-            <ImageBrush ImageSource="/Data/Graphics/medicon.png" Opacity="0.1" />
+            <ImageBrush ImageSource="/Data/Graphics/medicon.png" Opacity="0.1" TileMode="None" ViewboxUnits="Absolute" Viewport="0,0,32,32" />
         </Grid.Background>
-
-
+-->
 
         <TabControl SelectionChanged="TabControl_SelectionChanged">
             <TabItem Header="Games">
@@ -273,8 +274,9 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="Auto" />
                         <ColumnDefinition Width="0" />
-                        <ColumnDefinition Width="0.9*" />
-                        <ColumnDefinition Width="0.6*" Name="sidebarColumn" />
+                        <ColumnDefinition Width="0.9*" MinWidth="250" />
+                        <ColumnDefinition Width="Auto" Name="gsRight" />
+                        <ColumnDefinition Width="350" Name="sidebarColumn" MaxWidth="1050" />
                     </Grid.ColumnDefinitions>
                     <!--<TextBlock FontSize="55" HorizontalAlignment="Center" VerticalAlignment="Center" TextWrapping="Wrap">Left side</TextBlock>-->
                     <WrapPanel Orientation="Vertical" Grid.Column="0" Margin="0" x:FieldModifier="public" x:Name="wpGamesList">
@@ -728,10 +730,12 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
 
                     </Grid>
 
+                    <GridSplitter Name="gamesSidebarGS" Grid.Column="3" Width="1" HorizontalAlignment="Stretch" Background="{DynamicResource AccentColorBrush}"
+                                  DragCompleted="gamesSidebarGS_DragCompleted" Margin="5"/>
 
-                    <Grid x:Name="grdGamesSidebar" Grid.Column="3">
+                    <Grid x:Name="grdGamesSidebar" Grid.Column="4">
                         <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="*"  />
+                            <ColumnDefinition  />
 
                         </Grid.ColumnDefinitions>
                         <Grid.RowDefinitions>
@@ -2130,12 +2134,12 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
 
 
 
-                        <ScrollViewer Grid.Row="0" VerticalScrollBarVisibility="Disabled" HorizontalScrollBarVisibility="Auto" Width="{Binding ElementName=configGrid, Path=ActualWidth}" Height="{Binding ElementName=configGrid, Path=ActualHeight}">
-                            <WrapPanel HorizontalAlignment="Left" Orientation="Vertical" x:Name="ConfigWrapPanel">
+                        <ScrollViewer Grid.Row="0" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled" Width="{Binding ElementName=configGrid, Path=ActualWidth}" Height="{Binding ElementName=configGrid, Path=ActualHeight}">
+                            <WrapPanel HorizontalAlignment="Left" Orientation="Horizontal" x:Name="ConfigWrapPanel">
 
                                 <!-- General Border -->
                                 <Border Style="{StaticResource Borders1}" Margin="10">
-                                    <Expander IsExpanded="True" BorderThickness="0" Header="General">
+                                    <GroupBox Margin="0" BorderThickness="0" Header="General">
                                         <StackPanel Margin="10">
 
                                             <CheckBox Name="cfg_autosave">Autosave</CheckBox>
@@ -2191,11 +2195,11 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
                                             <CheckBox Name="cfg_debugger__autostepmode" Grid.Row="4" Grid.ColumnSpan="2">Debugger Auto-Step Mode</CheckBox>
 
                                         </StackPanel>
-                                    </Expander>
+                                    </GroupBox>
                                 </Border>
                                 <!-- Audio Border -->
                                 <Border Style="{StaticResource Borders1}" Margin="10">
-                                    <Expander IsExpanded="True" BorderThickness="0" Header="Audio">
+                                    <GroupBox Margin="0"  BorderThickness="0" Header="Audio">
                                         <StackPanel Margin="10">
 
 
@@ -2271,11 +2275,11 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
                                             </Grid>
 
                                         </StackPanel>
-                                    </Expander>
+                                    </GroupBox>
                                 </Border>
                                 <!-- OSD Border -->
                                 <Border Style="{StaticResource Borders1}" Margin="10">
-                                    <Expander IsExpanded="True" BorderThickness="0" Header="OSD">
+                                    <GroupBox Margin="0"  BorderThickness="0" Header="OSD">
                                         <StackPanel Margin="10">
 
 
@@ -2314,11 +2318,11 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
 
 
                                         </StackPanel>
-                                    </Expander>
+                                    </GroupBox>
                                 </Border>
                                 <!-- Video Border -->
                                 <Border Style="{StaticResource Borders1}" Margin="10">
-                                    <Expander IsExpanded="True" BorderThickness="0" Header="Video">
+                                    <GroupBox Margin="0" BorderThickness="0" Header="Video">
                                         <StackPanel Margin="10">
 
 
@@ -2357,12 +2361,12 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
 
 
                                         </StackPanel>
-                                    </Expander>
+                                    </GroupBox>
                                 </Border>
 
                                 <!-- Control Border -->
                                 <Border Style="{StaticResource Borders1}" Margin="10">
-                                    <Expander IsExpanded="True" BorderThickness="0" Header="Control">
+                                    <GroupBox Margin="0" BorderThickness="0" Header="Control">
                                         <StackPanel Margin="10">
 
 
@@ -2406,7 +2410,7 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
 
                                             </Grid>
                                         </StackPanel>
-                                    </Expander>
+                                    </GroupBox>
                                 </Border>
 
                                 <!-- System specific settings - only show when system config is selected -->
@@ -2414,7 +2418,7 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
                                 <!-- lynx -->
 
                                 <Border Style="{StaticResource Borders1}" x:Name="brdSpecificLynx2" Margin="10">
-                                    <Expander IsExpanded="True" BorderThickness="0" Header="Lynx Filters/Misc">
+                                    <GroupBox Margin="0" BorderThickness="0" Header="Lynx Filters/Misc">
 
                                         <StackPanel>
                                             <CheckBox x:Name="cfg_lynx__enable">Enable (Automatic) Usage of this module</CheckBox>
@@ -2503,11 +2507,11 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
                                             </Grid>
 
                                         </StackPanel>
-                                    </Expander>
+                                    </GroupBox>
                                 </Border>
 
                                 <Border Style="{StaticResource Borders1}" x:Name="brdSpecificLynx99" Margin="10">
-                                    <Expander IsExpanded="True" BorderThickness="0" Header="Lynx OGL Goat Filter Settings">
+                                    <GroupBox Margin="0" BorderThickness="0" Header="Lynx OGL Goat Filter Settings">
 
                                         <StackPanel>
                                             <CheckBox x:Name="cfg_lynx__shader__goat__fprog">Force Interlaced Video to be Treated as Progressive</CheckBox>
@@ -2585,11 +2589,11 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
                                             </Grid>
 
                                         </StackPanel>
-                                    </Expander>
+                                    </GroupBox>
                                 </Border>
 
                                 <Border Style="{StaticResource Borders1}" x:Name="brdSpecificLynx3" Margin="10">
-                                    <Expander IsExpanded="True" BorderThickness="0" Header="Lynx Resolution">
+                                    <GroupBox Margin="0" BorderThickness="0" Header="Lynx Resolution">
 
                                         <StackPanel>
 
@@ -2685,21 +2689,21 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
                                                 </Grid>
                                             </Grid>
                                         </StackPanel>
-                                    </Expander>
+                                    </GroupBox>
                                 </Border>
 
                                 <Border Style="{StaticResource Borders1}" x:Name="brdSpecificLynx1" Margin="10">
-                                    <Expander IsExpanded="True" BorderThickness="0" Header="Lynx Specific Settings">
+                                    <GroupBox Margin="0" BorderThickness="0" Header="Lynx Specific Settings">
                                         <StackPanel Margin="10">
                                             <CheckBox x:Name="cfg_lynx__lowpass">Enable Lowpass Filter (sound)</CheckBox>
                                             <CheckBox x:Name="cfg_lynx__rotateinput">Rotate D-Pad with Screen</CheckBox>
                                         </StackPanel>
-                                    </Expander>
+                                    </GroupBox>
                                 </Border>
 
                                 <!-- gg -->
                                 <Border Style="{StaticResource Borders1}" x:Name="brdSpecificGg1" Margin="10">
-                                    <Expander IsExpanded="True" BorderThickness="0" Header="Game Gear Filters/Misc">
+                                    <GroupBox Margin="0" BorderThickness="0" Header="Game Gear Filters/Misc">
 
                                         <StackPanel>
                                             <CheckBox x:Name="cfg_gg__enable">Enable (Automatic) Usage of this module</CheckBox>
@@ -2788,11 +2792,11 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
                                             </Grid>
 
                                         </StackPanel>
-                                    </Expander>
+                                    </GroupBox>
                                 </Border>
 
                                 <Border Style="{StaticResource Borders1}" x:Name="brdSpecificGg99" Margin="10">
-                                    <Expander IsExpanded="True" BorderThickness="0" Header="GG OGL Goat Filter Settings">
+                                    <GroupBox Margin="0" BorderThickness="0" Header="GG OGL Goat Filter Settings">
 
                                         <StackPanel>
                                             <CheckBox x:Name="cfg_gg__shader__goat__fprog">Force Interlaced Video to be Treated as Progressive</CheckBox>
@@ -2870,11 +2874,11 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
                                             </Grid>
 
                                         </StackPanel>
-                                    </Expander>
+                                    </GroupBox>
                                 </Border>
 
                                 <Border Style="{StaticResource Borders1}" x:Name="brdSpecificGg2" Margin="10">
-                                    <Expander IsExpanded="True" BorderThickness="0" Header="Game Gear Resolution">
+                                    <GroupBox Margin="0" BorderThickness="0" Header="Game Gear Resolution">
 
                                         <StackPanel>
 
@@ -2970,14 +2974,14 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
                                                 </Grid>
                                             </Grid>
                                         </StackPanel>
-                                    </Expander>
+                                    </GroupBox>
                                 </Border>
 
 
                                 <!-- gb -->
 
                                 <Border Style="{StaticResource Borders1}" x:Name="brdSpecificGb2" Margin="10">
-                                    <Expander IsExpanded="True" BorderThickness="0" Header="Gameboy Filters/Misc">
+                                    <GroupBox Margin="0" BorderThickness="0" Header="Gameboy Filters/Misc">
 
                                         <StackPanel>
                                             <CheckBox x:Name="cfg_gb__enable">Enable (Automatic) Usage of this module</CheckBox>
@@ -3066,11 +3070,11 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
                                             </Grid>
 
                                         </StackPanel>
-                                    </Expander>
+                                    </GroupBox>
                                 </Border>
 
                                 <Border Style="{StaticResource Borders1}" x:Name="brdSpecificGb99" Margin="10">
-                                    <Expander IsExpanded="True" BorderThickness="0" Header="GB OGL Goat Filter Settings">
+                                    <GroupBox Margin="0" BorderThickness="0" Header="GB OGL Goat Filter Settings">
 
                                         <StackPanel>
                                             <CheckBox x:Name="cfg_gb__shader__goat__fprog">Force Interlaced Video to be Treated as Progressive</CheckBox>
@@ -3148,11 +3152,11 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
                                             </Grid>
 
                                         </StackPanel>
-                                    </Expander>
+                                    </GroupBox>
                                 </Border>
 
                                 <Border Style="{StaticResource Borders1}" x:Name="brdSpecificGb3" Margin="10">
-                                    <Expander IsExpanded="True" BorderThickness="0" Header="Gameboy Resolution">
+                                    <GroupBox Margin="0" BorderThickness="0" Header="Gameboy Resolution">
 
                                         <StackPanel>
 
@@ -3248,11 +3252,11 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
                                                 </Grid>
                                             </Grid>
                                         </StackPanel>
-                                    </Expander>
+                                    </GroupBox>
                                 </Border>
 
                                 <Border Style="{StaticResource Borders1}" x:Name="brdSpecificGb1" Margin="10">
-                                    <Expander IsExpanded="True" BorderThickness="0" Header="Gameboy Specific Settings">
+                                    <GroupBox Margin="0" BorderThickness="0" Header="Gameboy Specific Settings">
                                         <StackPanel Margin="10">
                                             <Grid Margin="0">
                                                 <Grid.ColumnDefinitions>
@@ -3271,13 +3275,13 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
                                                 </ComboBox>
                                             </Grid>
                                         </StackPanel>
-                                    </Expander>
+                                    </GroupBox>
                                 </Border>
 
 
                                 <!-- gba -->
                                 <Border Style="{StaticResource Borders1}" x:Name="brdSpecificGba1" Margin="10">
-                                    <Expander IsExpanded="True" BorderThickness="0" Header="Gameboy Advance Filters/Misc">
+                                    <GroupBox Margin="0" BorderThickness="0" Header="Gameboy Advance Filters/Misc">
 
                                         <StackPanel>
                                             <CheckBox x:Name="cfg_gba__enable">Enable (Automatic) Usage of this module</CheckBox>
@@ -3366,11 +3370,11 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
                                             </Grid>
 
                                         </StackPanel>
-                                    </Expander>
+                                    </GroupBox>
                                 </Border>
 
                                 <Border Style="{StaticResource Borders1}" x:Name="brdSpecificGba99" Margin="10">
-                                    <Expander IsExpanded="True" BorderThickness="0" Header="GBA OGL Goat Filter Settings">
+                                    <GroupBox Margin="0" BorderThickness="0" Header="GBA OGL Goat Filter Settings">
 
                                         <StackPanel>
                                             <CheckBox x:Name="cfg_gba__shader__goat__fprog">Force Interlaced Video to be Treated as Progressive</CheckBox>
@@ -3448,11 +3452,11 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
                                             </Grid>
 
                                         </StackPanel>
-                                    </Expander>
+                                    </GroupBox>
                                 </Border>
 
                                 <Border Style="{StaticResource Borders1}" x:Name="brdSpecificGba2" Margin="10">
-                                    <Expander IsExpanded="True" BorderThickness="0" Header="Gameboy Advance Resolution">
+                                    <GroupBox Margin="0" BorderThickness="0" Header="Gameboy Advance Resolution">
 
                                         <StackPanel>
 
@@ -3548,13 +3552,13 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
                                                 </Grid>
                                             </Grid>
                                         </StackPanel>
-                                    </Expander>
+                                    </GroupBox>
                                 </Border>
 
                                 <!-- ngp -->
 
                                 <Border Style="{StaticResource Borders1}" x:Name="brdSpecificNgp2" Margin="10">
-                                    <Expander IsExpanded="True" BorderThickness="0" Header="NGP Filters/Misc">
+                                    <GroupBox Margin="0" BorderThickness="0" Header="NGP Filters/Misc">
 
                                         <StackPanel>
                                             <CheckBox x:Name="cfg_ngp__enable">Enable (Automatic) Usage of this module</CheckBox>
@@ -3643,11 +3647,11 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
                                             </Grid>
 
                                         </StackPanel>
-                                    </Expander>
+                                    </GroupBox>
                                 </Border>
 
                                 <Border Style="{StaticResource Borders1}" x:Name="brdSpecificNgp99" Margin="10">
-                                    <Expander IsExpanded="True" BorderThickness="0" Header="NGP OGL Goat Filter Settings">
+                                    <GroupBox Margin="0" BorderThickness="0" Header="NGP OGL Goat Filter Settings">
 
                                         <StackPanel>
                                             <CheckBox x:Name="cfg_ngp__shader__goat__fprog">Force Interlaced Video to be Treated as Progressive</CheckBox>
@@ -3725,11 +3729,11 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
                                             </Grid>
 
                                         </StackPanel>
-                                    </Expander>
+                                    </GroupBox>
                                 </Border>
 
                                 <Border Style="{StaticResource Borders1}" x:Name="brdSpecificNgp3" Margin="10">
-                                    <Expander IsExpanded="True" BorderThickness="0" Header="NGP Resolution">
+                                    <GroupBox Margin="0" BorderThickness="0" Header="NGP Resolution">
 
                                         <StackPanel>
 
@@ -3825,11 +3829,11 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
                                                 </Grid>
                                             </Grid>
                                         </StackPanel>
-                                    </Expander>
+                                    </GroupBox>
                                 </Border>
 
                                 <Border Style="{StaticResource Borders1}" x:Name="brdSpecificNgp1" Margin="10">
-                                    <Expander IsExpanded="True" BorderThickness="0" Header="NeoGeo Pocket Specific Settings">
+                                    <GroupBox Margin="0" BorderThickness="0" Header="NeoGeo Pocket Specific Settings">
                                         <StackPanel Margin="10">
                                             <Grid Margin="0">
                                                 <Grid.ColumnDefinitions>
@@ -3846,13 +3850,13 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
                                                 </ComboBox>
                                             </Grid>
                                         </StackPanel>
-                                    </Expander>
+                                    </GroupBox>
                                 </Border>
 
                                 <!-- nes -->
 
                                 <Border Style="{StaticResource Borders1}" x:Name="brdSpecificNes5" Margin="10">
-                                    <Expander IsExpanded="True" BorderThickness="0" Header="NES Filters/Misc">
+                                    <GroupBox Margin="0" BorderThickness="0" Header="NES Filters/Misc">
 
                                         <StackPanel>
                                             <CheckBox x:Name="cfg_nes__enable">Enable (Automatic) Usage of this module</CheckBox>
@@ -3940,11 +3944,11 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
                                             </Grid>
 
                                         </StackPanel>
-                                    </Expander>
+                                    </GroupBox>
                                 </Border>
 
                                 <Border Style="{StaticResource Borders1}" x:Name="brdSpecificNes99" Margin="10">
-                                    <Expander IsExpanded="True" BorderThickness="0" Header="NES OGL Goat Filter Settings">
+                                    <GroupBox Margin="0" BorderThickness="0" Header="NES OGL Goat Filter Settings">
 
                                         <StackPanel>
                                             <CheckBox x:Name="cfg_nes__shader__goat__fprog">Force Interlaced Video to be Treated as Progressive</CheckBox>
@@ -4022,11 +4026,11 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
                                             </Grid>
 
                                         </StackPanel>
-                                    </Expander>
+                                    </GroupBox>
                                 </Border>
 
                                 <Border Style="{StaticResource Borders1}" x:Name="brdSpecificNes6" Margin="10">
-                                    <Expander IsExpanded="True" BorderThickness="0" Header="NES Resolution">
+                                    <GroupBox Margin="0" BorderThickness="0" Header="NES Resolution">
 
                                         <StackPanel>
 
@@ -4122,11 +4126,11 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
                                                 </Grid>
                                             </Grid>
                                         </StackPanel>
-                                    </Expander>
+                                    </GroupBox>
                                 </Border>
 
                                 <Border Style="{StaticResource Borders1}" x:Name="brdSpecificNes1" Margin="10">
-                                    <Expander IsExpanded="True" BorderThickness="0" Header="NES Specific General Settings">
+                                    <GroupBox Margin="0" BorderThickness="0" Header="NES Specific General Settings">
                                         <StackPanel Margin="10">
 
                                             <CheckBox x:Name="cfg_nes__fnscan">Filname-based PAL Detection</CheckBox>
@@ -4237,11 +4241,11 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
 
                                             </Grid>
                                         </StackPanel>
-                                    </Expander>
+                                    </GroupBox>
                                 </Border>
 
                                 <Border Style="{StaticResource Borders1}" x:Name="brdSpecificNes2" Margin="10">
-                                    <Expander IsExpanded="True" BorderThickness="0" Header="NES NTSC Advanced">
+                                    <GroupBox Margin="0" BorderThickness="0" Header="NES NTSC Advanced">
                                         <StackPanel Margin="10">
 
                                             <CheckBox x:Name="cfg_nes__ntsc__matrix">NTSC Custom Decoder Matrix</CheckBox>
@@ -4306,11 +4310,11 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
 
                                             </Grid>
                                         </StackPanel>
-                                    </Expander>
+                                    </GroupBox>
                                 </Border>
 
                                 <Border Style="{StaticResource Borders1}" x:Name="brdSpecificNes3" Margin="10">
-                                    <Expander IsExpanded="True" BorderThickness="0" Header="NES Specific Video Settings">
+                                    <GroupBox Margin="0" BorderThickness="0" Header="NES Specific Video Settings">
                                         <StackPanel Margin="10">
 
                                             <CheckBox x:Name="cfg_nes__pal">Enable PAL (50Hz) Emulation</CheckBox>
@@ -4378,11 +4382,11 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
 
                                             </Grid>
                                         </StackPanel>
-                                    </Expander>
+                                    </GroupBox>
                                 </Border>
 
                                 <Border Style="{StaticResource Borders1}" x:Name="brdSpecificNes4" Margin="10">
-                                    <Expander IsExpanded="True" BorderThickness="0" Header="NES Video Settings (Cont.)">
+                                    <GroupBox Margin="0" BorderThickness="0" Header="NES Video Settings (Cont.)">
                                         <StackPanel Margin="10">
 
 
@@ -4432,7 +4436,7 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
 
                                             </Grid>
                                         </StackPanel>
-                                    </Expander>
+                                    </GroupBox>
                                 </Border>
 
 
@@ -4440,7 +4444,7 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
                                 <!-- pce_fast -->
 
                                 <Border Style="{StaticResource Borders1}" x:Name="brdSpecificPce_fast3" Margin="10">
-                                    <Expander IsExpanded="True" BorderThickness="0" Header="PC-Engine (fast) Filters/Misc">
+                                    <GroupBox Margin="0" BorderThickness="0" Header="PC-Engine (fast) Filters/Misc">
 
                                         <StackPanel>
                                             <CheckBox x:Name="cfg_pce_fast__enable">Enable (Automatic) Usage of this module</CheckBox>
@@ -4529,11 +4533,11 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
                                             </Grid>
 
                                         </StackPanel>
-                                    </Expander>
+                                    </GroupBox>
                                 </Border>
 
                                 <Border Style="{StaticResource Borders1}" x:Name="brdSpecificPce_fast99" Margin="10">
-                                    <Expander IsExpanded="True" BorderThickness="0" Header="PCE (Fast) OGL Goat Filter Settings">
+                                    <GroupBox Margin="0" BorderThickness="0" Header="PCE (Fast) OGL Goat Filter Settings">
 
                                         <StackPanel>
                                             <CheckBox x:Name="cfg_pce_fast__shader__goat__fprog">Force Interlaced Video to be Treated as Progressive</CheckBox>
@@ -4611,11 +4615,11 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
                                             </Grid>
 
                                         </StackPanel>
-                                    </Expander>
+                                    </GroupBox>
                                 </Border>
 
                                 <Border Style="{StaticResource Borders1}" x:Name="brdSpecificPce_fast4" Margin="10">
-                                    <Expander IsExpanded="True" BorderThickness="0" Header="PC-Engine (fast) Resolution">
+                                    <GroupBox Margin="0" BorderThickness="0" Header="PC-Engine (fast) Resolution">
 
                                         <StackPanel>
 
@@ -4711,12 +4715,12 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
                                                 </Grid>
                                             </Grid>
                                         </StackPanel>
-                                    </Expander>
+                                    </GroupBox>
                                 </Border>
 
 
                                 <Border Style="{StaticResource Borders1}" x:Name="brdSpecificPce_fast1" Margin="10">
-                                    <Expander IsExpanded="True" BorderThickness="0" Header="PC-Engine (fast) Specific Settings">
+                                    <GroupBox Margin="0" BorderThickness="0" Header="PC-Engine (fast) Specific Settings">
                                         <StackPanel Margin="10">
 
                                             <CheckBox x:Name="cfg_pce_fast__arcadecard">Arcade Card Emulation</CheckBox>
@@ -4776,11 +4780,11 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
 
                                             </Grid>
                                         </StackPanel>
-                                    </Expander>
+                                    </GroupBox>
                                 </Border>
 
                                 <Border Style="{StaticResource Borders1}" x:Name="brdSpecificPce_fast2" Margin="10">
-                                    <Expander IsExpanded="True" BorderThickness="0" Header="PC-Engine (fast) Continued">
+                                    <GroupBox Margin="0" BorderThickness="0" Header="PC-Engine (fast) Continued">
                                         <StackPanel Margin="10">
                                             <Grid Margin="0">
                                                 <Grid.ColumnDefinitions>
@@ -4867,7 +4871,7 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
                                                 </DockPanel>
                                             </Grid>
                                         </StackPanel>
-                                    </Expander>
+                                    </GroupBox>
                                 </Border>
 
 
@@ -4875,7 +4879,7 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
                                 <!-- pce -->
 
                                 <Border Style="{StaticResource Borders1}" x:Name="brdSpecificPce3" Margin="10">
-                                    <Expander IsExpanded="True" BorderThickness="0" Header="PC-Engine Filters/Misc">
+                                    <GroupBox Margin="0" BorderThickness="0" Header="PC-Engine Filters/Misc">
 
                                         <StackPanel>
                                             <CheckBox x:Name="cfg_pce__enable">Enable (Automatic) Usage of this module</CheckBox>
@@ -4964,11 +4968,11 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
                                             </Grid>
 
                                         </StackPanel>
-                                    </Expander>
+                                    </GroupBox>
                                 </Border>
 
                                 <Border Style="{StaticResource Borders1}" x:Name="brdSpecificPce99" Margin="10">
-                                    <Expander IsExpanded="True" BorderThickness="0" Header="PCE OGL Goat Filter Settings">
+                                    <GroupBox Margin="0" BorderThickness="0" Header="PCE OGL Goat Filter Settings">
 
                                         <StackPanel>
                                             <CheckBox x:Name="cfg_pce__shader__goat__fprog">Force Interlaced Video to be Treated as Progressive</CheckBox>
@@ -5046,11 +5050,11 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
                                             </Grid>
 
                                         </StackPanel>
-                                    </Expander>
+                                    </GroupBox>
                                 </Border>
 
                                 <Border Style="{StaticResource Borders1}" x:Name="brdSpecificPce4" Margin="10">
-                                    <Expander IsExpanded="True" BorderThickness="0" Header="PC-Engine Resolution">
+                                    <GroupBox Margin="0" BorderThickness="0" Header="PC-Engine Resolution">
 
                                         <StackPanel>
 
@@ -5146,12 +5150,12 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
                                                 </Grid>
                                             </Grid>
                                         </StackPanel>
-                                    </Expander>
+                                    </GroupBox>
                                 </Border>
 
 
                                 <Border Style="{StaticResource Borders1}" x:Name="brdSpecificPce1" Margin="10">
-                                    <Expander IsExpanded="True" BorderThickness="0" Header="PC-Engine Specific Settings">
+                                    <GroupBox Margin="0" BorderThickness="0" Header="PC-Engine Specific Settings">
                                         <StackPanel Margin="10">
 
                                             <CheckBox x:Name="cfg_pce__arcadecard">Arcade Card Emulation</CheckBox>
@@ -5224,11 +5228,11 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
 
                                             </Grid>
                                         </StackPanel>
-                                    </Expander>
+                                    </GroupBox>
                                 </Border>
 
                                 <Border Style="{StaticResource Borders1}" x:Name="brdSpecificPce2" Margin="10">
-                                    <Expander IsExpanded="True" BorderThickness="0" Header="PC-Engine Continued">
+                                    <GroupBox Margin="0" BorderThickness="0" Header="PC-Engine Continued">
                                         <StackPanel Margin="10">
 
 
@@ -5347,7 +5351,7 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
                                                 <TextBox x:Name="cfg_pce__debugger__memcharenc" Grid.Column="1" Grid.Row="15" />
                                             </Grid>
                                         </StackPanel>
-                                    </Expander>
+                                    </GroupBox>
                                 </Border>
 
 
@@ -5357,7 +5361,7 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
 
 
                                 <Border Style="{StaticResource Borders1}" x:Name="brdSpecificPcfx4" Margin="10">
-                                    <Expander IsExpanded="True" BorderThickness="0" Header="PC-FX Filters/Misc">
+                                    <GroupBox Margin="0" BorderThickness="0" Header="PC-FX Filters/Misc">
 
                                         <StackPanel>
                                             <CheckBox x:Name="cfg_pcfx__enable">Enable (Automatic) Usage of this module</CheckBox>
@@ -5446,11 +5450,11 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
                                             </Grid>
 
                                         </StackPanel>
-                                    </Expander>
+                                    </GroupBox>
                                 </Border>
 
                                 <Border Style="{StaticResource Borders1}" x:Name="brdSpecificPcfx99" Margin="10">
-                                    <Expander IsExpanded="True" BorderThickness="0" Header="PCFX OGL Goat Filter Settings">
+                                    <GroupBox Margin="0" BorderThickness="0" Header="PCFX OGL Goat Filter Settings">
 
                                         <StackPanel>
                                             <CheckBox x:Name="cfg_pcfx__shader__goat__fprog">Force Interlaced Video to be Treated as Progressive</CheckBox>
@@ -5528,11 +5532,11 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
                                             </Grid>
 
                                         </StackPanel>
-                                    </Expander>
+                                    </GroupBox>
                                 </Border>
 
                                 <Border Style="{StaticResource Borders1}" x:Name="brdSpecificPcfx3" Margin="10">
-                                    <Expander IsExpanded="True" BorderThickness="0" Header="PC-FX Resolution">
+                                    <GroupBox Margin="0" BorderThickness="0" Header="PC-FX Resolution">
 
                                         <StackPanel>
 
@@ -5628,11 +5632,11 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
                                                 </Grid>
                                             </Grid>
                                         </StackPanel>
-                                    </Expander>
+                                    </GroupBox>
                                 </Border>
 
                                 <Border Style="{StaticResource Borders1}" x:Name="brdSpecificPcfx1" Margin="10">
-                                    <Expander IsExpanded="True" BorderThickness="0" Header="PC-FX Specific Settings">
+                                    <GroupBox Margin="0" BorderThickness="0" Header="PC-FX Specific Settings">
                                         <StackPanel Margin="10">
 
                                             <CheckBox x:Name="cfg_pcfx__adpcm__emulate_buggy_codec">Buggy ADPCM Hack</CheckBox>
@@ -5721,11 +5725,11 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
 
                                             </Grid>
                                         </StackPanel>
-                                    </Expander>
+                                    </GroupBox>
                                 </Border>
 
                                 <Border Style="{StaticResource Borders1}" x:Name="brdSpecificPcfx2" Margin="10">
-                                    <Expander IsExpanded="True" BorderThickness="0" Header="PC-FX Continued">
+                                    <GroupBox Margin="0" BorderThickness="0" Header="PC-FX Continued">
                                         <StackPanel Margin="10">
 
 
@@ -5832,7 +5836,7 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
                                                 </ComboBox>
                                             </Grid>
                                         </StackPanel>
-                                    </Expander>
+                                    </GroupBox>
                                 </Border>
 
 
@@ -5840,7 +5844,7 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
                                 <!-- sms -->
 
                                 <Border Style="{StaticResource Borders1}" x:Name="brdSpecificSms2" Margin="10">
-                                    <Expander IsExpanded="True" BorderThickness="0" Header="Master System Filters/Misc">
+                                    <GroupBox Margin="0" BorderThickness="0" Header="Master System Filters/Misc">
 
                                         <StackPanel>
                                             <CheckBox x:Name="cfg_sms__enable">Enable (Automatic) Usage of this module</CheckBox>
@@ -5929,11 +5933,11 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
                                             </Grid>
 
                                         </StackPanel>
-                                    </Expander>
+                                    </GroupBox>
                                 </Border>
 
                                 <Border Style="{StaticResource Borders1}" x:Name="brdSpecificSms99" Margin="10">
-                                    <Expander IsExpanded="True" BorderThickness="0" Header="SMS OGL Goat Filter Settings">
+                                    <GroupBox Margin="0" BorderThickness="0" Header="SMS OGL Goat Filter Settings">
 
                                         <StackPanel>
                                             <CheckBox x:Name="cfg_sms__shader__goat__fprog">Force Interlaced Video to be Treated as Progressive</CheckBox>
@@ -6011,11 +6015,11 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
                                             </Grid>
 
                                         </StackPanel>
-                                    </Expander>
+                                    </GroupBox>
                                 </Border>
 
                                 <Border Style="{StaticResource Borders1}" x:Name="brdSpecificSms3" Margin="10">
-                                    <Expander IsExpanded="True" BorderThickness="0" Header="Master System Resolution">
+                                    <GroupBox Margin="0" BorderThickness="0" Header="Master System Resolution">
 
                                         <StackPanel>
 
@@ -6111,11 +6115,11 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
                                                 </Grid>
                                             </Grid>
                                         </StackPanel>
-                                    </Expander>
+                                    </GroupBox>
                                 </Border>
 
                                 <Border Style="{StaticResource Borders1}" x:Name="brdSpecificSms1" Margin="10">
-                                    <Expander IsExpanded="True" BorderThickness="0" Header="Master System Specific Settings">
+                                    <GroupBox Margin="0" BorderThickness="0" Header="Master System Specific Settings">
                                         <StackPanel Margin="10">
                                             <CheckBox x:Name="cfg_sms__fm">FM Sound Emulation</CheckBox>
                                             <Grid Margin="0">
@@ -6167,7 +6171,7 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
 
                                             </Grid>
                                         </StackPanel>
-                                    </Expander>
+                                    </GroupBox>
                                 </Border>
 
 
@@ -6176,7 +6180,7 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
                                 <!-- md -->
 
                                 <Border Style="{StaticResource Borders1}" x:Name="brdSpecificMd2" Margin="10">
-                                    <Expander IsExpanded="True" BorderThickness="0" Header="MegaDrive Filters/Misc">
+                                    <GroupBox Margin="0" BorderThickness="0" Header="MegaDrive Filters/Misc">
 
                                         <StackPanel>
                                             <CheckBox x:Name="cfg_md__enable">Enable (Automatic) Usage of this module</CheckBox>
@@ -6265,11 +6269,11 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
                                             </Grid>
 
                                         </StackPanel>
-                                    </Expander>
+                                    </GroupBox>
                                 </Border>
 
                                 <Border Style="{StaticResource Borders1}" x:Name="brdSpecificMd99" Margin="10">
-                                    <Expander IsExpanded="True" BorderThickness="0" Header="MD OGL Goat Filter Settings">
+                                    <GroupBox Margin="0" BorderThickness="0" Header="MD OGL Goat Filter Settings">
 
                                         <StackPanel>
                                             <CheckBox x:Name="cfg_md__shader__goat__fprog">Force Interlaced Video to be Treated as Progressive</CheckBox>
@@ -6347,11 +6351,11 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
                                             </Grid>
 
                                         </StackPanel>
-                                    </Expander>
+                                    </GroupBox>
                                 </Border>
 
                                 <Border Style="{StaticResource Borders1}" x:Name="brdSpecificMd3" Margin="10">
-                                    <Expander IsExpanded="True" BorderThickness="0" Header="MegaDrive Resolution">
+                                    <GroupBox Margin="0" BorderThickness="0" Header="MegaDrive Resolution">
 
                                         <StackPanel>
 
@@ -6447,11 +6451,11 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
                                                 </Grid>
                                             </Grid>
                                         </StackPanel>
-                                    </Expander>
+                                    </GroupBox>
                                 </Border>
 
                                 <Border Style="{StaticResource Borders1}" x:Name="brdSpecificMd1" Margin="10">
-                                    <Expander IsExpanded="True" BorderThickness="0" Header="MegaDrive Specific Settings">
+                                    <GroupBox Margin="0" BorderThickness="0" Header="MegaDrive Specific Settings">
                                         <StackPanel Margin="10">
                                             <CheckBox x:Name="cfg_md__correct_aspect">Correct Aspect Ratio</CheckBox>
                                             <CheckBox x:Name="cfg_md__input__auto">Auto-Select Input Device</CheckBox>
@@ -6606,7 +6610,7 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
 
                                             </Grid>
                                         </StackPanel>
-                                    </Expander>
+                                    </GroupBox>
                                 </Border>
 
 
@@ -6614,7 +6618,7 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
                                 <!-- snes_faust -->
 
                                 <Border Style="{StaticResource Borders1}" x:Name="brdSpecificSnes_faust2" Margin="10">
-                                    <Expander IsExpanded="True" BorderThickness="0" Header="Snes (Faust) Filters/Misc">
+                                    <GroupBox Margin="0" BorderThickness="0" Header="Snes (Faust) Filters/Misc">
 
                                         <StackPanel>
                                             <CheckBox x:Name="cfg_snes_faust__enable">Enable (Automatic) Usage of this module</CheckBox>
@@ -6703,11 +6707,11 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
                                             </Grid>
 
                                         </StackPanel>
-                                    </Expander>
+                                    </GroupBox>
                                 </Border>
 
                                 <Border Style="{StaticResource Borders1}" x:Name="brdSpecificSnes_faust99" Margin="10">
-                                    <Expander IsExpanded="True" BorderThickness="0" Header="SNES (Faust) OGL Goat Filter Settings">
+                                    <GroupBox Margin="0" BorderThickness="0" Header="SNES (Faust) OGL Goat Filter Settings">
 
                                         <StackPanel>
                                             <CheckBox x:Name="cfg_snes_faust__shader__goat__fprog">Force Interlaced Video to be Treated as Progressive</CheckBox>
@@ -6785,11 +6789,11 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
                                             </Grid>
 
                                         </StackPanel>
-                                    </Expander>
+                                    </GroupBox>
                                 </Border>
 
                                 <Border Style="{StaticResource Borders1}" x:Name="brdSpecificSnes_faust3" Margin="10">
-                                    <Expander IsExpanded="True" BorderThickness="0" Header="SNES (Faust) Resolution">
+                                    <GroupBox Margin="0" BorderThickness="0" Header="SNES (Faust) Resolution">
 
                                         <StackPanel>
                                             <CheckBox x:Name="cfg_snes_faust__correct_aspect">Correct Aspect Ratio</CheckBox>
@@ -6885,11 +6889,11 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
                                                 </Grid>
                                             </Grid>
                                         </StackPanel>
-                                    </Expander>
+                                    </GroupBox>
                                 </Border>
 
                                 <Border Style="{StaticResource Borders1}" x:Name="brdSpecificSnes_faust1" Margin="10">
-                                    <Expander IsExpanded="True" BorderThickness="0" Header="SNES (Faust) Specific Settings">
+                                    <GroupBox Margin="0" BorderThickness="0" Header="SNES (Faust) Specific Settings">
                                         <StackPanel Margin="10">
                                             <CheckBox x:Name="cfg_snes_faust__spex">1-Frame Speculative Video Execution</CheckBox>
                                             <CheckBox x:Name="cfg_snes_faust__spex__sound">1-Frame Speculative Sound</CheckBox>
@@ -7002,7 +7006,7 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
 
                                             </Grid>
                                         </StackPanel>
-                                    </Expander>
+                                    </GroupBox>
                                 </Border>
 
 
@@ -7010,7 +7014,7 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
                                 <!-- snes -->
 
                                 <Border Style="{StaticResource Borders1}" x:Name="brdSpecificSnes2" Margin="10">
-                                    <Expander IsExpanded="True" BorderThickness="0" Header="Snes Filters/Misc">
+                                    <GroupBox Margin="0" BorderThickness="0" Header="Snes Filters/Misc">
 
                                         <StackPanel>
                                             <CheckBox x:Name="cfg_snes__enable">Enable (Automatic) Usage of this module</CheckBox>
@@ -7100,11 +7104,11 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
                                             </Grid>
 
                                         </StackPanel>
-                                    </Expander>
+                                    </GroupBox>
                                 </Border>
 
                                 <Border Style="{StaticResource Borders1}" x:Name="brdSpecificSnes99" Margin="10">
-                                    <Expander IsExpanded="True" BorderThickness="0" Header="SNES OGL Goat Filter Settings">
+                                    <GroupBox Margin="0" BorderThickness="0" Header="SNES OGL Goat Filter Settings">
 
                                         <StackPanel>
                                             <CheckBox x:Name="cfg_snes__shader__goat__fprog">Force Interlaced Video to be Treated as Progressive</CheckBox>
@@ -7182,11 +7186,11 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
                                             </Grid>
 
                                         </StackPanel>
-                                    </Expander>
+                                    </GroupBox>
                                 </Border>
 
                                 <Border Style="{StaticResource Borders1}" x:Name="brdSpecificSnes3" Margin="10">
-                                    <Expander IsExpanded="True" BorderThickness="0" Header="Snes Resolution">
+                                    <GroupBox Margin="0" BorderThickness="0" Header="Snes Resolution">
 
                                         <StackPanel>
 
@@ -7282,11 +7286,11 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
                                                 </Grid>
                                             </Grid>
                                         </StackPanel>
-                                    </Expander>
+                                    </GroupBox>
                                 </Border>
 
                                 <Border Style="{StaticResource Borders1}" x:Name="brdSpecificSnes1" Margin="10">
-                                    <Expander IsExpanded="True" BorderThickness="0" Header="SNES Specific Settings">
+                                    <GroupBox Margin="0" BorderThickness="0" Header="SNES Specific Settings">
                                         <StackPanel Margin="10">
                                             <CheckBox x:Name="cfg_snes__correct_aspect">Correct Aspect Ratio</CheckBox>
                                             <Grid Margin="0">
@@ -7395,7 +7399,7 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
 -->
                                             </Grid>
                                         </StackPanel>
-                                    </Expander>
+                                    </GroupBox>
                                 </Border>
 
 
@@ -7403,7 +7407,7 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
                                 <!-- vb -->
 
                                 <Border Style="{StaticResource Borders1}" x:Name="brdSpecificVb2" Margin="10">
-                                    <Expander IsExpanded="True" BorderThickness="0" Header="Virtual Boy Filters/Misc">
+                                    <GroupBox Margin="0" BorderThickness="0" Header="Virtual Boy Filters/Misc">
 
                                         <StackPanel>
                                             <CheckBox x:Name="cfg_vb__enable">Enable (Automatic) Usage of this module</CheckBox>
@@ -7492,11 +7496,11 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
                                             </Grid>
 
                                         </StackPanel>
-                                    </Expander>
+                                    </GroupBox>
                                 </Border>
 
                                 <Border Style="{StaticResource Borders1}" x:Name="brdSpecificVb99" Margin="10">
-                                    <Expander IsExpanded="True" BorderThickness="0" Header="VB OGL Goat Filter Settings">
+                                    <GroupBox Margin="0" BorderThickness="0" Header="VB OGL Goat Filter Settings">
 
                                         <StackPanel>
                                             <CheckBox x:Name="cfg_vb__shader__goat__fprog">Force Interlaced Video to be Treated as Progressive</CheckBox>
@@ -7574,11 +7578,11 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
                                             </Grid>
 
                                         </StackPanel>
-                                    </Expander>
+                                    </GroupBox>
                                 </Border>
 
                                 <Border Style="{StaticResource Borders1}" x:Name="brdSpecificVb3" Margin="10">
-                                    <Expander IsExpanded="True" BorderThickness="0" Header="Virtual Boy Resolution">
+                                    <GroupBox Margin="0" BorderThickness="0" Header="Virtual Boy Resolution">
 
                                         <StackPanel>
 
@@ -7674,11 +7678,11 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
                                                 </Grid>
                                             </Grid>
                                         </StackPanel>
-                                    </Expander>
+                                    </GroupBox>
                                 </Border>
 
                                 <Border Style="{StaticResource Borders1}" x:Name="brdSpecificVb1" Margin="10">
-                                    <Expander IsExpanded="True" BorderThickness="0" Header="Virtual Boy Specific Settings">
+                                    <GroupBox Margin="0" BorderThickness="0" Header="Virtual Boy Specific Settings">
                                         <StackPanel Margin="10">
                                             <CheckBox x:Name="cfg_vb__input__instant_read_hack">Input Latency Reduction Hack</CheckBox>
                                             <CheckBox x:Name="cfg_vb__instant_display_hack">Display Latency Reduction Hack</CheckBox>
@@ -7796,7 +7800,7 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
 
                                             </Grid>
                                         </StackPanel>
-                                    </Expander>
+                                    </GroupBox>
                                 </Border>
 
 
@@ -7804,7 +7808,7 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
                                 <!-- ss -->
 
                                 <Border Style="{StaticResource Borders1}" x:Name="brdSpecificSs3" Margin="10">
-                                    <Expander IsExpanded="True" BorderThickness="0" Header="Saturn Filters/Misc">
+                                    <GroupBox Margin="0" BorderThickness="0" Header="Saturn Filters/Misc">
 
                                         <StackPanel>
                                             <CheckBox x:Name="cfg_ss__enable">Enable (Automatic) Usage of this module</CheckBox>
@@ -7898,11 +7902,11 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
                                             </Grid>
 
                                         </StackPanel>
-                                    </Expander>
+                                    </GroupBox>
                                 </Border>
 
                                 <Border Style="{StaticResource Borders1}" x:Name="brdSpecificSs99" Margin="10">
-                                    <Expander IsExpanded="True" BorderThickness="0" Header="SS OGL Goat Filter Settings">
+                                    <GroupBox Margin="0" BorderThickness="0" Header="SS OGL Goat Filter Settings">
 
                                         <StackPanel>
                                             <CheckBox x:Name="cfg_ss__shader__goat__fprog">Force Interlaced Video to be Treated as Progressive</CheckBox>
@@ -7980,11 +7984,11 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
                                             </Grid>
 
                                         </StackPanel>
-                                    </Expander>
+                                    </GroupBox>
                                 </Border>
 
                                 <Border Style="{StaticResource Borders1}" x:Name="brdSpecificSs4" Margin="10">
-                                    <Expander IsExpanded="True" BorderThickness="0" Header="Saturn Resolution">
+                                    <GroupBox Margin="0" BorderThickness="0" Header="Saturn Resolution">
 
                                         <StackPanel>
 
@@ -8080,11 +8084,11 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
                                                 </Grid>
                                             </Grid>
                                         </StackPanel>
-                                    </Expander>
+                                    </GroupBox>
                                 </Border>
 
                                 <Border Style="{StaticResource Borders1}" x:Name="brdSpecificSs1" Margin="10">
-                                    <Expander IsExpanded="True" BorderThickness="0" Header="Saturn Specific Settings">
+                                    <GroupBox Margin="0" BorderThickness="0" Header="Saturn Specific Settings">
                                         <StackPanel>
                                             <CheckBox x:Name="cfg_ss__bios_sanity">Enable BIOS (ROM) Sanity Checks</CheckBox>
                                             <CheckBox x:Name="cfg_ss__cd_sanity">Enable CD (Image) Sanity Checks</CheckBox>
@@ -8204,11 +8208,11 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
 
                                             </Grid>
                                         </StackPanel>
-                                    </Expander>
+                                    </GroupBox>
                                 </Border>
 
                                 <Border Style="{StaticResource Borders1}" x:Name="brdSpecificSs2" Margin="10">
-                                    <Expander IsExpanded="True" BorderThickness="0" Header="Saturn Controller Settings">
+                                    <GroupBox Margin="0" BorderThickness="0" Header="Saturn Controller Settings">
                                         <StackPanel Margin="10">
 
                                             <CheckBox x:Name="cfg_ss__input__sport1__multitap">Enable Multitap Emulation on Port 1</CheckBox>
@@ -8220,6 +8224,8 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
                                                     <ColumnDefinition Width="*" />
                                                     <ColumnDefinition Width="Auto" />
                                                     <ColumnDefinition Width="Auto" />
+                                                    <ColumnDefinition Width="Auto" />
+                                                    <ColumnDefinition Width="Auto" />
                                                 </Grid.ColumnDefinitions>
                                                 <Grid.RowDefinitions>
                                                     <RowDefinition Height="Auto" />
@@ -8243,7 +8249,7 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
                                                     <RowDefinition Height="Auto" />
                                                 </Grid.RowDefinitions>
 
-                                                <DockPanel Grid.ColumnSpan="4" Grid.Row="0" VerticalAlignment="Center" Margin="3">
+                                                <DockPanel Grid.ColumnSpan="6" Grid.Row="0" VerticalAlignment="Center" Margin="3">
                                                     <Label Name="cfglbl_ss__input__mouse_sensitivity" DockPanel.Dock="Top" VerticalAlignment="Top" HorizontalAlignment="Left">Emulated Mouse Sensitivity</Label>
                                                     <Controls:NumericUpDown  Maximum="2" Minimum="0.125" Interval="0.005" HasDecimals="True" HideUpDownButtons="True" Value="{Binding ElementName=cfg_ss__input__mouse_sensitivity, Path=Value, UpdateSourceTrigger=PropertyChanged}" DockPanel.Dock="Right" TextAlignment="Right" Width="40" />
                                                     <Slider Maximum="2" Minimum="0.125" TickPlacement="BottomRight" TickFrequency="0.005" IsSnapToTickEnabled="True" 
@@ -8263,9 +8269,15 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
                                                     <ComboBoxItem Tag="keyboard">Keyboard</ComboBoxItem>
                                                 </ComboBox>
 
-                                                <Label Name="cfglbl_ss__input__port1__gun_chairs" Grid.Column="2" Grid.Row="1">Lightgun Crosshair:</Label>
-                                                <xctk:ColorPicker ColorMode="ColorCanvas" Background="Black"  Grid.Column="3" Grid.Row="1" x:Name="cfg_ss__input__port1__gun_chairs" />
-
+                                                <Label Name="cfglbl_ss__input__port1__gun_chairs" Grid.Column="2" Grid.Row="1">Gun Crosshair:</Label>
+                                                <xctk:ColorPicker ColorMode="ColorCanvas" Background="Black" Width="40" Grid.Column="3" Grid.Row="1" x:Name="cfg_ss__input__port1__gun_chairs" />
+                                                
+                                                <Label Name="cfglbl_ss__input__port1__3dpad__mode__defpos" Grid.Column="4" Grid.Row="1">3DPad Def. Mode:</Label>
+                                                <ComboBox x:Name="cfg_ss__input__port1__3dpad__mode__defpos" SelectedValuePath="Tag" Grid.Column="5" Grid.Row="1">
+                                                    <ComboBoxItem Tag="digital">Digital</ComboBoxItem>
+                                                    <ComboBoxItem Tag="analog">Analog</ComboBoxItem>
+                                                </ComboBox>
+                                                
                                                 <Label Name="cfglbl_ss__input__port2" Grid.Column="0" Grid.Row="2">Input Device (Virtual) Port 2</Label>
                                                 <ComboBox x:Name="cfg_ss__input__port2" SelectedValuePath="Tag" Grid.Column="1" Grid.Row="2">
                                                     <ComboBoxItem Tag="none">None</ComboBoxItem>
@@ -8279,9 +8291,15 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
                                                     <ComboBoxItem Tag="keyboard">Keyboard</ComboBoxItem>
                                                 </ComboBox>
 
-                                                <Label Name="cfglbl_ss__input__port2__gun_chairs" Grid.Column="2" Grid.Row="2">Lightgun Crosshair:</Label>
-                                                <xctk:ColorPicker ColorMode="ColorCanvas" Background="Black"  Grid.Column="3" Grid.Row="2" x:Name="cfg_ss__input__port2__gun_chairs" />
+                                                <Label Name="cfglbl_ss__input__port2__gun_chairs" Grid.Column="2" Grid.Row="2">Gun Crosshair:</Label>
+                                                <xctk:ColorPicker ColorMode="ColorCanvas" Background="Black" Width="40"   Grid.Column="3" Grid.Row="2" x:Name="cfg_ss__input__port2__gun_chairs" />
 
+                                                <Label Name="cfglbl_ss__input__port2__3dpad__mode__defpos" Grid.Column="4" Grid.Row="2">3DPad Def. Mode:</Label>
+                                                <ComboBox x:Name="cfg_ss__input__port2__3dpad__mode__defpos" SelectedValuePath="Tag" Grid.Column="5" Grid.Row="2">
+                                                    <ComboBoxItem Tag="digital">Digital</ComboBoxItem>
+                                                    <ComboBoxItem Tag="analog">Analog</ComboBoxItem>
+                                                </ComboBox>
+                                                
                                                 <Label Name="cfglbl_ss__input__port3" Grid.Column="0" Grid.Row="3">Input Device (Virtual) Port 3</Label>
                                                 <ComboBox x:Name="cfg_ss__input__port3" SelectedValuePath="Tag" Grid.Column="1" Grid.Row="3">
                                                     <ComboBoxItem Tag="none">None</ComboBoxItem>
@@ -8295,8 +8313,14 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
                                                     <ComboBoxItem Tag="keyboard">Keyboard</ComboBoxItem>
                                                 </ComboBox>
 
-                                                <Label Name="cfglbl_ss__input__port3__gun_chairs" Grid.Column="2" Grid.Row="3">Lightgun Crosshair:</Label>
-                                                <xctk:ColorPicker ColorMode="ColorCanvas" Background="Black"  Grid.Column="3" Grid.Row="3" x:Name="cfg_ss__input__port3__gun_chairs" />
+                                                <Label Name="cfglbl_ss__input__port3__gun_chairs" Grid.Column="2" Grid.Row="3">Gun Crosshair:</Label>
+                                                <xctk:ColorPicker ColorMode="ColorCanvas" Background="Black" Width="40"   Grid.Column="3" Grid.Row="3" x:Name="cfg_ss__input__port3__gun_chairs" />
+
+                                                <Label Name="cfglbl_ss__input__port3__3dpad__mode__defpos" Grid.Column="4" Grid.Row="3">3DPad Def. Mode:</Label>
+                                                <ComboBox x:Name="cfg_ss__input__port3__3dpad__mode__defpos" SelectedValuePath="Tag" Grid.Column="5" Grid.Row="3">
+                                                    <ComboBoxItem Tag="digital">Digital</ComboBoxItem>
+                                                    <ComboBoxItem Tag="analog">Analog</ComboBoxItem>
+                                                </ComboBox>
 
                                                 <Label Name="cfglbl_ss__input__port4" Grid.Column="0" Grid.Row="4">Input Device (Virtual) Port 4</Label>
                                                 <ComboBox x:Name="cfg_ss__input__port4" SelectedValuePath="Tag" Grid.Column="1" Grid.Row="4">
@@ -8311,8 +8335,14 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
                                                     <ComboBoxItem Tag="keyboard">Keyboard</ComboBoxItem>
                                                 </ComboBox>
 
-                                                <Label Name="cfglbl_ss__input__port4__gun_chairs" Grid.Column="2" Grid.Row="4">Lightgun Crosshair:</Label>
-                                                <xctk:ColorPicker ColorMode="ColorCanvas" Background="Black"  Grid.Column="3" Grid.Row="4" x:Name="cfg_ss__input__port4__gun_chairs" />
+                                                <Label Name="cfglbl_ss__input__port4__gun_chairs" Grid.Column="2" Grid.Row="4">Gun Crosshair:</Label>
+                                                <xctk:ColorPicker ColorMode="ColorCanvas" Background="Black" Width="40"   Grid.Column="3" Grid.Row="4" x:Name="cfg_ss__input__port4__gun_chairs" />
+
+                                                <Label Name="cfglbl_ss__input__port4__3dpad__mode__defpos" Grid.Column="4" Grid.Row="4">3DPad Def. Mode:</Label>
+                                                <ComboBox x:Name="cfg_ss__input__port4__3dpad__mode__defpos" SelectedValuePath="Tag" Grid.Column="5" Grid.Row="4">
+                                                    <ComboBoxItem Tag="digital">Digital</ComboBoxItem>
+                                                    <ComboBoxItem Tag="analog">Analog</ComboBoxItem>
+                                                </ComboBox>
 
                                                 <Label Name="cfglbl_ss__input__port5" Grid.Column="0" Grid.Row="5">Input Device (Virtual) Port 5</Label>
                                                 <ComboBox x:Name="cfg_ss__input__port5" SelectedValuePath="Tag" Grid.Column="1" Grid.Row="5">
@@ -8327,8 +8357,14 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
                                                     <ComboBoxItem Tag="keyboard">Keyboard</ComboBoxItem>
                                                 </ComboBox>
 
-                                                <Label Name="cfglbl_ss__input__port5__gun_chairs" Grid.Column="2" Grid.Row="5">Lightgun Crosshair:</Label>
-                                                <xctk:ColorPicker ColorMode="ColorCanvas" Background="Black"  Grid.Column="3" Grid.Row="5" x:Name="cfg_ss__input__port5__gun_chairs" />
+                                                <Label Name="cfglbl_ss__input__port5__gun_chairs" Grid.Column="2" Grid.Row="5">Gun Crosshair:</Label>
+                                                <xctk:ColorPicker ColorMode="ColorCanvas" Background="Black" Width="40"   Grid.Column="3" Grid.Row="5" x:Name="cfg_ss__input__port5__gun_chairs" />
+
+                                                <Label Name="cfglbl_ss__input__port5__3dpad__mode__defpos" Grid.Column="4" Grid.Row="5">3DPad Def. Mode:</Label>
+                                                <ComboBox x:Name="cfg_ss__input__port5__3dpad__mode__defpos" SelectedValuePath="Tag" Grid.Column="5" Grid.Row="5">
+                                                    <ComboBoxItem Tag="digital">Digital</ComboBoxItem>
+                                                    <ComboBoxItem Tag="analog">Analog</ComboBoxItem>
+                                                </ComboBox>
 
                                                 <Label Name="cfglbl_ss__input__port6" Grid.Column="0" Grid.Row="6">Input Device (Virtual) Port 6</Label>
                                                 <ComboBox x:Name="cfg_ss__input__port6" SelectedValuePath="Tag" Grid.Column="1" Grid.Row="6">
@@ -8343,8 +8379,14 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
                                                     <ComboBoxItem Tag="keyboard">Keyboard</ComboBoxItem>
                                                 </ComboBox>
 
-                                                <Label Name="cfglbl_ss__input__port6__gun_chairs" Grid.Column="2" Grid.Row="6">Lightgun Crosshair:</Label>
-                                                <xctk:ColorPicker ColorMode="ColorCanvas" Background="Black"  Grid.Column="3" Grid.Row="6" x:Name="cfg_ss__input__port6__gun_chairs" />
+                                                <Label Name="cfglbl_ss__input__port6__gun_chairs" Grid.Column="2" Grid.Row="6">Gun Crosshair:</Label>
+                                                <xctk:ColorPicker ColorMode="ColorCanvas" Background="Black" Width="40"   Grid.Column="3" Grid.Row="6" x:Name="cfg_ss__input__port6__gun_chairs" />
+
+                                                <Label Name="cfglbl_ss__input__port6__3dpad__mode__defpos" Grid.Column="4" Grid.Row="6">3DPad Def. Mode:</Label>
+                                                <ComboBox x:Name="cfg_ss__input__port6__3dpad__mode__defpos" SelectedValuePath="Tag" Grid.Column="5" Grid.Row="6">
+                                                    <ComboBoxItem Tag="digital">Digital</ComboBoxItem>
+                                                    <ComboBoxItem Tag="analog">Analog</ComboBoxItem>
+                                                </ComboBox>
 
                                                 <Label Name="cfglbl_ss__input__port7" Grid.Column="0" Grid.Row="7">Input Device (Virtual) Port 7</Label>
                                                 <ComboBox x:Name="cfg_ss__input__port7" SelectedValuePath="Tag" Grid.Column="1" Grid.Row="7">
@@ -8359,8 +8401,14 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
                                                     <ComboBoxItem Tag="keyboard">Keyboard</ComboBoxItem>
                                                 </ComboBox>
 
-                                                <Label Name="cfglbl_ss__input__port7__gun_chairs" Grid.Column="2" Grid.Row="7">Lightgun Crosshair:</Label>
-                                                <xctk:ColorPicker ColorMode="ColorCanvas" Background="Black"  Grid.Column="3" Grid.Row="7" x:Name="cfg_ss__input__port7__gun_chairs" />
+                                                <Label Name="cfglbl_ss__input__port7__gun_chairs" Grid.Column="2" Grid.Row="7">Gun Crosshair:</Label>
+                                                <xctk:ColorPicker ColorMode="ColorCanvas" Background="Black"  Width="40"  Grid.Column="3" Grid.Row="7" x:Name="cfg_ss__input__port7__gun_chairs" />
+
+                                                <Label Name="cfglbl_ss__input__port7__3dpad__mode__defpos" Grid.Column="4" Grid.Row="7">3DPad Def. Mode:</Label>
+                                                <ComboBox x:Name="cfg_ss__input__port7__3dpad__mode__defpos" SelectedValuePath="Tag" Grid.Column="5" Grid.Row="7">
+                                                    <ComboBoxItem Tag="digital">Digital</ComboBoxItem>
+                                                    <ComboBoxItem Tag="analog">Analog</ComboBoxItem>
+                                                </ComboBox>
 
                                                 <Label Name="cfglbl_ss__input__port8" Grid.Column="0" Grid.Row="8">Input Device (Virtual) Port 8</Label>
                                                 <ComboBox x:Name="cfg_ss__input__port8" SelectedValuePath="Tag" Grid.Column="1" Grid.Row="8">
@@ -8375,8 +8423,14 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
                                                     <ComboBoxItem Tag="keyboard">Keyboard</ComboBoxItem>
                                                 </ComboBox>
 
-                                                <Label Name="cfglbl_ss__input__port8__gun_chairs" Grid.Column="2" Grid.Row="8">Lightgun Crosshair:</Label>
-                                                <xctk:ColorPicker ColorMode="ColorCanvas" Background="Black"  Grid.Column="3" Grid.Row="8" x:Name="cfg_ss__input__port8__gun_chairs" />
+                                                <Label Name="cfglbl_ss__input__port8__gun_chairs" Grid.Column="2" Grid.Row="8">Gun Crosshair:</Label>
+                                                <xctk:ColorPicker ColorMode="ColorCanvas" Background="Black"  Width="40"  Grid.Column="3" Grid.Row="8" x:Name="cfg_ss__input__port8__gun_chairs" />
+
+                                                <Label Name="cfglbl_ss__input__port8__3dpad__mode__defpos" Grid.Column="4" Grid.Row="8">3DPad Def. Mode:</Label>
+                                                <ComboBox x:Name="cfg_ss__input__port8__3dpad__mode__defpos" SelectedValuePath="Tag" Grid.Column="5" Grid.Row="8">
+                                                    <ComboBoxItem Tag="digital">Digital</ComboBoxItem>
+                                                    <ComboBoxItem Tag="analog">Analog</ComboBoxItem>
+                                                </ComboBox>
 
                                                 <Label Name="cfglbl_ss__input__port9" Grid.Column="0" Grid.Row="9">Input Device (Virtual) Port 9</Label>
                                                 <ComboBox x:Name="cfg_ss__input__port9" SelectedValuePath="Tag" Grid.Column="1" Grid.Row="9">
@@ -8391,8 +8445,14 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
                                                     <ComboBoxItem Tag="keyboard">Keyboard</ComboBoxItem>
                                                 </ComboBox>
 
-                                                <Label Name="cfglbl_ss__input__port9__gun_chairs" Grid.Column="2" Grid.Row="9">Lightgun Crosshair:</Label>
-                                                <xctk:ColorPicker ColorMode="ColorCanvas" Background="Black"  Grid.Column="3" Grid.Row="9" x:Name="cfg_ss__input__port9__gun_chairs" />
+                                                <Label Name="cfglbl_ss__input__port9__gun_chairs" Grid.Column="2" Grid.Row="9">Gun Crosshair:</Label>
+                                                <xctk:ColorPicker ColorMode="ColorCanvas" Background="Black"  Width="40"  Grid.Column="3" Grid.Row="9" x:Name="cfg_ss__input__port9__gun_chairs" />
+
+                                                <Label Name="cfglbl_ss__input__port9__3dpad__mode__defpos" Grid.Column="4" Grid.Row="9">3DPad Def. Mode:</Label>
+                                                <ComboBox x:Name="cfg_ss__input__port9__3dpad__mode__defpos" SelectedValuePath="Tag" Grid.Column="5" Grid.Row="9">
+                                                    <ComboBoxItem Tag="digital">Digital</ComboBoxItem>
+                                                    <ComboBoxItem Tag="analog">Analog</ComboBoxItem>
+                                                </ComboBox>
 
                                                 <Label Name="cfglbl_ss__input__port10" Grid.Column="0" Grid.Row="10">Input Device (Virtual) Port 10</Label>
                                                 <ComboBox x:Name="cfg_ss__input__port10" SelectedValuePath="Tag" Grid.Column="1" Grid.Row="10">
@@ -8407,8 +8467,14 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
                                                     <ComboBoxItem Tag="keyboard">Keyboard</ComboBoxItem>
                                                 </ComboBox>
 
-                                                <Label Name="cfglbl_ss__input__port10__gun_chairs" Grid.Column="2" Grid.Row="10">Lightgun Crosshair:</Label>
-                                                <xctk:ColorPicker ColorMode="ColorCanvas" Background="Black"  Grid.Column="3" Grid.Row="10" x:Name="cfg_ss__input__port10__gun_chairs" />
+                                                <Label Name="cfglbl_ss__input__port10__gun_chairs" Grid.Column="2" Grid.Row="10">Gun Crosshair:</Label>
+                                                <xctk:ColorPicker ColorMode="ColorCanvas" Background="Black"  Width="40"  Grid.Column="3" Grid.Row="10" x:Name="cfg_ss__input__port10__gun_chairs" />
+
+                                                <Label Name="cfglbl_ss__input__port10__3dpad__mode__defpos" Grid.Column="4" Grid.Row="10">3DPad Def. Mode:</Label>
+                                                <ComboBox x:Name="cfg_ss__input__port10__3dpad__mode__defpos" SelectedValuePath="Tag" Grid.Column="5" Grid.Row="10">
+                                                    <ComboBoxItem Tag="digital">Digital</ComboBoxItem>
+                                                    <ComboBoxItem Tag="analog">Analog</ComboBoxItem>
+                                                </ComboBox>
 
                                                 <Label Name="cfglbl_ss__input__port11" Grid.Column="0" Grid.Row="11">Input Device (Virtual) Port 11</Label>
                                                 <ComboBox x:Name="cfg_ss__input__port11" SelectedValuePath="Tag" Grid.Column="1" Grid.Row="11">
@@ -8423,8 +8489,14 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
                                                     <ComboBoxItem Tag="keyboard">Keyboard</ComboBoxItem>
                                                 </ComboBox>
 
-                                                <Label Name="cfglbl_ss__input__port11__gun_chairs" Grid.Column="2" Grid.Row="11">Lightgun Crosshair:</Label>
-                                                <xctk:ColorPicker ColorMode="ColorCanvas" Background="Black"  Grid.Column="3" Grid.Row="11" x:Name="cfg_ss__input__port11__gun_chairs" />
+                                                <Label Name="cfglbl_ss__input__port11__gun_chairs" Grid.Column="2" Grid.Row="11">Gun Crosshair:</Label>
+                                                <xctk:ColorPicker ColorMode="ColorCanvas" Background="Black"  Width="40"  Grid.Column="3" Grid.Row="11" x:Name="cfg_ss__input__port11__gun_chairs" />
+
+                                                <Label Name="cfglbl_ss__input__port11__3dpad__mode__defpos" Grid.Column="4" Grid.Row="11">3DPad Def. Mode:</Label>
+                                                <ComboBox x:Name="cfg_ss__input__port11__3dpad__mode__defpos" SelectedValuePath="Tag" Grid.Column="5" Grid.Row="11">
+                                                    <ComboBoxItem Tag="digital">Digital</ComboBoxItem>
+                                                    <ComboBoxItem Tag="analog">Analog</ComboBoxItem>
+                                                </ComboBox>
 
                                                 <Label Name="cfglbl_ss__input__port12" Grid.Column="0" Grid.Row="12">Input Device (Virtual) Port 12</Label>
                                                 <ComboBox x:Name="cfg_ss__input__port12" SelectedValuePath="Tag" Grid.Column="1" Grid.Row="12">
@@ -8439,13 +8511,19 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
                                                     <ComboBoxItem Tag="keyboard">Keyboard</ComboBoxItem>
                                                 </ComboBox>
 
-                                                <Label Name="cfglbl_ss__input__port12__gun_chairs" Grid.Column="2" Grid.Row="12">Lightgun Crosshair:</Label>
-                                                <xctk:ColorPicker ColorMode="ColorCanvas" Background="Black"  Grid.Column="3" Grid.Row="12" x:Name="cfg_ss__input__port12__gun_chairs" />
+                                                <Label Name="cfglbl_ss__input__port12__gun_chairs" Grid.Column="2" Grid.Row="12">Gun Crosshair:</Label>
+                                                <xctk:ColorPicker ColorMode="ColorCanvas" Background="Black" Width="40"  Grid.Column="3" Grid.Row="12" x:Name="cfg_ss__input__port12__gun_chairs" />
+
+                                                <Label Name="cfglbl_ss__input__port12__3dpad__mode__defpos" Grid.Column="4" Grid.Row="12">3DPad Def. Mode:</Label>
+                                                <ComboBox x:Name="cfg_ss__input__port12__3dpad__mode__defpos" SelectedValuePath="Tag" Grid.Column="5" Grid.Row="12">
+                                                    <ComboBoxItem Tag="digital">Digital</ComboBoxItem>
+                                                    <ComboBoxItem Tag="analog">Analog</ComboBoxItem>
+                                                </ComboBox>
 
 
                                             </Grid>
                                         </StackPanel>
-                                    </Expander>
+                                    </GroupBox>
                                 </Border>
 
 
@@ -8453,7 +8531,7 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
                                 <!-- psx -->
 
                                 <Border Style="{StaticResource Borders1}" x:Name="brdSpecificPsx11" Margin="10">
-                                    <Expander IsExpanded="True" BorderThickness="0" Header="Psx Filters/Misc">
+                                    <GroupBox Margin="0" BorderThickness="0" Header="Psx Filters/Misc">
 
                                         <StackPanel>
                                             <CheckBox x:Name="cfg_psx__enable">Enable (Automatic) Usage of this module</CheckBox>
@@ -8542,11 +8620,11 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
                                             </Grid>
 
                                         </StackPanel>
-                                    </Expander>
+                                    </GroupBox>
                                 </Border>
 
                                 <Border Style="{StaticResource Borders1}" x:Name="brdSpecificPsx99" Margin="10">
-                                    <Expander IsExpanded="True" BorderThickness="0" Header="PSX OGL Goat Filter Settings">
+                                    <GroupBox Margin="0" BorderThickness="0" Header="PSX OGL Goat Filter Settings">
 
                                         <StackPanel>
                                             <CheckBox x:Name="cfg_psx__shader__goat__fprog">Force Interlaced Video to be Treated as Progressive</CheckBox>
@@ -8624,11 +8702,11 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
                                             </Grid>
 
                                         </StackPanel>
-                                    </Expander>
+                                    </GroupBox>
                                 </Border>
 
                                 <Border Style="{StaticResource Borders1}" x:Name="brdSpecificPsx12" Margin="10">
-                                    <Expander IsExpanded="True" BorderThickness="0" Header="Psx Resolution">
+                                    <GroupBox Margin="0" BorderThickness="0" Header="Psx Resolution">
 
                                         <StackPanel>
 
@@ -8724,11 +8802,11 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
                                                 </Grid>
                                             </Grid>
                                         </StackPanel>
-                                    </Expander>
+                                    </GroupBox>
                                 </Border>
 
                                 <Border Style="{StaticResource Borders1}" x:Name="brdSpecificPsx1" Margin="10">
-                                    <Expander IsExpanded="True" BorderThickness="0" Header="Playstation Specific Settings">
+                                    <GroupBox Margin="0" BorderThickness="0" Header="Playstation Specific Settings">
                                         <StackPanel Margin="10">
                                             <CheckBox x:Name="cfg_psx__bios_sanity">Enable BIOS (ROM) Sanity Checks</CheckBox>
                                             <CheckBox x:Name="cfg_psx__cd_sanity">Enable CD (Image) Sanity Checks</CheckBox>
@@ -8827,11 +8905,11 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
 
                                             </Grid>
                                         </StackPanel>
-                                    </Expander>
+                                    </GroupBox>
                                 </Border>
 
                                 <Border Style="{StaticResource Borders1}" x:Name="brdSpecificPsx2" Margin="10">
-                                    <Expander IsExpanded="True" BorderThickness="0" Header="PSX Control Settings">
+                                    <GroupBox Margin="0" BorderThickness="0" Header="PSX Control Settings">
                                         <StackPanel Margin="10">
                                             <CheckBox x:Name="cfg_psx__input__analog_mode_ct">Analog Mode Combo-Button Toggle</CheckBox>
 
@@ -8914,11 +8992,11 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
 
                                             </Grid>
                                         </StackPanel>
-                                    </Expander>
+                                    </GroupBox>
                                 </Border>
 
                                 <Border Style="{StaticResource Borders1}" x:Name="brdSpecificPsx3" Margin="10">
-                                    <Expander IsExpanded="True" BorderThickness="0" Header="PSX Controller 1">
+                                    <GroupBox Margin="0" BorderThickness="0" Header="PSX Controller 1">
                                         <StackPanel Margin="10">
                                             <Grid Margin="0">
                                                 <Grid.ColumnDefinitions>
@@ -8972,11 +9050,11 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
                                                 <CheckBox x:Name="cfg_psx__input__port1__memcard" Grid.Row="5">Emulate Memory Card on Virtual Port 1</CheckBox>
                                             </Grid>
                                         </StackPanel>
-                                    </Expander>
+                                    </GroupBox>
                                 </Border>
 
                                 <Border Style="{StaticResource Borders1}" x:Name="brdSpecificPsx4" Margin="10">
-                                    <Expander IsExpanded="True" BorderThickness="0" Header="PSX Controller 2">
+                                    <GroupBox Margin="0" BorderThickness="0" Header="PSX Controller 2">
                                         <StackPanel Margin="10">
                                             <Grid Margin="0">
                                                 <Grid.ColumnDefinitions>
@@ -9030,11 +9108,11 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
                                                 <CheckBox x:Name="cfg_psx__input__port2__memcard" Grid.Row="5">Emulate Memory Card on Virtual Port 2</CheckBox>
                                             </Grid>
                                         </StackPanel>
-                                    </Expander>
+                                    </GroupBox>
                                 </Border>
 
                                 <Border Style="{StaticResource Borders1}" x:Name="brdSpecificPsx5" Margin="10">
-                                    <Expander IsExpanded="True" BorderThickness="0" Header="PSX Controller 3">
+                                    <GroupBox Margin="0" BorderThickness="0" Header="PSX Controller 3">
                                         <StackPanel Margin="10">
                                             <Grid Margin="0">
                                                 <Grid.ColumnDefinitions>
@@ -9088,11 +9166,11 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
                                                 <CheckBox x:Name="cfg_psx__input__port3__memcard" Grid.Row="5">Emulate Memory Card on Virtual Port 3</CheckBox>
                                             </Grid>
                                         </StackPanel>
-                                    </Expander>
+                                    </GroupBox>
                                 </Border>
 
                                 <Border Style="{StaticResource Borders1}" x:Name="brdSpecificPsx6" Margin="10">
-                                    <Expander IsExpanded="True" BorderThickness="0" Header="PSX Controller 4">
+                                    <GroupBox Margin="0" BorderThickness="0" Header="PSX Controller 4">
                                         <StackPanel Margin="10">
                                             <Grid Margin="0">
                                                 <Grid.ColumnDefinitions>
@@ -9146,11 +9224,11 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
                                                 <CheckBox x:Name="cfg_psx__input__port4__memcard" Grid.Row="5">Emulate Memory Card on Virtual Port 4</CheckBox>
                                             </Grid>
                                         </StackPanel>
-                                    </Expander>
+                                    </GroupBox>
                                 </Border>
 
                                 <Border Style="{StaticResource Borders1}" x:Name="brdSpecificPsx7" Margin="10">
-                                    <Expander IsExpanded="True" BorderThickness="0" Header="PSX Controller 5">
+                                    <GroupBox Margin="0" BorderThickness="0" Header="PSX Controller 5">
                                         <StackPanel Margin="10">
                                             <Grid Margin="0">
                                                 <Grid.ColumnDefinitions>
@@ -9204,11 +9282,11 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
                                                 <CheckBox x:Name="cfg_psx__input__port5__memcard" Grid.Row="5">Emulate Memory Card on Virtual Port 5</CheckBox>
                                             </Grid>
                                         </StackPanel>
-                                    </Expander>
+                                    </GroupBox>
                                 </Border>
 
                                 <Border Style="{StaticResource Borders1}" x:Name="brdSpecificPsx8" Margin="10">
-                                    <Expander IsExpanded="True" BorderThickness="0" Header="PSX Controller 6">
+                                    <GroupBox Margin="0" BorderThickness="0" Header="PSX Controller 6">
                                         <StackPanel Margin="10">
                                             <Grid Margin="0">
                                                 <Grid.ColumnDefinitions>
@@ -9262,11 +9340,11 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
                                                 <CheckBox x:Name="cfg_psx__input__port6__memcard" Grid.Row="5">Emulate Memory Card on Virtual Port 6</CheckBox>
                                             </Grid>
                                         </StackPanel>
-                                    </Expander>
+                                    </GroupBox>
                                 </Border>
 
                                 <Border Style="{StaticResource Borders1}" x:Name="brdSpecificPsx9" Margin="10">
-                                    <Expander IsExpanded="True" BorderThickness="0" Header="PSX Controller 7">
+                                    <GroupBox Margin="0" BorderThickness="0" Header="PSX Controller 7">
                                         <StackPanel Margin="10">
                                             <Grid Margin="0">
                                                 <Grid.ColumnDefinitions>
@@ -9320,11 +9398,11 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
                                                 <CheckBox x:Name="cfg_psx__input__port7__memcard" Grid.Row="5">Emulate Memory Card on Virtual Port 7</CheckBox>
                                             </Grid>
                                         </StackPanel>
-                                    </Expander>
+                                    </GroupBox>
                                 </Border>
 
                                 <Border Style="{StaticResource Borders1}" x:Name="brdSpecificPsx10" Margin="10">
-                                    <Expander IsExpanded="True" BorderThickness="0" Header="PSX Controller 8">
+                                    <GroupBox Margin="0" BorderThickness="0" Header="PSX Controller 8">
                                         <StackPanel Margin="10">
                                             <Grid Margin="0">
                                                 <Grid.ColumnDefinitions>
@@ -9379,7 +9457,7 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
                                                 <CheckBox x:Name="cfg_psx__input__port8__memcard" Grid.Row="5">Emulate Memory Card on Virtual Port 8</CheckBox>
                                             </Grid>
                                         </StackPanel>
-                                    </Expander>
+                                    </GroupBox>
                                 </Border>
 
 
@@ -9388,7 +9466,7 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
 
 
                                 <Border Style="{StaticResource Borders1}" x:Name="brdSpecificWswan2" Margin="10">
-                                    <Expander IsExpanded="True" BorderThickness="0" Header="WonderSwan Filters/Misc">
+                                    <GroupBox Margin="0" BorderThickness="0" Header="WonderSwan Filters/Misc">
 
                                         <StackPanel>
                                             <CheckBox x:Name="cfg_wswan__enable">Enable (Automatic) Usage of this module</CheckBox>
@@ -9477,11 +9555,11 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
                                             </Grid>
 
                                         </StackPanel>
-                                    </Expander>
+                                    </GroupBox>
                                 </Border>
 
                                 <Border Style="{StaticResource Borders1}" x:Name="brdSpecificWswan99" Margin="10">
-                                    <Expander IsExpanded="True" BorderThickness="0" Header="WSWAN OGL Goat Filter Settings">
+                                    <GroupBox Margin="0" BorderThickness="0" Header="WSWAN OGL Goat Filter Settings">
 
                                         <StackPanel>
                                             <CheckBox x:Name="cfg_wswan__shader__goat__fprog">Force Interlaced Video to be Treated as Progressive</CheckBox>
@@ -9559,11 +9637,11 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
                                             </Grid>
 
                                         </StackPanel>
-                                    </Expander>
+                                    </GroupBox>
                                 </Border>
 
                                 <Border Style="{StaticResource Borders1}" x:Name="brdSpecificWswan3" Margin="10">
-                                    <Expander IsExpanded="True" BorderThickness="0" Header="WonderSwan Resolution">
+                                    <GroupBox Margin="0" BorderThickness="0" Header="WonderSwan Resolution">
 
                                         <StackPanel>
 
@@ -9659,11 +9737,11 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
                                                 </Grid>
                                             </Grid>
                                         </StackPanel>
-                                    </Expander>
+                                    </GroupBox>
                                 </Border>
 
                                 <Border Style="{StaticResource Borders1}" x:Name="brdSpecificWswan1" Margin="10">
-                                    <Expander IsExpanded="True" BorderThickness="0" Header="WonderSwan Specific Settings">
+                                    <GroupBox Margin="0" BorderThickness="0" Header="WonderSwan Specific Settings">
                                         <StackPanel Margin="10">
 
                                             <!--
@@ -9764,7 +9842,7 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
                                                 <TextBox x:Name="cfg_wswan__debugger__memcharenc" Grid.Column="1" Grid.Row="9" />
                                             </Grid>
                                         </StackPanel>
-                                    </Expander>
+                                    </GroupBox>
                                 </Border>
 
 
@@ -9909,8 +9987,8 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
                         </Grid.RowDefinitions>
 
 
-                        <ScrollViewer Grid.Row="0" VerticalScrollBarVisibility="Disabled" HorizontalScrollBarVisibility="Auto" Width="{Binding ElementName=controlGrid, Path=ActualWidth}" Height="{Binding ElementName=controlGrid, Path=ActualHeight}">
-                            <WrapPanel HorizontalAlignment="Left" Orientation="Vertical" x:Name="ControlWrapPanel">
+                        <ScrollViewer Grid.Row="0" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled" Width="{Binding ElementName=controlGrid, Path=ActualWidth}" Height="{Binding ElementName=controlGrid, Path=ActualHeight}">
+                            <WrapPanel HorizontalAlignment="Left" Orientation="Horizontal" x:Name="ControlWrapPanel">
 
                                 <!-- dynamically inserted control stuff goes below -->
                                 <Controls:TransitioningContentControl x:Name="tccControls" Transition="LeftReplace"/>
@@ -10021,11 +10099,11 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
                             <RowDefinition Height="*" />
                         </Grid.RowDefinitions>
 
-                        <ScrollViewer Grid.Row="0" VerticalScrollBarVisibility="Disabled" HorizontalScrollBarVisibility="Auto" Width="{Binding ElementName=SettingGrid, Path=ActualWidth}" Height="{Binding ElementName=settingGrid, Path=ActualHeight}">
-                            <WrapPanel HorizontalAlignment="Left" Orientation="Vertical" x:Name="SettingWrapPanel">
+                        <ScrollViewer Grid.Row="0" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled" Width="{Binding ElementName=SettingGrid, Path=ActualWidth}" Height="{Binding ElementName=settingGrid, Path=ActualHeight}">
+                            <WrapPanel HorizontalAlignment="Left" Orientation="Horizontal" x:Name="SettingWrapPanel">
 
                                 <Border Style="{StaticResource Borders1}" x:Name="brdMedLaunch" Margin="10" Grid.Column="0">
-                                    <Expander IsExpanded="True" BorderThickness="0" Header="MedLaunch Settings" >
+                                    <GroupBox Margin="0" BorderThickness="0" Header="MedLaunch Settings" >
                                         <StackPanel x:Name="spMedLaunchSettings">
                                             <Grid Margin="0">
                                                 <Grid.ColumnDefinitions>
@@ -10165,11 +10243,11 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
                                                 </StackPanel>
                                             </Grid>
                                         </StackPanel>
-                                    </Expander>
+                                    </GroupBox>
                                 </Border>
 
                                 <Border Style="{StaticResource Borders1}" x:Name="brdLibrary" Margin="10" Grid.Column="0">
-                                    <Expander IsExpanded="True" BorderThickness="0" Header="Library Settings" >
+                                    <GroupBox Margin="0" BorderThickness="0" Header="Library Settings" >
                                         <StackPanel x:Name="spLibrary">
                                             <Grid Margin="0">
                                                 <Grid.ColumnDefinitions>
@@ -10237,11 +10315,11 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
 
                                             </Grid>
                                         </StackPanel>
-                                    </Expander>
+                                    </GroupBox>
                                 </Border>
 
                                 <Border Style="{StaticResource Borders1}" x:Name="brdScrapingSettings" Margin="10" Grid.Column="0">
-                                    <Expander IsExpanded="True" BorderThickness="0" Header="Game Scraping Options" >
+                                    <GroupBox Margin="0" BorderThickness="0" Header="Game Scraping Options" >
                                         <StackPanel x:Name="spScrapingSettings">
                                             <Grid Margin="0">
                                                 <Grid.ColumnDefinitions>
@@ -10323,11 +10401,11 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
                                                 </StackPanel>
                                             </Grid>
                                         </StackPanel>
-                                    </Expander>
+                                    </GroupBox>
                                 </Border>
 
                                 <Border Style="{StaticResource Borders1}" x:Name="brdMednafenPaths" Margin="10" Grid.Column="0">
-                                    <Expander IsExpanded="True" BorderThickness="0" Header="Mednafen Paths" >
+                                    <GroupBox Margin="0" BorderThickness="0" Header="Mednafen Paths" >
                                         <StackPanel x:Name="spMedPathSettings">
                                             <Grid Margin="0">
                                                 <Grid.ColumnDefinitions>
@@ -10388,11 +10466,11 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
 
                                             </Grid>
                                         </StackPanel>
-                                    </Expander>
+                                    </GroupBox>
                                 </Border>
 
                                 <Border Style="{StaticResource Borders1}" x:Name="brdGameFolders" Margin="10" Grid.Column="0">
-                                    <Expander IsExpanded="True" BorderThickness="0" Header="Game Folders" >
+                                    <GroupBox Margin="0" BorderThickness="0" Header="Game Folders" >
                                         <StackPanel x:Name="spPathSettings">
                                             <Grid Margin="0">
 
@@ -10483,11 +10561,11 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
 
 
                                         </StackPanel>
-                                    </Expander>
+                                    </GroupBox>
                                 </Border>
 
                                 <Border Style="{StaticResource Borders1}" x:Name="brdSystemBios" Margin="10" Grid.Column="0">
-                                    <Expander IsExpanded="True" BorderThickness="0" Header="System BIOS/ROMs" >
+                                    <GroupBox Margin="0" BorderThickness="0" Header="System BIOS/ROMs" >
                                         <StackPanel x:Name="spSysBiosSettings">
                                             <Grid Margin="0">
                                                 <Grid.ColumnDefinitions>
@@ -10550,14 +10628,11 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
 
                                             </Grid>
                                         </StackPanel>
-                                    </Expander>
+                                    </GroupBox>
                                 </Border>
 
                                 <Border Style="{StaticResource Borders1}" x:Name="brdNetplay1" Margin="10" Grid.Column="0">
-                                    <Expander IsExpanded="True" BorderThickness="0" Header="Netplay Settings" >
-
-
-
+                                    <GroupBox Margin="0" BorderThickness="0" Header="Netplay Settings" >
                                         <StackPanel x:Name="spNetplaySettings">
                                             <Grid Margin="0">
 
@@ -10623,13 +10698,11 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
 
                                             </Grid>
                                         </StackPanel>
-                                    </Expander>
+                                    </GroupBox>
                                 </Border>
 
                                 <Border Style="{StaticResource Borders1}" x:Name="brdNetplay2" Margin="10" Grid.Column="2">
-                                    <Expander IsExpanded="True" BorderThickness="0" Header="Netplay Server Settings" >
-
-
+                                    <GroupBox Margin="0" BorderThickness="0" Header="Netplay Server Settings" >
                                         <StackPanel x:Name="spServerSettings" Grid.Column="2">
 
                                             <Grid Margin="0">
@@ -10713,11 +10786,11 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
                                             </Grid>
                                         </StackPanel>
 
-                                    </Expander>
+                                    </GroupBox>
                                 </Border>
 
                                 <Border Style="{StaticResource Borders1}" x:Name="brdEmulator" Margin="10" Grid.Column="0">
-                                    <Expander IsExpanded="True" BorderThickness="0" Header="Emulator Engine" >
+                                    <GroupBox Margin="0" BorderThickness="0" Header="Emulator Engine" >
                                         <StackPanel x:Name="spEmulatorSettings">
 
                                             <CheckBox x:Name="chkEnableSnes_faust" Checked="chkEnableSnes_faust_Checked" Unchecked="chkEnableSnes_faust_Unchecked">Use SNES Faust</CheckBox>
@@ -10740,7 +10813,7 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
 
                                             </Grid>
                                         </StackPanel>
-                                    </Expander>
+                                    </GroupBox>
                                 </Border>
 
 
@@ -10753,13 +10826,13 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
                 </Grid>
             </TabItem>
 
-            <TabItem x:Name="tiDiscord" Header="Discord">
+            <TabItem x:Name="tiDiscord" Header="Discord" Visibility="{Binding Source={x:Static diag:Debugger.IsAttached}, Converter={StaticResource BoolToVisibilityConverter}}">
                 <Grid x:Name="grdDiscord">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="Auto" />
                         <ColumnDefinition Width="0" />
                         <ColumnDefinition />
-                        <ColumnDefinition Width="224" />
+                        <ColumnDefinition Width="160" />
                     </Grid.ColumnDefinitions>
                     <Grid.RowDefinitions>
                         <RowDefinition Height="50" />
@@ -10775,11 +10848,11 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
 
                         <WrapPanel Grid.Column="0" Grid.Row="0" Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Center">
 
-                            <Label VerticalAlignment="Bottom" VerticalContentAlignment="Center" FontSize="22" FontWeight="Bold">MedLaunch: Discord</Label>
+                            <Label VerticalAlignment="Bottom" VerticalContentAlignment="Center" FontSize="17" FontWeight="Bold" x:Name="lblDiscordChannel">MedLaunch: Discord</Label>
 
                             <TextBox Controls:TextBoxHelper.Watermark="Enter your preferred username..." VerticalContentAlignment="Center"
                                      Margin="20,0,0,0" x:Name="tbDiscordName"></TextBox>
-                            <Button>CONNECT</Button>
+                            <Button x:Name="btnDiscordConnect" Click="btnDiscordConnect_Click" IsDefault="{Binding ElementName=tbDiscordName, Path=IsKeyboardFocused}">CONNECT</Button>
 
                         </WrapPanel>
 
@@ -10787,7 +10860,7 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
                             <Label VerticalContentAlignment="Center" VerticalAlignment="Center">
                                 MednaNet API Status: 
                             </Label>
-                            <Label VerticalContentAlignment="Center" VerticalAlignment="Center">
+                            <Label VerticalContentAlignment="Center" VerticalAlignment="Center" x:Name="lblConnectedStatus">
                                 Disconnected
                             </Label>
                         </WrapPanel>
@@ -10812,92 +10885,19 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
                         <!-- above left border -->
 
                         <Border Style="{StaticResource Borders1}" Margin="0">
-                            <Expander IsExpanded="True" BorderThickness="0" Header="Discord Channels" IsManipulationEnabled="False" >
-                                <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
+                            <Expander IsExpanded="True" BorderThickness="0" Header="Discord Channels" IsManipulationEnabled="False" x:Name="discordChannelExpander">
+                                <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto" x:Name="scrlDiscordChannels">
                                     
                                 
                                 <StackPanel Orientation="Vertical" x:Name="DiscordSelectorWrapPanel">
 
                                     <!-- left menu buttons -->
+                                    
+                                    <!--
                                     <RadioButton GroupName="grpDiscordChannels" x:Name="rbDiscordCh01" HorizontalContentAlignment="Left" Style="{StaticResource {x:Type ToggleButton}}" 
                                      Checked="btnSettings_Checked" ContextMenuService.ShowOnDisabled="True" Width="{Binding ElementName=DiscordSelectorWrapPanel,Path=ActualWidth}"                                                 
                                      Content="Channel 01"/>
-
-                                    <RadioButton GroupName="grpDiscordChannels" x:Name="rbDiscordCh02" HorizontalContentAlignment="Left" Style="{StaticResource {x:Type ToggleButton}}" 
-                                     Checked="btnSettings_Checked" ContextMenuService.ShowOnDisabled="True" Width="{Binding ElementName=DiscordSelectorWrapPanel,Path=ActualWidth}"                                                 
-                                     Content="Channel 02"/>
-
-                                    <RadioButton GroupName="grpDiscordChannels" x:Name="rbDiscordCh03" HorizontalContentAlignment="Left" Style="{StaticResource {x:Type ToggleButton}}" 
-                                     Checked="btnSettings_Checked" ContextMenuService.ShowOnDisabled="True" Width="{Binding ElementName=DiscordSelectorWrapPanel,Path=ActualWidth}"                                                 
-                                     Content="Channel 03"/>
-
-                                    <RadioButton GroupName="grpDiscordChannels" x:Name="rbDiscordCh04" HorizontalContentAlignment="Left" Style="{StaticResource {x:Type ToggleButton}}" 
-                                     Checked="btnSettings_Checked" ContextMenuService.ShowOnDisabled="True" Width="{Binding ElementName=DiscordSelectorWrapPanel,Path=ActualWidth}"                                                 
-                                     Content="Channel 04"/>
-
-                                    <RadioButton GroupName="grpDiscordChannels" x:Name="rbDiscordCh05" HorizontalContentAlignment="Left" Style="{StaticResource {x:Type ToggleButton}}" 
-                                     Checked="btnSettings_Checked" ContextMenuService.ShowOnDisabled="True" Width="{Binding ElementName=DiscordSelectorWrapPanel,Path=ActualWidth}"                                                 
-                                     Content="Channel 05"/>
-
-                                    <RadioButton GroupName="grpDiscordChannels" x:Name="rbDiscordCh06" HorizontalContentAlignment="Left" Style="{StaticResource {x:Type ToggleButton}}" 
-                                     Checked="btnSettings_Checked" ContextMenuService.ShowOnDisabled="True" Width="{Binding ElementName=DiscordSelectorWrapPanel,Path=ActualWidth}"                                                 
-                                     Content="Channel 06"/>
-
-                                    <RadioButton GroupName="grpDiscordChannels" x:Name="rbDiscordCh07" HorizontalContentAlignment="Left" Style="{StaticResource {x:Type ToggleButton}}" 
-                                     Checked="btnSettings_Checked" ContextMenuService.ShowOnDisabled="True" Width="{Binding ElementName=DiscordSelectorWrapPanel,Path=ActualWidth}"                                                 
-                                     Content="Channel 07"/>
-
-                                    <RadioButton GroupName="grpDiscordChannels" x:Name="rbDiscordCh08" HorizontalContentAlignment="Left" Style="{StaticResource {x:Type ToggleButton}}" 
-                                     Checked="btnSettings_Checked" ContextMenuService.ShowOnDisabled="True" Width="{Binding ElementName=DiscordSelectorWrapPanel,Path=ActualWidth}"                                                 
-                                     Content="Channel 08"/>
-
-                                    <RadioButton GroupName="grpDiscordChannels" x:Name="rbDiscordCh09" HorizontalContentAlignment="Left" Style="{StaticResource {x:Type ToggleButton}}" 
-                                     Checked="btnSettings_Checked" ContextMenuService.ShowOnDisabled="True" Width="{Binding ElementName=DiscordSelectorWrapPanel,Path=ActualWidth}"                                                 
-                                     Content="Channel 09"/>
-
-                                    <RadioButton GroupName="grpDiscordChannels" x:Name="rbDiscordCh10" HorizontalContentAlignment="Left" Style="{StaticResource {x:Type ToggleButton}}" 
-                                     Checked="btnSettings_Checked" ContextMenuService.ShowOnDisabled="True" Width="{Binding ElementName=DiscordSelectorWrapPanel,Path=ActualWidth}"                                                 
-                                     Content="Channel 10"/>
-
-                                    <RadioButton GroupName="grpDiscordChannels" x:Name="rbDiscordCh11" HorizontalContentAlignment="Left" Style="{StaticResource {x:Type ToggleButton}}" 
-                                     Checked="btnSettings_Checked" ContextMenuService.ShowOnDisabled="True" Width="{Binding ElementName=DiscordSelectorWrapPanel,Path=ActualWidth}"                                                 
-                                     Content="Channel 11"/>
-
-                                    <RadioButton GroupName="grpDiscordChannels" x:Name="rbDiscordCh12" HorizontalContentAlignment="Left" Style="{StaticResource {x:Type ToggleButton}}" 
-                                     Checked="btnSettings_Checked" ContextMenuService.ShowOnDisabled="True" Width="{Binding ElementName=DiscordSelectorWrapPanel,Path=ActualWidth}"                                                 
-                                     Content="Channel 12"/>
-
-                                    <RadioButton GroupName="grpDiscordChannels" x:Name="rbDiscordCh13" HorizontalContentAlignment="Left" Style="{StaticResource {x:Type ToggleButton}}" 
-                                     Checked="btnSettings_Checked" ContextMenuService.ShowOnDisabled="True" Width="{Binding ElementName=DiscordSelectorWrapPanel,Path=ActualWidth}"                                                 
-                                     Content="Channel 13"/>
-
-                                    <RadioButton GroupName="grpDiscordChannels" x:Name="rbDiscordCh14" HorizontalContentAlignment="Left" Style="{StaticResource {x:Type ToggleButton}}" 
-                                     Checked="btnSettings_Checked" ContextMenuService.ShowOnDisabled="True" Width="{Binding ElementName=DiscordSelectorWrapPanel,Path=ActualWidth}"                                                 
-                                     Content="Channel 14"/>
-
-                                    <RadioButton GroupName="grpDiscordChannels" x:Name="rbDiscordCh15" HorizontalContentAlignment="Left" Style="{StaticResource {x:Type ToggleButton}}" 
-                                     Checked="btnSettings_Checked" ContextMenuService.ShowOnDisabled="True" Width="{Binding ElementName=DiscordSelectorWrapPanel,Path=ActualWidth}"                                                 
-                                     Content="Channel 15"/>
-
-                                    <RadioButton GroupName="grpDiscordChannels" x:Name="rbDiscordCh16" HorizontalContentAlignment="Left" Style="{StaticResource {x:Type ToggleButton}}" 
-                                     Checked="btnSettings_Checked" ContextMenuService.ShowOnDisabled="True" Width="{Binding ElementName=DiscordSelectorWrapPanel,Path=ActualWidth}"                                                 
-                                     Content="Channel 16"/>
-
-                                    <RadioButton GroupName="grpDiscordChannels" x:Name="rbDiscordCh17" HorizontalContentAlignment="Left" Style="{StaticResource {x:Type ToggleButton}}" 
-                                     Checked="btnSettings_Checked" ContextMenuService.ShowOnDisabled="True" Width="{Binding ElementName=DiscordSelectorWrapPanel,Path=ActualWidth}"                                                 
-                                     Content="Channel 17"/>
-
-                                    <RadioButton GroupName="grpDiscordChannels" x:Name="rbDiscordCh18" HorizontalContentAlignment="Left" Style="{StaticResource {x:Type ToggleButton}}" 
-                                     Checked="btnSettings_Checked" ContextMenuService.ShowOnDisabled="True" Width="{Binding ElementName=DiscordSelectorWrapPanel,Path=ActualWidth}"                                                 
-                                     Content="Channel 18"/>
-
-                                    <RadioButton GroupName="grpDiscordChannels" x:Name="rbDiscordCh19" HorizontalContentAlignment="Left" Style="{StaticResource {x:Type ToggleButton}}" 
-                                     Checked="btnSettings_Checked" ContextMenuService.ShowOnDisabled="True" Width="{Binding ElementName=DiscordSelectorWrapPanel,Path=ActualWidth}"                                                 
-                                     Content="Channel 19"/>
-
-                                    <RadioButton GroupName="grpDiscordChannels" x:Name="rbDiscordCh20" HorizontalContentAlignment="Left" Style="{StaticResource {x:Type ToggleButton}}" 
-                                     Checked="btnSettings_Checked" ContextMenuService.ShowOnDisabled="True" Width="{Binding ElementName=DiscordSelectorWrapPanel,Path=ActualWidth}"                                                 
-                                     Content="Channel 20"/>
+                                    -->
 
                                 </StackPanel>
 
@@ -10921,7 +10921,7 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
 
                         <RichTextBox x:Name="rtbDocument" ScrollViewer.VerticalScrollBarVisibility="Auto" IsUndoEnabled="False" IsReadOnly="True" BorderThickness="0" 
                                          IsDocumentEnabled="True"  Grid.Row="0" Grid.ColumnSpan="2"
-                                         VerticalAlignment="Stretch">
+                                         VerticalAlignment="Stretch" Padding="20 0 20 20">
                             <FlowDocument/>
                         </RichTextBox>
 
@@ -10929,7 +10929,7 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
                         <TextBox Controls:TextBoxHelper.Watermark="Type your message here..." Grid.Row="1" Grid.Column="0"
                                  VerticalContentAlignment="Center" x:Name="tbDiscordMessageBox"></TextBox>
 
-                        <Button Grid.Row="1" Grid.Column="1" x:Name="btnDiscordChatSend">SEND</Button>
+                        <Button Grid.Row="1" Grid.Column="1" x:Name="btnDiscordChatSend" Click="btnDiscordChatSend_Click" IsDefault="{Binding ElementName=tbDiscordMessageBox, Path=IsKeyboardFocused}">SEND</Button>
 
 
 
@@ -10939,31 +10939,27 @@ xmlns:il="clr-namespace:Microsoft.Expression.Interactivity.Layout;assembly=Micro
 
                         <!-- above right panel -->
 
-                        <Border Style="{StaticResource Borders1}" Margin="0" Width="{Binding ElementName=wpDiscordRightPane,Path=ActualWidth}">
-                            <Expander IsExpanded="True" BorderThickness="0" Header="Connected Users" IsManipulationEnabled="False" >
-                                <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
+                        <Border Style="{StaticResource Borders1}" Margin="0" x:Name="discordusrborder" Width="{Binding ElementName=wpDiscordRightPane,Path=ActualWidth}">
+                            <Expander IsExpanded="True" BorderThickness="0" Header="Users Online (0)" IsManipulationEnabled="False" x:Name="expDiscordUsersOnline">
+                                <ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto" x:Name="scrlDiscordUsers">
                                     <StackPanel Orientation="Vertical" x:Name="DiscordUserListWrapPanel">
 
                                         <!-- user menu buttons -->
-                                        <Button x:Name="btnusertest1" HorizontalContentAlignment="Left" 
-                                      ContextMenuService.ShowOnDisabled="True" Width="{Binding ElementName=DiscordUserListWrapPanel,Path=ActualWidth}"                                                 
-                                     Content="User Template"/>
 
-                                        <Button x:Name="btnusertest2" HorizontalContentAlignment="Left" 
-                                      ContextMenuService.ShowOnDisabled="True" Width="{Binding ElementName=DiscordUserListWrapPanel,Path=ActualWidth}"                                                 
-                                     Content="User Template"/>
+<!--
+                                        <Button x:Name="btnusertest1" HorizontalContentAlignment="Left" 
+                                      ContextMenuService.ShowOnDisabled="True" Width="{Binding ElementName=DiscordUserListWrapPanel,Path=ActualWidth}">
 
-                                        <Button x:Name="btnusertest3" HorizontalContentAlignment="Left" 
-                                      ContextMenuService.ShowOnDisabled="True" Width="{Binding ElementName=DiscordUserListWrapPanel,Path=ActualWidth}"                                                 
-                                     Content="User Template"/>
+                                            <StackPanel Orientation="Horizontal">
+                                                <Image Source="Data/Graphics/Icons/usericon_medlaunch.png" Width="20" Height="20"/>
+                                                <TextBlock VerticalAlignment="Center" Margin="10,0,0,0">
+                                                    some user
+                                                </TextBlock>
+                                            </StackPanel>
 
-                                        <Button x:Name="btnusertest4" HorizontalContentAlignment="Left" 
-                                      ContextMenuService.ShowOnDisabled="True" Width="{Binding ElementName=DiscordUserListWrapPanel,Path=ActualWidth}"                                                 
-                                     Content="User Template"/>
+                                        </Button>
+-->
 
-                                        <Button x:Name="btnusertest5" HorizontalContentAlignment="Left" 
-                                      ContextMenuService.ShowOnDisabled="True" Width="{Binding ElementName=DiscordUserListWrapPanel,Path=ActualWidth}"                                                 
-                                     Content="User Template"/>
 
                                     </StackPanel>
                                 </ScrollViewer>
diff --git a/MedLaunch/MainWindow.xaml.cs b/MedLaunch/MainWindow.xaml.cs
index aa40fd2..299027c 100644
--- a/MedLaunch/MainWindow.xaml.cs
+++ b/MedLaunch/MainWindow.xaml.cs
@@ -58,6 +58,7 @@
 using MedLaunch.Classes.Scraper.PSXDATACENTER;
 using System.Windows.Threading;
 using MedLaunch._Debug.ScrapeDB.ReplacementDocs;
+using MedLaunch.Classes.MednaNet;
 
 namespace MedLaunch
 {
@@ -78,6 +79,8 @@ public partial class MainWindow
         public CountryFilter _countryFilter { get; set; }
         public int _filterId { get; set; }
 
+        public Double GamesSidebarWidth { get; set; }
+
         public App _App { get; set; }
 
         public int UpdateStatus { get; set; }
@@ -86,6 +89,8 @@ public partial class MainWindow
 
         public bool? ConfigsTabSelected { get; set; }
 
+        public DiscordVisualHandler DVH { get; set; }
+
         /// <summary>
         /// public instance of the mahapps progressdialogcontroller
         /// </summary>
@@ -249,12 +254,27 @@ public MainWindow()
 
             btnReLink.Visibility = Visibility.Collapsed;
 
+            // set library sidebar width from db if games library is not null
+            GamesSidebarWidth = gs.sidebarwidth;
+            if (Game.GetGames().Where(a => a.hidden != true).Count() > 0)
+            {
+                sidebarColumn.Width = new GridLength(gs.sidebarwidth);                
+            }
+            else
+            {
+                sidebarColumn.Width = new GridLength(0);
+            }
+
             // enable tooltips if neccesary
             if (gs.enableConfigToolTips == true)
             {
                 ConfigToolTips.SetToolTips(1);
             }
 
+            // set all tooltips to remain open until user moves the mouse away
+            ToolTipService.ShowDurationProperty.OverrideMetadata(
+    typeof(DependencyObject), new FrameworkPropertyMetadata(Int32.MaxValue));
+
             // initialise input class            
             Input.Initialize(this);
 
@@ -269,6 +289,9 @@ public MainWindow()
             _searchTimer.Tick += new EventHandler(OnSearchTimerTick);
             _searchTimer.Interval = new TimeSpan(0, 0, 0, 0, 500);
 
+            // background image
+            SetBackgroundImage();
+
             LogParser.EmptyLoad();
         }
 
@@ -288,6 +311,9 @@ private void btnChangeColorScheme_Click(object sender, RoutedEventArgs e)
             colorSchemeChanger.Left = this.Left + this.ActualWidth / 2.0;
             colorSchemeChanger.Top = this.Top + this.ActualHeight / 2.0;
             colorSchemeChanger.Show();
+
+            // change background
+            //SetBackgroundImage();
         }
 
         void RestoreScalingFactor(object sender, MouseButtonEventArgs args)
@@ -1350,7 +1376,6 @@ private void dgGameList_SelectionChanged(object sender, SelectionChangedEventArg
             // choose context menu to show based on single or multiple selection
             var dg = sender as DataGrid;
 
-           
             if (dg.SelectedIndex > -1)
                 GamesLibraryView.StoreSelectedRow(dg);
 
@@ -3750,6 +3775,14 @@ await Task.Run(() =>
             UpdateCheckMednafen();            
         }
 
+        DispatcherTimer dlTimer = new DispatcherTimer();
+        private void dlTimer_Tick(object sender, EventArgs e)
+        {
+            // if this gets called, we can assume the download has timed out
+            //MessageBox.Show("download has timed out!");
+            dlTimedout = true;
+        }
+
         private bool StartDownload(ProgressDialogController controller, string uri, string destination, string dialogMessage)
         {
             DialogMessage = dialogMessage;
@@ -3765,9 +3798,14 @@ private bool StartDownload(ProgressDialogController controller, string uri, stri
                     PDC.Maximum = 100;
                     PDC.Minimum = 0;
                     wc.DownloadProgressChanged += new DownloadProgressChangedEventHandler(client_DownloadProgressChanged);
-                    wc.DownloadFileCompleted += new AsyncCompletedEventHandler(client_DownloadFileCompleted);
+                    wc.DownloadFileCompleted += new AsyncCompletedEventHandler(client_DownloadFileCompleted);                    
                     wc.DownloadFileAsync(new Uri(uri), destination);
 
+                    // start the download timer 
+                    DownloadTimerGo(wc);
+                    
+
+
                     while (!DownloadComplete)
                     {
                         // tick
@@ -3792,27 +3830,56 @@ private bool StartDownload(ProgressDialogController controller, string uri, stri
             }
         }
 
+        bool dlTimedout = false;
+
+        private void DownloadTimerGo(CustomWebClient wc)
+        {
+            dlTimedout = false;
+            dlTimer.Tick += new EventHandler(dlTimer_Tick);
+            dlTimer.Interval = new TimeSpan(0, 0, 20);
+            dlTimer.Start();
+
+            while (dlTimer.IsEnabled)
+            {
+                // timer is running
+                if (dlTimedout == true)
+                {
+                    // download has timed out - cancel it
+                    wc.CancelAsync();
+                }
+            }
+        }
+
         private void client_DownloadProgressChanged(object sender, DownloadProgressChangedEventArgs e)
         {
             // update PDC with percentage
             PDC.SetProgress(e.ProgressPercentage);
             PDC.SetMessage(DialogMessage +  "\n\nDownloaded " + e.BytesReceived + " of " + e.TotalBytesToReceive + " bytes");
+
+            // reset the timer
+            dlTimer.Stop();
+            dlTimer.Start();
         }
 
         private void client_DownloadFileCompleted(object sender, AsyncCompletedEventArgs e)
         {
+            // stop the timer
+            dlTimer.Stop();
+
             //progressBar1.Value = 0;
             DownloadComplete = true;
 
             if (e.Cancelled)
             {
-                MessageBox.Show("The download has been cancelled");
+                MessageBox.Show("The download has been cancelled: \n\n" + e.Cancelled);
                 return;
             }
 
+            
+
             if (e.Error != null) // We have an error! Retry a few times, then abort.
             {
-                MessageBox.Show("An error ocurred while trying to download file");
+                MessageBox.Show("An error ocurred while trying to download file: \n\n" + e.Error);
 
                 return;
             }
@@ -5931,6 +5998,12 @@ private void TabControl_SelectionChanged(object sender, SelectionChangedEventArg
                 if (item == null)
                     return;
 
+                // instantiate the discord visual handler when the discord tab is first clicked
+                if (DVH == null && item.Header.ToString() == "Discord")
+                {
+                    DVH = new DiscordVisualHandler();
+                }
+
                 if (item.Header.ToString() == "Configs")
                 {
                     ConfigsTabSelected = true;
@@ -5975,6 +6048,8 @@ private void TabControl_SelectionChanged(object sender, SelectionChangedEventArg
                     //MessageBox.Show("Config saved for configid: " + configId);
                     //lblConfigStatus.Content = "***Config Saved***";
                 }
+
+                
                 
             }
         }
@@ -5984,7 +6059,7 @@ private void DiscordLogo_MouseDown(object sender, MouseButtonEventArgs e)
             // Launch discord invite link in default browser
             try
             {
-                Process.Start("https://discord.gg/sD54x3");
+                Process.Start("https://discord.gg/nsbanNa");
             }
             catch
             {
@@ -6004,6 +6079,136 @@ private void DiscordLogo_MouseLeave(object sender, MouseEventArgs e)
             var im = (Image)sender as Image;
             im.Cursor = Cursors.Arrow;
         }
+
+        /// <summary>
+        /// entry point for discord connection
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void btnDiscordConnect_Click(object sender, RoutedEventArgs e)
+        {
+            var btn = (Button)sender as Button;
+
+            // temporary code for now until mednanet client is implemented
+            if (tbDiscordName.Text == null || tbDiscordName.Text.Trim() == "")
+            {
+                MessageBox.Show("Please enter a valid username", "Username Missing!", MessageBoxButton.OK, MessageBoxImage.Exclamation);
+            }
+            else if (btn.Content.ToString() == "CONNECT")
+            {
+                DVH.SetConnectedStatus(true);
+                DVH.PostLocalOnlyMessage("Connecting to the MednaNet API...");
+
+
+                // select the first channel
+
+                UIHandler ui = UIHandler.GetChildren(DiscordSelectorWrapPanel);
+                RadioButton rb = ui.RadioButtons.FirstOrDefault();
+
+                if (rb != null)
+                {
+                    rb.IsChecked = true;
+                    string name = rb.Name;
+                    string idStr = name.Replace("rbDiscordCh", "");
+                    int id = Convert.ToInt32(idStr);
+                    DVH.ChangeChannel(id);
+
+                    // update title
+                    lblDiscordChannel.Content = "MedLaunch: Discord - #" + DVH.channels.Data.Where(a => a.ChannelId == id).FirstOrDefault().ChannelName;
+
+                }            
+            }
+            else
+            {
+                DVH.SetConnectedStatus(false);
+                DVH.PostLocalOnlyMessage("Disconnecting from the MednaNet API...");
+                lblDiscordChannel.Content = "MedLaunch: Discord";
+                expDiscordUsersOnline.Header = "USERS ONLINE (0)";
+            }
+        }
+
+        private void btnDiscordChatSend_Click(object sender, RoutedEventArgs e)
+        {
+            string con = tbDiscordMessageBox.Text.Trim();
+            if (con == "")
+                return;
+
+            //DVH.PostMessage(con, DVH.channels.ActiveChannel);
+            DVH.PostFromLocal(con);
+
+            tbDiscordMessageBox.Text = "";
+        }
+
+        public void btnDiscordChannel_Checked(object sender, RoutedEventArgs e)
+        {
+            // get channel ID from name
+            var btn = (RadioButton)sender as RadioButton;
+            string name = btn.Name;
+            string idStr = name.Replace("rbDiscordCh", "");
+            int id = Convert.ToInt32(idStr);
+
+            // notify discordvisualhandler that channel has changed
+            DVH.ChangeChannel(id);
+
+            // update title
+            lblDiscordChannel.Content = "MedLaunch: Discord - #" + DVH.channels.Data.Where(a => a.ChannelId == id).FirstOrDefault().ChannelName;
+
+        }
+
+        public void Hyperlink_Click(object sender, EventArgs e)
+        {
+            Process.Start((sender as Hyperlink).NavigateUri.AbsoluteUri);
+        }
+
+        /// <summary>
+        /// fired when the games library sidebar gridsplitter has finished being dragged
+        /// the width value should be then saved
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void gamesSidebarGS_DragCompleted(object sender, DragCompletedEventArgs e)
+        {
+            // set current column width
+            double width = sidebarColumn.ActualWidth;
+            GamesSidebarWidth = width;
+            GlobalSettings.SetSidebarWidth(width);
+        }
+
+        public void SetBackgroundImage()
+        {
+            var gs = GlobalSettings.GetGlobals();
+            double opac = gs.bgImageOpacity;
+            string path = gs.bgImagePath;
+            int type = gs.bgImageDisplayType;
+
+            RootGrid.Background = null;
+
+            
+            
+
+            ImageBrush ib = new ImageBrush();
+
+            if (!File.Exists(GlobalSettings.GetFullBGImagePath(path)))
+            {
+                ib.ImageSource = new BitmapImage(new Uri(GlobalSettings.GetFullBGImagePath(GlobalSettings.GetDefaultBeetlePath())));
+            }
+            else
+            {
+                ib.ImageSource = new BitmapImage(new Uri(GlobalSettings.GetFullBGImagePath(path)));
+            }
+
+            ib.Opacity = opac;
+
+            if (type == 1)
+            {
+                ib.TileMode = TileMode.Tile;
+                Rect r = new Rect(new Size(32, 32));
+                ib.Viewport = r;
+                ib.ViewportUnits = BrushMappingMode.Absolute;
+            }
+
+            RootGrid.Background = ib;
+        }
     }
 
 
@@ -6028,6 +6233,126 @@ public enum MediaType
         ALL
     }
 
+    public class AttachedProperties
+    {
+        #region HideExpanderArrow AttachedProperty
 
+        [AttachedPropertyBrowsableForType(typeof(Expander))]
+        public static bool GetHideExpanderArrow(DependencyObject obj)
+        {
+            return (bool)obj.GetValue(HideExpanderArrowProperty);
+        }
+
+        [AttachedPropertyBrowsableForType(typeof(Expander))]
+        public static void SetHideExpanderArrow(DependencyObject obj, bool value)
+        {
+            obj.SetValue(HideExpanderArrowProperty, value);
+        }
+
+        // Using a DependencyProperty as the backing store for HideExpanderArrow.  This enables animation, styling, binding, etc...
+        public static readonly DependencyProperty HideExpanderArrowProperty =
+            DependencyProperty.RegisterAttached("HideExpanderArrow", typeof(bool), typeof(AttachedProperties), new UIPropertyMetadata(false, OnHideExpanderArrowChanged));
+
+        private static void OnHideExpanderArrowChanged(DependencyObject o, DependencyPropertyChangedEventArgs e)
+        {
+            Expander expander = (Expander)o;
+
+            if (expander.IsLoaded)
+            {
+                UpdateExpanderArrow(expander, (bool)e.NewValue);
+            }
+            else
+            {
+                expander.Loaded += new RoutedEventHandler((x, y) => UpdateExpanderArrow(expander, (bool)e.NewValue));
+            }
+        }
+
+        private static void UpdateExpanderArrow(Expander expander, bool visible)
+        {
+            int c = VisualTreeHelper.GetChildrenCount(expander);
+            if (c == 0)
+                return;
+
+            Grid headerGrid = new Grid();
+
+            switch (c)
+            {
+                case 1:
+                    headerGrid = VisualTreeHelper.GetChild(expander, 0) as Grid;
+                    break;
+
+                case 2:
+                    headerGrid =
+               VisualTreeHelper.GetChild(
+                           VisualTreeHelper.GetChild(
+                                       expander,
+                                       0),
+                       0) as Grid;
+                    break;
+
+                case 3:
+                    headerGrid =
+               VisualTreeHelper.GetChild(
+                           VisualTreeHelper.GetChild(
+                               VisualTreeHelper.GetChild(
+                                       expander,
+                                       0),
+                                   0),
+                       0) as Grid;
+                    break;
+
+                case 4:
+                    headerGrid =
+                VisualTreeHelper.GetChild(
+                            VisualTreeHelper.GetChild(
+                                VisualTreeHelper.GetChild(
+                                    VisualTreeHelper.GetChild(
+                                        expander,
+                                        0),
+                                    0),
+                            0),
+                        0) as Grid;
+                    break;
+
+                case 5:
+                    headerGrid =
+                VisualTreeHelper.GetChild(
+                    VisualTreeHelper.GetChild(
+                            VisualTreeHelper.GetChild(
+                                VisualTreeHelper.GetChild(
+                                    VisualTreeHelper.GetChild(
+                                        expander,
+                                        0),
+                                    0),
+                                0),
+                            0),
+                        0) as Grid;
+                    break;
+            }
+            
+            /*
+            Grid headerGrid =
+                VisualTreeHelper.GetChild(
+                    VisualTreeHelper.GetChild(
+                            VisualTreeHelper.GetChild(
+                                VisualTreeHelper.GetChild(
+                                    VisualTreeHelper.GetChild(
+                                        expander,
+                                        0),
+                                    0),
+                                0),
+                            0),
+                        0) as Grid;
+                        */
+
+            headerGrid.Children[0].Visibility = visible ? Visibility.Collapsed : Visibility.Visible; // Hide or show the Ellipse
+            headerGrid.Children[1].Visibility = visible ? Visibility.Collapsed : Visibility.Visible; // Hide or show the Arrow
+            headerGrid.Children[2].SetValue(Grid.ColumnProperty, visible ? 0 : 1); // If the Arrow is not visible, then shift the Header Content to the first column.
+            headerGrid.Children[2].SetValue(Grid.ColumnSpanProperty, visible ? 2 : 1); // If the Arrow is not visible, then set the Header Content to span both rows.
+            headerGrid.Children[2].SetValue(ContentPresenter.MarginProperty, visible ? new Thickness(0) : new Thickness(4, 0, 0, 0)); // If the Arrow is not visible, then remove the margin from the Content.
+        }
+
+        #endregion
+    }
 
 }
diff --git a/MedLaunch/MedLaunch.csproj b/MedLaunch/MedLaunch.csproj
index 109c683..6101329 100644
--- a/MedLaunch/MedLaunch.csproj
+++ b/MedLaunch/MedLaunch.csproj
@@ -279,6 +279,9 @@
     <Compile Include="Classes\GamesLibrary\GamesLibraryViewModelBase.cs" />
     <Compile Include="Classes\GamesLibrary\MultipleFilterHandler.cs" />
     <Compile Include="Classes\IO\Hex.cs" />
+    <Compile Include="Classes\MednaNet\DiscordChannels.cs" />
+    <Compile Include="Classes\MednaNet\DiscordMessage.cs" />
+    <Compile Include="Classes\MednaNet\DiscordUsers.cs" />
     <Compile Include="Classes\MednaNet\DiscordVisualHandler.cs" />
     <Compile Include="Classes\Scanning\DiscScan.cs" />
     <Compile Include="Classes\Scanning\RomScan.cs" />
@@ -950,7 +953,9 @@
     <Resource Include="medicon.ico" />
   </ItemGroup>
   <ItemGroup>
-    <Resource Include="Data\Graphics\medicon.png" />
+    <None Include="Data\Graphics\medicon.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <Resource Include="Data\Graphics\Systems\default.jpg" />
@@ -989,6 +994,8 @@
     <None Include="Data\System\SaturnList.txt" />
     <Resource Include="Data\Graphics\Discord_logo_svg.svg.png" />
     <Resource Include="Data\Graphics\MedLaunch_sm.png" />
+    <Resource Include="Data\Graphics\Icons\usericon_discord.png" />
+    <Resource Include="Data\Graphics\Icons\usericon_medlaunch.png" />
     <Content Include="ExternalAssemblies\WindowScrape.dll" />
     <Resource Include="MedLaunchIcon.ico" />
     <Resource Include="Data\Graphics\Controllers\lynx_controller.png" />
diff --git a/MedLaunch/Models/ConfigBaseSettings.cs b/MedLaunch/Models/ConfigBaseSettings.cs
index c2c5b86..b1bfc91 100644
--- a/MedLaunch/Models/ConfigBaseSettings.cs
+++ b/MedLaunch/Models/ConfigBaseSettings.cs
@@ -564,6 +564,19 @@ public class ConfigBaseSettings
         public string ss__debugger__disfontsize { get; set; }
         public string ss__debugger__memcharenc { get; set; }
 
+        public string ss__input__port1__3dpad__mode__defpos { get; set; }
+        public string ss__input__port2__3dpad__mode__defpos { get; set; }
+        public string ss__input__port3__3dpad__mode__defpos { get; set; }
+        public string ss__input__port4__3dpad__mode__defpos { get; set; }
+        public string ss__input__port5__3dpad__mode__defpos { get; set; }
+        public string ss__input__port6__3dpad__mode__defpos { get; set; }
+        public string ss__input__port7__3dpad__mode__defpos { get; set; }
+        public string ss__input__port8__3dpad__mode__defpos { get; set; }
+        public string ss__input__port9__3dpad__mode__defpos { get; set; }
+        public string ss__input__port10__3dpad__mode__defpos { get; set; }
+        public string ss__input__port11__3dpad__mode__defpos { get; set; }
+        public string ss__input__port12__3dpad__mode__defpos { get; set; }
+
         public bool? ss__enable { get; set; }
         public bool? ss__forcemono { get; set; }
         public string ss__shader { get; set; }
@@ -1456,6 +1469,19 @@ public static ConfigBaseSettings GetConfigDefaults()
                 ss__input__sport1__multitap = false,
                 ss__input__sport2__multitap = false,
 
+                ss__input__port10__3dpad__mode__defpos = "digital",
+                ss__input__port11__3dpad__mode__defpos = "digital",
+                ss__input__port12__3dpad__mode__defpos = "digital",
+                ss__input__port1__3dpad__mode__defpos = "digital",
+                ss__input__port2__3dpad__mode__defpos = "digital",
+                ss__input__port3__3dpad__mode__defpos = "digital",
+                ss__input__port4__3dpad__mode__defpos = "digital",
+                ss__input__port5__3dpad__mode__defpos = "digital",
+                ss__input__port6__3dpad__mode__defpos = "digital",
+                ss__input__port7__3dpad__mode__defpos = "digital",
+                ss__input__port8__3dpad__mode__defpos = "digital",
+                ss__input__port9__3dpad__mode__defpos = "digital",
+
 
                 // playstation
                 psx__bios_eu = "scph5502.bin",
diff --git a/MedLaunch/Models/GlobalSettings.cs b/MedLaunch/Models/GlobalSettings.cs
index e1402e1..ba206bf 100644
--- a/MedLaunch/Models/GlobalSettings.cs
+++ b/MedLaunch/Models/GlobalSettings.cs
@@ -1,6 +1,7 @@
 using Microsoft.Data.Entity;
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -40,6 +41,9 @@ public class GlobalSettings
         public bool glSystemInfo { get; set; }
         public bool glManuals { get; set; }
 
+        // library sidebar width
+        public double sidebarwidth { get; set; }
+
         // games library columns (no longer used)
         public bool showGLPublisher { get; set; }
         public bool showGLDeveloper { get; set; }
@@ -110,6 +114,11 @@ public class GlobalSettings
         public string colorBackground { get; set; }
         public string colorAccent { get; set; }
 
+        // background image
+        public string bgImagePath { get; set; }
+        public int bgImageDisplayType { get; set; }
+        public double bgImageOpacity { get; set; }
+
         // application settings
         public bool? checkUpdatesOnStart { get; set; }
         public double imageToolTipPercentage { get; set; }           // what percentage of the current windows size can the image tooltips be
@@ -231,11 +240,91 @@ public static GlobalSettings GetGlobalDefaults()
                 coreVis17 = true,
                 coreVis18 = true,
 
+                sidebarwidth = 350,
+                bgImagePath = @"Data\Graphics\medicon.png",
+                bgImageDisplayType = 0,
+                bgImageOpacity = 0.1,
+
                 rememberSysWinPositions = false
             };
             return gs;
         }
 
+        public static double GetBGImageOpacity()
+        {
+            var gs = GetGlobals();
+            return gs.bgImageOpacity;
+        }
+
+        public static void SetBgImageOpacity(double opac)
+        {
+            var gs = GetGlobals();
+            gs.bgImageOpacity = opac;
+            SetGlobals(gs);
+        }
+
+        public static string GetDefaultBeetlePath()
+        {
+            return @"Data\Graphics\medicon.png";
+        }
+
+        public static string GetFullBGImagePath(string imagePath)
+        {
+            var gs = GlobalSettings.GetGlobals();
+            string bgImage = gs.bgImagePath;
+            string finalPath = bgImage;
+
+            if (imagePath != null)
+            {
+                bgImage = imagePath;
+            }
+
+            if (bgImage.StartsWith(@"Data"))
+            {
+                // relative path
+                finalPath = AppDomain.CurrentDomain.BaseDirectory + bgImage;
+            }
+            else
+            {
+                // absolute path                
+                finalPath = bgImage;
+            }
+
+            if (finalPath != null && File.Exists(finalPath))
+            {
+                return finalPath;
+            }
+            else
+            {
+                // problem - return beetle
+                return GetFullBGImagePath(GetDefaultBeetlePath());
+            }
+        }
+
+        public static int getBgImageDisplayType()
+        {
+            var gs = GetGlobals();
+            return gs.bgImageDisplayType;
+        }
+        public static void setBgImageDisplayType(int type)
+        {
+            var gs = GetGlobals();
+            gs.bgImageDisplayType = type;
+            SetGlobals(gs);
+        }
+
+        public static double GetSidebarWidth()
+        {
+            var gs = GlobalSettings.GetGlobals();
+            return gs.sidebarwidth;
+        }
+        public static void SetSidebarWidth(double width)
+        {
+            var gs = GlobalSettings.GetGlobals();
+            gs.sidebarwidth = width;
+            SetGlobals(gs);
+        }
+
         public static string[] GetGUIColors()
         {
             var gs = GlobalSettings.GetGlobals();
diff --git a/MedLaunch/Models/Versions.cs b/MedLaunch/Models/Versions.cs
index 5fac74b..6b2b274 100644
--- a/MedLaunch/Models/Versions.cs
+++ b/MedLaunch/Models/Versions.cs
@@ -31,6 +31,17 @@ public static List<MednafenChangeHistory> GetMednafenCompatibilityMatrix()
             return
                 new List<MednafenChangeHistory>
                 {
+                    // 0.9.46.1
+                    new MednafenChangeHistory
+                    {
+                        Version = "0.9.46",
+                        DownloadURL = "https://mednafen.github.io/releases/files/mednafen-0.9.46-win64.zip",
+                        Changes = new List<VersionChange>
+                        {
+
+                        }
+                    },
+
                     // 0.9.45.1
                     new MednafenChangeHistory
                     {
@@ -38,7 +49,18 @@ public static List<MednafenChangeHistory> GetMednafenCompatibilityMatrix()
                         DownloadURL = "https://mednafen.github.io/releases/files/mednafen-0.9.45.1-win64.zip",
                         Changes = new List<VersionChange>
                         {
-
+                            new VersionChange { Description = "SS 3dpad default mode", ChangeMethod = ChangeType.ToRemove, Item = "ss.input.port1.3dpad.mode.defpos" },
+                            new VersionChange { Description = "SS 3dpad default mode", ChangeMethod = ChangeType.ToRemove, Item = "ss.input.port2.3dpad.mode.defpos" },
+                            new VersionChange { Description = "SS 3dpad default mode", ChangeMethod = ChangeType.ToRemove, Item = "ss.input.port3.3dpad.mode.defpos" },
+                            new VersionChange { Description = "SS 3dpad default mode", ChangeMethod = ChangeType.ToRemove, Item = "ss.input.port4.3dpad.mode.defpos" },
+                            new VersionChange { Description = "SS 3dpad default mode", ChangeMethod = ChangeType.ToRemove, Item = "ss.input.port5.3dpad.mode.defpos" },
+                            new VersionChange { Description = "SS 3dpad default mode", ChangeMethod = ChangeType.ToRemove, Item = "ss.input.port6.3dpad.mode.defpos" },
+                            new VersionChange { Description = "SS 3dpad default mode", ChangeMethod = ChangeType.ToRemove, Item = "ss.input.port7.3dpad.mode.defpos" },
+                            new VersionChange { Description = "SS 3dpad default mode", ChangeMethod = ChangeType.ToRemove, Item = "ss.input.port8.3dpad.mode.defpos" },
+                            new VersionChange { Description = "SS 3dpad default mode", ChangeMethod = ChangeType.ToRemove, Item = "ss.input.port9.3dpad.mode.defpos" },
+                            new VersionChange { Description = "SS 3dpad default mode", ChangeMethod = ChangeType.ToRemove, Item = "ss.input.port10.3dpad.mode.defpos" },
+                            new VersionChange { Description = "SS 3dpad default mode", ChangeMethod = ChangeType.ToRemove, Item = "ss.input.port11.3dpad.mode.defpos" },
+                            new VersionChange { Description = "SS 3dpad default mode", ChangeMethod = ChangeType.ToRemove, Item = "ss.input.port12.3dpad.mode.defpos" },
                         }
                     },
 
diff --git a/MedLaunch/Properties/AssemblyInfo.cs b/MedLaunch/Properties/AssemblyInfo.cs
index b7bec37..3f694c9 100644
--- a/MedLaunch/Properties/AssemblyInfo.cs
+++ b/MedLaunch/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.5.7.2")]
-[assembly: AssemblyFileVersion("0.5.7.2")]
+[assembly: AssemblyVersion("0.5.8.0")]
+[assembly: AssemblyFileVersion("0.5.8.0")]
diff --git a/MedLaunch/UserControls/Control/GbCtrl.xaml b/MedLaunch/UserControls/Control/GbCtrl.xaml
index 0f26d74..b8fbc65 100644
--- a/MedLaunch/UserControls/Control/GbCtrl.xaml
+++ b/MedLaunch/UserControls/Control/GbCtrl.xaml
@@ -5,6 +5,7 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:MedLaunch"
              xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+             TextOptions.TextFormattingMode="Display"
              xmlns:simpleChildWindow="clr-namespace:MahApps.Metro.SimpleChildWindow;assembly=MahApps.Metro.SimpleChildWindow"
              xmlns:diag="clr-namespace:System.Diagnostics;assembly=mscorlib"
              
@@ -12,7 +13,7 @@
              d:DesignHeight="600" d:DesignWidth="600">
 
             <Border Style="{StaticResource Borders1}" Margin="10" Name="controlBrd">
-                <Expander IsExpanded="True" BorderThickness="0" Header="GameBoy/GameBoy Color">
+        <GroupBox Margin="0" BorderThickness="0" Header="GameBoy/GameBoy Color">
                     <StackPanel Margin="10">
                        
                         <WrapPanel HorizontalAlignment="Center" Margin="5" Orientation="Vertical">
@@ -48,7 +49,7 @@
                         </WrapPanel>
 
                     </StackPanel>
-                </Expander>
+                </GroupBox>
             </Border>
 
 
diff --git a/MedLaunch/UserControls/Control/GbaCtrl.xaml b/MedLaunch/UserControls/Control/GbaCtrl.xaml
index 5ddafd1..5aa0c01 100644
--- a/MedLaunch/UserControls/Control/GbaCtrl.xaml
+++ b/MedLaunch/UserControls/Control/GbaCtrl.xaml
@@ -3,6 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             TextOptions.TextFormattingMode="Display"
              xmlns:local="clr-namespace:MedLaunch"
              xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
              xmlns:simpleChildWindow="clr-namespace:MahApps.Metro.SimpleChildWindow;assembly=MahApps.Metro.SimpleChildWindow"
@@ -12,7 +13,7 @@
              d:DesignHeight="600" d:DesignWidth="600">
 
             <Border Style="{StaticResource Borders1}" Margin="10" Name="controlBrd">
-                <Expander IsExpanded="True" BorderThickness="0" Header="GameBoy Advance">
+        <GroupBox Margin="0" BorderThickness="0" Header="GameBoy Advance">
                     <StackPanel Margin="10">
                        
                         <WrapPanel HorizontalAlignment="Center" Margin="5" Orientation="Vertical">
@@ -48,7 +49,7 @@
                         </WrapPanel>
 
                     </StackPanel>
-                </Expander>
+                </GroupBox>
             </Border>
 
 
diff --git a/MedLaunch/UserControls/Control/GgCtrl.xaml b/MedLaunch/UserControls/Control/GgCtrl.xaml
index 81335a9..edc3137 100644
--- a/MedLaunch/UserControls/Control/GgCtrl.xaml
+++ b/MedLaunch/UserControls/Control/GgCtrl.xaml
@@ -3,6 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             TextOptions.TextFormattingMode="Display"
              xmlns:local="clr-namespace:MedLaunch"
              xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
              xmlns:simpleChildWindow="clr-namespace:MahApps.Metro.SimpleChildWindow;assembly=MahApps.Metro.SimpleChildWindow"
@@ -13,7 +14,7 @@
     
         
             <Border Style="{StaticResource Borders1}" Margin="10" Name="controlBrd">
-                <Expander IsExpanded="True" BorderThickness="0" Header="Game Gear">
+        <GroupBox Margin="0" BorderThickness="0" Header="Game Gear">
                     <StackPanel Margin="10">
                        
                         <WrapPanel HorizontalAlignment="Center" Margin="5" Orientation="Vertical">
@@ -49,7 +50,7 @@
                         </WrapPanel>
 
                     </StackPanel>
-                </Expander>
+                </GroupBox>
             </Border>
 
         
diff --git a/MedLaunch/UserControls/Control/LynxCtrl.xaml b/MedLaunch/UserControls/Control/LynxCtrl.xaml
index 5f27dbd..399f213 100644
--- a/MedLaunch/UserControls/Control/LynxCtrl.xaml
+++ b/MedLaunch/UserControls/Control/LynxCtrl.xaml
@@ -2,6 +2,7 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             TextOptions.TextFormattingMode="Display"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:MedLaunch"
              xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
@@ -12,7 +13,7 @@
              d:DesignHeight="600" d:DesignWidth="600">
 
             <Border Style="{StaticResource Borders1}" Margin="10" Name="controlBrd">
-                <Expander IsExpanded="True" BorderThickness="0" Header="Lynx">
+        <GroupBox Margin="0" BorderThickness="0" Header="Lynx">
                     <StackPanel Margin="10">
                        
                         <WrapPanel HorizontalAlignment="Center" Margin="5" Orientation="Vertical">
@@ -48,7 +49,7 @@
                         </WrapPanel>
 
                     </StackPanel>
-                </Expander>
+                </GroupBox>
             </Border>
 
 
diff --git a/MedLaunch/UserControls/Control/MdCtrl.xaml b/MedLaunch/UserControls/Control/MdCtrl.xaml
index 651d08e..ae58111 100644
--- a/MedLaunch/UserControls/Control/MdCtrl.xaml
+++ b/MedLaunch/UserControls/Control/MdCtrl.xaml
@@ -7,12 +7,13 @@
              xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
              xmlns:simpleChildWindow="clr-namespace:MahApps.Metro.SimpleChildWindow;assembly=MahApps.Metro.SimpleChildWindow"
              xmlns:diag="clr-namespace:System.Diagnostics;assembly=mscorlib"
+             TextOptions.TextFormattingMode="Display"
              
              mc:Ignorable="d" 
              d:DesignHeight="600" d:DesignWidth="600">
 
             <Border Style="{StaticResource Borders1}" Margin="10" Name="controlBrd">
-                <Expander IsExpanded="True" BorderThickness="0" Header="Megadrive/Genesis">
+        <GroupBox Margin="0" BorderThickness="0" Header="Megadrive/Genesis">
                     <StackPanel Margin="10">
                        
                         <WrapPanel HorizontalAlignment="Center" Margin="5" Orientation="Vertical">
@@ -111,7 +112,7 @@
                         </WrapPanel>
 
                     </StackPanel>
-                </Expander>
+                </GroupBox>
             </Border>
 
 </UserControl>
diff --git a/MedLaunch/UserControls/Control/NesCtrl.xaml b/MedLaunch/UserControls/Control/NesCtrl.xaml
index 04d5dab..58b08d4 100644
--- a/MedLaunch/UserControls/Control/NesCtrl.xaml
+++ b/MedLaunch/UserControls/Control/NesCtrl.xaml
@@ -7,12 +7,13 @@
              xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
              xmlns:simpleChildWindow="clr-namespace:MahApps.Metro.SimpleChildWindow;assembly=MahApps.Metro.SimpleChildWindow"
              xmlns:diag="clr-namespace:System.Diagnostics;assembly=mscorlib"
+             TextOptions.TextFormattingMode="Display"
              
              mc:Ignorable="d" 
              d:DesignHeight="600" d:DesignWidth="600">
 
             <Border Style="{StaticResource Borders1}" Margin="10" Name="controlBrd">
-                <Expander IsExpanded="True" BorderThickness="0" Header="NES">
+        <GroupBox Margin="0" BorderThickness="0" Header="NES">
                     <StackPanel Margin="10">
                        
                         <WrapPanel HorizontalAlignment="Center" Margin="5" Orientation="Vertical">
@@ -55,7 +56,7 @@
                         </WrapPanel>
 
                     </StackPanel>
-                </Expander>
+                </GroupBox>
             </Border>
 
 </UserControl>
diff --git a/MedLaunch/UserControls/Control/NgpCtrl.xaml b/MedLaunch/UserControls/Control/NgpCtrl.xaml
index c47b1cd..0e11d6d 100644
--- a/MedLaunch/UserControls/Control/NgpCtrl.xaml
+++ b/MedLaunch/UserControls/Control/NgpCtrl.xaml
@@ -3,6 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             TextOptions.TextFormattingMode="Display"
              xmlns:local="clr-namespace:MedLaunch"
              xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
              xmlns:simpleChildWindow="clr-namespace:MahApps.Metro.SimpleChildWindow;assembly=MahApps.Metro.SimpleChildWindow"
@@ -12,7 +13,7 @@
              d:DesignHeight="600" d:DesignWidth="600">
 
             <Border Style="{StaticResource Borders1}" Margin="10" Name="controlBrd">
-                <Expander IsExpanded="True" BorderThickness="0" Header="NeoGeo Pocket/Color">
+        <GroupBox Margin="0" BorderThickness="0" Header="NeoGeo Pocket/Color">
                     <StackPanel Margin="10">
                        
                         <WrapPanel HorizontalAlignment="Center" Margin="5" Orientation="Vertical">
@@ -48,7 +49,7 @@
                         </WrapPanel>
 
                     </StackPanel>
-                </Expander>
+                </GroupBox>
             </Border>
 
 
diff --git a/MedLaunch/UserControls/Control/PceCtrl.xaml b/MedLaunch/UserControls/Control/PceCtrl.xaml
index f9c8964..6e7aace 100644
--- a/MedLaunch/UserControls/Control/PceCtrl.xaml
+++ b/MedLaunch/UserControls/Control/PceCtrl.xaml
@@ -2,6 +2,7 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             TextOptions.TextFormattingMode="Display"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:MedLaunch"
              xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
@@ -12,7 +13,7 @@
              d:DesignHeight="600" d:DesignWidth="600">
 
             <Border Style="{StaticResource Borders1}" Margin="10" Name="controlBrd">
-                <Expander IsExpanded="True" BorderThickness="0" Header="PC Engine / TurboGrafx 16">
+        <GroupBox Margin="0" BorderThickness="0" Header="PC Engine / TurboGrafx 16">
                     <StackPanel Margin="10">
                        
                         <WrapPanel HorizontalAlignment="Center" Margin="5" Orientation="Vertical">
@@ -56,7 +57,7 @@
                         </WrapPanel>
 
                     </StackPanel>
-                </Expander>
+                </GroupBox>
             </Border>
 
 </UserControl>
diff --git a/MedLaunch/UserControls/Control/Pce_FastCtrl.xaml b/MedLaunch/UserControls/Control/Pce_FastCtrl.xaml
index feaf276..f4f2329 100644
--- a/MedLaunch/UserControls/Control/Pce_FastCtrl.xaml
+++ b/MedLaunch/UserControls/Control/Pce_FastCtrl.xaml
@@ -2,6 +2,7 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             TextOptions.TextFormattingMode="Display"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:MedLaunch"
              xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
@@ -12,7 +13,7 @@
              d:DesignHeight="600" d:DesignWidth="600">
 
             <Border Style="{StaticResource Borders1}" Margin="10" Name="controlBrd">
-                <Expander IsExpanded="True" BorderThickness="0" Header="PC Engine / TurboGrafx 16 (fast)">
+        <GroupBox Margin="0" BorderThickness="0" Header="PC Engine / TurboGrafx 16 (fast)">
                     <StackPanel Margin="10">
                        
                         <WrapPanel HorizontalAlignment="Center" Margin="5" Orientation="Vertical">
@@ -56,7 +57,7 @@
                         </WrapPanel>
 
                     </StackPanel>
-                </Expander>
+                </GroupBox>
             </Border>
 
 </UserControl>
diff --git a/MedLaunch/UserControls/Control/PcfxCtrl.xaml b/MedLaunch/UserControls/Control/PcfxCtrl.xaml
index f198872..e876315 100644
--- a/MedLaunch/UserControls/Control/PcfxCtrl.xaml
+++ b/MedLaunch/UserControls/Control/PcfxCtrl.xaml
@@ -2,6 +2,7 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             TextOptions.TextFormattingMode="Display"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:MedLaunch"
              xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
@@ -12,7 +13,7 @@
              d:DesignHeight="600" d:DesignWidth="600">
 
             <Border Style="{StaticResource Borders1}" Margin="10" Name="controlBrd">
-                <Expander IsExpanded="True" BorderThickness="0" Header="PCFX">
+        <GroupBox Margin="0" BorderThickness="0" Header="PCFX">
                     <StackPanel Margin="10">
                        
                         <WrapPanel HorizontalAlignment="Center" Margin="5" Orientation="Vertical">
@@ -59,7 +60,7 @@
                         </WrapPanel>
 
                     </StackPanel>
-                </Expander>
+                </GroupBox>
             </Border>
 
 </UserControl>
diff --git a/MedLaunch/UserControls/Control/PsxCtrl.xaml b/MedLaunch/UserControls/Control/PsxCtrl.xaml
index 4807d15..b441f15 100644
--- a/MedLaunch/UserControls/Control/PsxCtrl.xaml
+++ b/MedLaunch/UserControls/Control/PsxCtrl.xaml
@@ -7,12 +7,13 @@
              xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
              xmlns:simpleChildWindow="clr-namespace:MahApps.Metro.SimpleChildWindow;assembly=MahApps.Metro.SimpleChildWindow"
              xmlns:diag="clr-namespace:System.Diagnostics;assembly=mscorlib"
+             TextOptions.TextFormattingMode="Display"
              
              mc:Ignorable="d" 
              d:DesignHeight="600" d:DesignWidth="600">
 
             <Border Style="{StaticResource Borders1}" Margin="10" Name="controlBrd">
-                <Expander IsExpanded="True" BorderThickness="0" Header="Playstation">
+        <GroupBox Margin="0" BorderThickness="0" Header="Playstation">
                     <StackPanel Margin="10">
                        
                         <WrapPanel HorizontalAlignment="Center" Margin="5" Orientation="Vertical">
@@ -184,7 +185,7 @@
                         </WrapPanel>
 
                     </StackPanel>
-                </Expander>
+                </GroupBox>
             </Border>
 
 </UserControl>
diff --git a/MedLaunch/UserControls/Control/SmsCtrl.xaml b/MedLaunch/UserControls/Control/SmsCtrl.xaml
index 89812e7..65bdfe5 100644
--- a/MedLaunch/UserControls/Control/SmsCtrl.xaml
+++ b/MedLaunch/UserControls/Control/SmsCtrl.xaml
@@ -2,6 +2,7 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             TextOptions.TextFormattingMode="Display"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:MedLaunch"
              xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
@@ -12,7 +13,7 @@
              d:DesignHeight="600" d:DesignWidth="600">
 
             <Border Style="{StaticResource Borders1}" Margin="10" Name="controlBrd">
-                <Expander IsExpanded="True" BorderThickness="0" Header="Master System">
+        <GroupBox Margin="0" BorderThickness="0" Header="Master System">
                     <StackPanel Margin="10">
                        
                         <WrapPanel HorizontalAlignment="Center" Margin="5" Orientation="Vertical">
@@ -53,7 +54,7 @@
                         </WrapPanel>
 
                     </StackPanel>
-                </Expander>
+                </GroupBox>
             </Border>
 
 </UserControl>
diff --git a/MedLaunch/UserControls/Control/SnesCtrl.xaml b/MedLaunch/UserControls/Control/SnesCtrl.xaml
index ed80f43..40240d3 100644
--- a/MedLaunch/UserControls/Control/SnesCtrl.xaml
+++ b/MedLaunch/UserControls/Control/SnesCtrl.xaml
@@ -2,6 +2,7 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             TextOptions.TextFormattingMode="Display"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:MedLaunch"
              xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
@@ -12,7 +13,7 @@
              d:DesignHeight="600" d:DesignWidth="600">
 
             <Border Style="{StaticResource Borders1}" Margin="10" Name="controlBrd">
-                <Expander IsExpanded="True" BorderThickness="0" Header="SNES">
+        <GroupBox Margin="0" BorderThickness="0" Header="SNES">
                     <StackPanel Margin="10">
                        
                         <WrapPanel HorizontalAlignment="Center" Margin="5" Orientation="Vertical">
@@ -59,7 +60,7 @@
                         </WrapPanel>
 
                     </StackPanel>
-                </Expander>
+                </GroupBox>
             </Border>
 
 </UserControl>
diff --git a/MedLaunch/UserControls/Control/Snes_FaustCtrl.xaml b/MedLaunch/UserControls/Control/Snes_FaustCtrl.xaml
index 42fb6b9..27659ad 100644
--- a/MedLaunch/UserControls/Control/Snes_FaustCtrl.xaml
+++ b/MedLaunch/UserControls/Control/Snes_FaustCtrl.xaml
@@ -3,6 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             TextOptions.TextFormattingMode="Display"
              xmlns:local="clr-namespace:MedLaunch"
              xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
              xmlns:simpleChildWindow="clr-namespace:MahApps.Metro.SimpleChildWindow;assembly=MahApps.Metro.SimpleChildWindow"
@@ -12,7 +13,7 @@
              d:DesignHeight="600" d:DesignWidth="600">
 
             <Border Style="{StaticResource Borders1}" Margin="10" Name="controlBrd">
-                <Expander IsExpanded="True" BorderThickness="0" Header="SNES (Faust)">
+        <GroupBox Margin="0" BorderThickness="0" Header="SNES (Faust)">
                     <StackPanel Margin="10">
                        
                         <WrapPanel HorizontalAlignment="Center" Margin="5" Orientation="Vertical">
@@ -59,7 +60,7 @@
                         </WrapPanel>
 
                     </StackPanel>
-                </Expander>
+                </GroupBox>
             </Border>
 
 </UserControl>
diff --git a/MedLaunch/UserControls/Control/SsCtrl.xaml b/MedLaunch/UserControls/Control/SsCtrl.xaml
index 989bfeb..7b78f26 100644
--- a/MedLaunch/UserControls/Control/SsCtrl.xaml
+++ b/MedLaunch/UserControls/Control/SsCtrl.xaml
@@ -7,12 +7,13 @@
              xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
              xmlns:simpleChildWindow="clr-namespace:MahApps.Metro.SimpleChildWindow;assembly=MahApps.Metro.SimpleChildWindow"
              xmlns:diag="clr-namespace:System.Diagnostics;assembly=mscorlib"
+             TextOptions.TextFormattingMode="Display"
              
              mc:Ignorable="d" 
              d:DesignHeight="600" d:DesignWidth="600">
 
             <Border Style="{StaticResource Borders1}" Margin="10" Name="controlBrd">
-                <Expander IsExpanded="True" BorderThickness="0" Header="Saturn">
+        <GroupBox Margin="0" BorderThickness="0" Header="Saturn">
                     <StackPanel Margin="10">
                        
                         <WrapPanel HorizontalAlignment="Center" Margin="5" Orientation="Vertical">
@@ -205,7 +206,7 @@
                         </WrapPanel>
 
                     </StackPanel>
-                </Expander>
+                </GroupBox>
             </Border>
 
 </UserControl>
diff --git a/MedLaunch/UserControls/Control/VbCtrl.xaml b/MedLaunch/UserControls/Control/VbCtrl.xaml
index 9e3c516..6c033c6 100644
--- a/MedLaunch/UserControls/Control/VbCtrl.xaml
+++ b/MedLaunch/UserControls/Control/VbCtrl.xaml
@@ -2,6 +2,7 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             TextOptions.TextFormattingMode="Display"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:MedLaunch"
              xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
@@ -12,7 +13,7 @@
              d:DesignHeight="600" d:DesignWidth="600">
 
             <Border Style="{StaticResource Borders1}" Margin="10" Name="controlBrd">
-                <Expander IsExpanded="True" BorderThickness="0" Header="Virtual Boy">
+        <GroupBox Margin="0" BorderThickness="0" Header="Virtual Boy">
                     <StackPanel Margin="10">
                        
                         <WrapPanel HorizontalAlignment="Center" Margin="5" Orientation="Vertical">
@@ -48,7 +49,7 @@
                         </WrapPanel>
 
                     </StackPanel>
-                </Expander>
+                </GroupBox>
             </Border>
 
 
diff --git a/MedLaunch/UserControls/Control/WswanCtrl.xaml b/MedLaunch/UserControls/Control/WswanCtrl.xaml
index a39c90b..acb8789 100644
--- a/MedLaunch/UserControls/Control/WswanCtrl.xaml
+++ b/MedLaunch/UserControls/Control/WswanCtrl.xaml
@@ -2,6 +2,7 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             TextOptions.TextFormattingMode="Display"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:MedLaunch"
              xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
@@ -12,7 +13,7 @@
              d:DesignHeight="600" d:DesignWidth="600">
 
             <Border Style="{StaticResource Borders1}" Margin="10" Name="controlBrd">
-                <Expander IsExpanded="True" BorderThickness="0" Header="WonderSwan / WonderSwan Color">
+        <GroupBox Margin="0" BorderThickness="0" Header="WonderSwan / WonderSwan Color">
                     <StackPanel Margin="10">
                        
                         <WrapPanel HorizontalAlignment="Center" Margin="5" Orientation="Vertical">
@@ -48,7 +49,7 @@
                         </WrapPanel>
 
                     </StackPanel>
-                </Expander>
+                </GroupBox>
             </Border>
 
 
diff --git a/MedLaunch/Windows/AccentStyleWindow.xaml b/MedLaunch/Windows/AccentStyleWindow.xaml
index 8da996f..0cac8cd 100644
--- a/MedLaunch/Windows/AccentStyleWindow.xaml
+++ b/MedLaunch/Windows/AccentStyleWindow.xaml
@@ -39,6 +39,7 @@
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
             <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
         </Grid.RowDefinitions>
 
         <GroupBox Grid.Row="0"
@@ -53,6 +54,49 @@
         </GroupBox>
 
         <GroupBox Grid.Row="1"
+                  Margin="5"
+                  Header="Choose Background Image">
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="Auto" />
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                </Grid.RowDefinitions>
+
+                <Image Name="imgBgImage" StretchDirection="DownOnly" Width="90" Height="90" Stretch="UniformToFill" Grid.Column="0"
+                       Grid.Row="0" Grid.RowSpan="4" Margin="10" />
+
+                <StackPanel Orientation="Horizontal" Grid.Column="1" Grid.ColumnSpan="2">
+                    <Button Name="btnChooseImage" Click="btnChooseImage_Click">
+                        Browse
+                    </Button>
+                    <TextBox Name="tbImagePath" Width="200" Height="{Binding ElementName=btnChooseImage, Path=ActualHeight}" TextChanged="tbImagePath_TextChanged">
+                        
+                    </TextBox>
+                </StackPanel>
+
+                <RadioButton Name="rbDtStretch" GroupName="displayType" Grid.Column="1" Grid.Row="1" Click="rbDtStretch_Click">Stretch to Fit</RadioButton>
+                <RadioButton Name="rbDtTile" GroupName="displayType" Grid.Column="2" Grid.Row="1" Click="rbDtTile_Click">Tile</RadioButton>
+
+                <DockPanel Grid.ColumnSpan="2" Grid.Column="1" Grid.Row="2" VerticalAlignment="Center" Margin="5">
+                    <Label DockPanel.Dock="Top" VerticalAlignment="Top" HorizontalAlignment="Center">Opacity</Label>
+                    <TextBox Text="{Binding ElementName=slOpac, Path=Value, UpdateSourceTrigger=PropertyChanged}" DockPanel.Dock="Right" TextAlignment="Right" Width="40" TextChanged="TextBox_TextChanged" />
+                    <Slider Maximum="1" Minimum="0.05" TickPlacement="BottomRight" TickFrequency="0.05" IsSnapToTickEnabled="True" 
+                                        Name="slOpac" />
+                </DockPanel>
+
+                <Button Name="btnResetToBeetle" Click="btnResetToBeetle_Click" Content="Reset to Beetle" Grid.Column="1" Grid.Row="3" Grid.ColumnSpan="2"/>
+
+            </Grid>
+        </GroupBox>
+
+        <GroupBox Grid.Row="2"
                   Margin="5"
                   Header="Set Accent Colour">
             <Grid>
diff --git a/MedLaunch/Windows/AccentStyleWindow.xaml.cs b/MedLaunch/Windows/AccentStyleWindow.xaml.cs
index f0fc90c..fdb3391 100644
--- a/MedLaunch/Windows/AccentStyleWindow.xaml.cs
+++ b/MedLaunch/Windows/AccentStyleWindow.xaml.cs
@@ -7,6 +7,9 @@
 using MahApps.Metro;
 using MahApps.Metro.Controls;
 using MedLaunch.Models;
+using System.Windows.Media.Imaging;
+using Ookii.Dialogs.Wpf;
+using Microsoft.Win32;
 
 namespace MedLaunch
 {
@@ -27,6 +30,11 @@ public List<KeyValuePair<string, Color>> Colors
             set { SetValue(ColorsProperty, value); }
         }
 
+        public string ImgPath { get; set; }
+        public int ImageDisplayType { get; set; }
+        // 0 = stretch
+        // 1 = tile
+
         public AccentStyleWindow()
         {
             InitializeComponent();
@@ -42,8 +50,36 @@ public AccentStyleWindow()
             var theme = ThemeManager.DetectAppStyle(Application.Current);
             //ThemeManager.ChangeAppStyle(this, theme.Item2, theme.Item1);
 
-           
+            // image display type
+            ImageDisplayType = GlobalSettings.getBgImageDisplayType();
+            if (ImageDisplayType == 0)
+                rbDtStretch.IsChecked = true;
+            if (ImageDisplayType == 1)
+                rbDtTile.IsChecked = true;
+
+            // opacity
+            ImgOpacity = GlobalSettings.GetBGImageOpacity();
+            slOpac.Value = ImgOpacity;
+
+            // set button text
+            ImgPath = GlobalSettings.GetFullBGImagePath(null);
+            tbImagePath.Text = ImgPath;
+
+            // display the image
+            DisplayImage();
+        }
 
+        private void DisplayImage()
+        {
+            try
+            {
+                ImageSource imageSource = new BitmapImage(new Uri(ImgPath));
+                imgBgImage.Source = imageSource;
+            }
+            catch
+            {
+                // do nothing
+            }
         }
         
         private void ChangeAppThemeButtonClick(object sender, RoutedEventArgs e)
@@ -79,7 +115,16 @@ private void SaveAndClose_Click(object sender, RoutedEventArgs e)
             gs.colorBackground = bg;
             gs.colorAccent = c;
 
+            // bgimage
+            gs.bgImageDisplayType = ImageDisplayType;
+            gs.bgImageOpacity = ImgOpacity;
+            gs.bgImagePath = tbImagePath.Text;
+
             GlobalSettings.SetGlobals(gs);
+
+            MainWindow mw = Application.Current.Windows.OfType<MainWindow>().FirstOrDefault();
+            mw.SetBackgroundImage();
+
             this.Close();
         }
 
@@ -101,6 +146,16 @@ private void ResetToDefault_Click(object sender, RoutedEventArgs e)
                     break;
                 }
             }
+
+            // bgground image stuff
+            ImgPath = GlobalSettings.GetFullBGImagePath(GlobalSettings.GetDefaultBeetlePath());
+            DisplayImage();
+            ImgOpacity = 0.1;
+            slOpac.Value = ImgOpacity;
+            rbDtStretch.IsChecked = true;
+            ImageDisplayType = 0;
+            tbImagePath.Text = ImgPath;
+
         }
 
         private void Cancel_Click(object sender, RoutedEventArgs e)
@@ -128,5 +183,54 @@ private void AccentStyleWindow_Loaded(object sender, RoutedEventArgs e)
                 }
             }
         }
+
+        private void btnChooseImage_Click(object sender, RoutedEventArgs e)
+        {
+            OpenFileDialog filePath = new OpenFileDialog();
+            filePath.Multiselect = false;
+            filePath.Title = "Select Background Image";
+            filePath.Filter = "Image files (*.jpg, *.jpeg, *.gif, *.bmp, *.png) | *.jpg; *.jpeg; *.gif; *.bmp; *.png";
+            filePath.ShowDialog();
+
+            if (filePath.FileName.Length > 0)
+            {
+                tbImagePath.Text = filePath.FileName;
+            }
+        }
+
+
+
+        private void rbDtStretch_Click(object sender, RoutedEventArgs e)
+        {
+            ImageDisplayType = 0;
+        }
+
+        private void rbDtTile_Click(object sender, RoutedEventArgs e)
+        {
+            ImageDisplayType = 1;
+        }
+
+        private void btnResetToBeetle_Click(object sender, RoutedEventArgs e)
+        {
+            ImgPath = GlobalSettings.GetFullBGImagePath(GlobalSettings.GetDefaultBeetlePath());
+            DisplayImage();
+            tbImagePath.Text = ImgPath;
+        }
+
+        private void tbImagePath_TextChanged(object sender, TextChangedEventArgs e)
+        {
+            var tb = (TextBox)sender;
+            string text = tb.Text;
+            ImgPath = GlobalSettings.GetFullBGImagePath(text);
+            DisplayImage();
+        }
+
+        public double ImgOpacity { get; set; }
+
+        private void TextBox_TextChanged(object sender, TextChangedEventArgs e)
+        {
+            var tb = (TextBox)sender;
+            ImgOpacity = Convert.ToDouble(tb.Text);
+        }
     }
 }
diff --git a/MedLaunch/Windows/ConfigureController.xaml b/MedLaunch/Windows/ConfigureController.xaml
index 00e4f6b..4c59c16 100644
--- a/MedLaunch/Windows/ConfigureController.xaml
+++ b/MedLaunch/Windows/ConfigureController.xaml
@@ -15,6 +15,7 @@
 							   BorderThickness="1"
 							   ShowCloseButton="False"
                                IsModal="True"
+                               TextOptions.TextFormattingMode="Display"
                                Closing="ChildWindow_Closing">
 
     <simpleChildWindow:ChildWindow.Icon>
diff --git a/MedLaunch/Windows/DiscSelection.xaml b/MedLaunch/Windows/DiscSelection.xaml
index cb0cca4..112fcae 100644
--- a/MedLaunch/Windows/DiscSelection.xaml
+++ b/MedLaunch/Windows/DiscSelection.xaml
@@ -12,6 +12,7 @@
 							   BorderBrush="{DynamicResource AccentColorBrush}"
 							   BorderThickness="1"
 							   ShowCloseButton="True"
+                               TextOptions.TextFormattingMode="Display"
                                IsModal="True">
 
     <simpleChildWindow:ChildWindow.Icon>
diff --git a/MedLaunch/Windows/InitWindow.xaml b/MedLaunch/Windows/InitWindow.xaml
index e89bc33..4678f18 100644
--- a/MedLaunch/Windows/InitWindow.xaml
+++ b/MedLaunch/Windows/InitWindow.xaml
@@ -7,6 +7,7 @@
         mc:Ignorable="d"
         Title="MedLaunch is Initialising" Height="300" Width="500"
         Loaded="Window_Loaded"
+        TextOptions.TextFormattingMode="Display"
         ResizeMode="NoResize"
         ContentRendered="Window_ContentRendered"
         WindowStartupLocation="CenterScreen" 
diff --git a/MedLaunch/Windows/LaunchStringWindow.xaml b/MedLaunch/Windows/LaunchStringWindow.xaml
index cc003fa..edc32c9 100644
--- a/MedLaunch/Windows/LaunchStringWindow.xaml
+++ b/MedLaunch/Windows/LaunchStringWindow.xaml
@@ -12,6 +12,7 @@
 							   BorderBrush="{DynamicResource AccentColorBrush}"
 							   BorderThickness="1"
 							   ShowCloseButton="True"
+                               TextOptions.TextFormattingMode="Display"
                                IsModal="True">
 
     <simpleChildWindow:ChildWindow.Icon>
diff --git a/MedLaunch/Windows/LibraryColumnChooser.xaml b/MedLaunch/Windows/LibraryColumnChooser.xaml
index 5421fdf..75fa719 100644
--- a/MedLaunch/Windows/LibraryColumnChooser.xaml
+++ b/MedLaunch/Windows/LibraryColumnChooser.xaml
@@ -12,6 +12,7 @@
 							   BorderBrush="{DynamicResource AccentColorBrush}"
 							   BorderThickness="1"
 							   ShowCloseButton="True"
+                               TextOptions.TextFormattingMode="Display"
                                IsModal="True">
 
     <simpleChildWindow:ChildWindow.Icon>
diff --git a/MedLaunch/Windows/ListBoxChildWindow.xaml b/MedLaunch/Windows/ListBoxChildWindow.xaml
index f6d56da..73d7ed0 100644
--- a/MedLaunch/Windows/ListBoxChildWindow.xaml
+++ b/MedLaunch/Windows/ListBoxChildWindow.xaml
@@ -12,6 +12,7 @@
 							   BorderBrush="{DynamicResource AccentColorBrush}"
 							   BorderThickness="1"
 							   ShowCloseButton="True"
+                               TextOptions.TextFormattingMode="Display"
                                IsModal="True">
 
     <simpleChildWindow:ChildWindow.Icon>
diff --git a/MedLaunch/Windows/MednafenCoreVisibility.xaml b/MedLaunch/Windows/MednafenCoreVisibility.xaml
index 441ab67..45ca7af 100644
--- a/MedLaunch/Windows/MednafenCoreVisibility.xaml
+++ b/MedLaunch/Windows/MednafenCoreVisibility.xaml
@@ -6,6 +6,7 @@
 							   xmlns:simpleChildWindow="clr-namespace:MahApps.Metro.SimpleChildWindow;assembly=MahApps.Metro.SimpleChildWindow"
 							   mc:Ignorable="d"
 							   d:DesignHeight="800"
+                               TextOptions.TextFormattingMode="Display"
 							   d:DesignWidth="600"
 							   CloseOnOverlay="True"
 							   GlowBrush="{DynamicResource AccentColorBrush}"
diff --git a/MedLaunch/Windows/ScrapedDataAudit.xaml b/MedLaunch/Windows/ScrapedDataAudit.xaml
index b4771fb..d05542f 100644
--- a/MedLaunch/Windows/ScrapedDataAudit.xaml
+++ b/MedLaunch/Windows/ScrapedDataAudit.xaml
@@ -6,6 +6,7 @@
 							   xmlns:simpleChildWindow="clr-namespace:MahApps.Metro.SimpleChildWindow;assembly=MahApps.Metro.SimpleChildWindow"
 							   mc:Ignorable="d"
 							   d:DesignHeight="800"
+                               TextOptions.TextFormattingMode="Display"
 							   d:DesignWidth="600"
 							   CloseOnOverlay="True"
 							   GlowBrush="{DynamicResource AccentColorBrush}"
diff --git a/README.md b/README.md
index d39b6c8..d8e23a3 100644
--- a/README.md
+++ b/README.md
@@ -33,11 +33,11 @@
 
 **MedLaunch** is a .NET (Windows only) front-end for the excellent [Mednafen](http://mednafen.fobby.net/) multi-system emulator.
 
-Latest Version: 0.5.7.2
+Latest Version: 0.5.8.0
 
 Direct Download: [LATEST](https://downloads.medlaunch.info/latest)
 
-Compatible with Mednafen: 0.9.39.x - 0.9.45.x
+Compatible with Mednafen: 0.9.39.x - 0.9.46
 
 Documentation: Please see the [REQUIREMENTS](https://medlaunch.info/documentation/en/introduction/requirements) and [QUICK SETUP GUIDE](https://medlaunch.info/documentation/en/introduction/quick-setup-guide) documentation portal pages. 
 
diff --git a/docs/downloads/MedLaunch_v0_5_8_0.zip b/docs/downloads/MedLaunch_v0_5_8_0.zip
new file mode 100644
index 0000000..3f13d31
Binary files /dev/null and b/docs/downloads/MedLaunch_v0_5_8_0.zip differ